[tryton-debian-vcs] tryton-modules-calendar-scheduling branch upstream created. 3d20e7767624208400dd93d83b2a7dadfc9104f1

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:59:50 UTC 2013


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar-scheduling.git;a=commitdiff;h=3d20e7767624208400dd93d83b2a7dadfc9104f1
commit 3d20e7767624208400dd93d83b2a7dadfc9104f1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 17:26:37 2013 +0100

    Adding upstream version 3.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index 4522186..dfdbcce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 575f0f7..d18b489 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_calendar_scheduling
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: trytond_calendar_scheduling
         ===========================
         
@@ -61,6 +61,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 1d3e53f..edcbe69 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -114,7 +114,7 @@ msgstr "Invitacions canviades"
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
-msgstr " "
+msgstr ""
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
@@ -130,7 +130,7 @@ msgstr "Servidor"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
-msgstr " "
+msgstr ""
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 2b81e9b..fc4bab5 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -112,7 +112,7 @@ msgstr "Invitaciones Cambiadas"
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
-msgstr "Punto de Orden"
+msgstr ""
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
@@ -128,7 +128,7 @@ msgstr "Servidor"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
-msgstr "Punto de Orden"
+msgstr ""
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 72ec708..93501eb 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -11,7 +11,7 @@ msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr ""
-"%s (%s) cambió su participación a: %s\n"
+"%s (%s) ha cambiado su participación a: %s\n"
 "\n"
 
 msgctxt "error:calendar.event.attendee:"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 829b921..2c8a3a7 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -7,16 +7,6 @@ msgid "    * "
 msgstr "    *"
 
 msgctxt "error:calendar.event.attendee:"
-msgid "    * "
-msgstr "    *"
-
-msgctxt "error:calendar.event.attendee:"
-msgid ""
-"%s (%s) changed his/her participation status to: %s\n"
-"\n"
-msgstr "%s (%s) a un nouveau statut de participation : %s\n"
-
-msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
@@ -30,18 +20,6 @@ msgstr "%s (%s) a accepté l'invitation suivante :\n"
 
 msgctxt "error:calendar.event.attendee:"
 msgid ""
-"%s (%s) has accepted this invitation:\n"
-"\n"
-msgstr "%s (%s) a accepté l'invitation suivante :\n"
-
-msgctxt "error:calendar.event.attendee:"
-msgid ""
-"%s (%s) has declined this invitattion:\n"
-"\n"
-msgstr "%s (%s) a décliné l'invitation suivante :\n"
-
-msgctxt "error:calendar.event.attendee:"
-msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr "%s (%s) a décliné l'invitation suivante :\n"
@@ -51,22 +29,10 @@ msgid "%s: %s @ %s"
 msgstr "%s: %s @ %s"
 
 msgctxt "error:calendar.event.attendee:"
-msgid "%s: %s @ %s"
-msgstr "%s: %s @ %s"
-
-msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
 msgctxt "error:calendar.event.attendee:"
-msgid "(No Subject)"
-msgstr "(Pas de sujet)"
-
-msgctxt "error:calendar.event.attendee:"
-msgid ":"
-msgstr ":"
-
-msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ":"
 
@@ -74,23 +40,11 @@ msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr "Quand"
 
-msgctxt "error:calendar.event.attendee:"
-msgid "When"
-msgstr "Quand"
-
 msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr "    *"
 
 msgctxt "error:calendar.event:"
-msgid "    * "
-msgstr "    *"
-
-msgctxt "error:calendar.event:"
-msgid "(No Subject)"
-msgstr "(Pas de sujet)"
-
-msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -99,14 +53,6 @@ msgid ":"
 msgstr ":"
 
 msgctxt "error:calendar.event:"
-msgid ":"
-msgstr ":"
-
-msgctxt "error:calendar.event:"
-msgid "Cancelled Event: %s @ %s"
-msgstr "Événement annulé : %s @ %s"
-
-msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr "Événement annulé : %s @ %s"
 
@@ -115,18 +61,6 @@ msgid "Invitation: %s @ %s"
 msgstr "Invitation: %s @ %s"
 
 msgctxt "error:calendar.event:"
-msgid "Invitation: %s @ %s"
-msgstr "Invitation: %s @ %s"
-
-msgctxt "error:calendar.event:"
-msgid ""
-"This event has been canceled.\n"
-"\n"
-msgstr ""
-"Cet événement a été annulé.\n"
-"\n"
-
-msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
@@ -143,18 +77,6 @@ msgstr ""
 "\n"
 
 msgctxt "error:calendar.event:"
-msgid ""
-"This event has been changed.\n"
-"\n"
-msgstr ""
-"Cet événement a été modifié.\n"
-"\n"
-
-msgctxt "error:calendar.event:"
-msgid "Updated Invitation: %s @ %s"
-msgstr "Invitation mise à jour : %s @ %s"
-
-msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr "Invitation mise à jour : %s @ %s"
 
@@ -163,18 +85,6 @@ msgid "When"
 msgstr "Quand"
 
 msgctxt "error:calendar.event:"
-msgid "When"
-msgstr "Quand"
-
-msgctxt "error:calendar.event:"
-msgid ""
-"You have been invited to the following event.\n"
-"\n"
-msgstr ""
-"Vous avez été invité à l'événement suivant.\n"
-"\n"
-
-msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
@@ -211,22 +121,10 @@ msgid ""
 msgstr ""
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr "Client"
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
-msgid "Client"
-msgstr "Client"
-
-msgctxt "selection:calendar.event,organizer_schedule_agent:"
-msgid "None"
-msgstr "Aucun"
-
-msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr "Aucun"
 
@@ -234,14 +132,6 @@ msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr "Serveur"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:"
-msgid "Server"
-msgstr "Serveur"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid ""
-msgstr ""
-
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
 msgstr ""
@@ -251,14 +141,6 @@ msgid "1.0"
 msgstr "1.0"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
@@ -267,14 +149,6 @@ msgid "1.2"
 msgstr "1.2"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
@@ -283,14 +157,6 @@ msgid "3.8"
 msgstr "3.8"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
@@ -299,14 +165,6 @@ msgid "5.2"
 msgstr "5.1"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid "5.2"
-msgstr "5.1"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
-msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
@@ -315,13 +173,5 @@ msgid "Calendar Email Notifications"
 msgstr "Notifications calendrier par Email"
 
 msgctxt "view:res.user:"
-msgid "Calendar Email Notifications"
-msgstr "Notifications calendrier par Email"
-
-msgctxt "view:res.user:"
-msgid "Notifications"
-msgstr "Avertissements"
-
-msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr "Avertissements"
diff --git a/locale/es_ES.po b/locale/sl_SI.po
similarity index 79%
copy from locale/es_ES.po
copy to locale/sl_SI.po
index 72ec708..4682e3b 100644
--- a/locale/es_ES.po
+++ b/locale/sl_SI.po
@@ -11,20 +11,24 @@ msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr ""
-"%s (%s) cambió su participación a: %s\n"
+"%s (%s) je spremenil/a svoj status udeležbe v: %s\n"
 "\n"
 
 msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
-msgstr "%s (%s) ha aceptado esta invitación:"
+msgstr ""
+"%s (%s) je sprejel/a to povabilo:\n"
+"\n"
 
 msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
-msgstr "%s (%s) ha declinado esta invitación:"
+msgstr ""
+"%s (%s) je zavrnil/a to povabilo:\n"
+"\n"
 
 msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
@@ -32,7 +36,7 @@ msgstr "%s: %s @ %s"
 
 msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
-msgstr "(Sin asunto)"
+msgstr "(Brez zadeve)"
 
 msgctxt "error:calendar.event.attendee:"
 msgid ":"
@@ -40,7 +44,7 @@ msgstr ":"
 
 msgctxt "error:calendar.event.attendee:"
 msgid "When"
-msgstr "Cuando"
+msgstr "Ko"
 
 msgctxt "error:calendar.event:"
 msgid "    * "
@@ -48,7 +52,7 @@ msgstr "    * "
 
 msgctxt "error:calendar.event:"
 msgid "(No Subject)"
-msgstr "(Sin asunto)"
+msgstr "(Brez zadeve)"
 
 msgctxt "error:calendar.event:"
 msgid ":"
@@ -56,61 +60,61 @@ msgstr ":"
 
 msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
-msgstr "Evento cancelado: %s @ %s"
+msgstr "Preklican dogodek: %s @ %s"
 
 msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
-msgstr "Invitación: %s @ %s"
+msgstr "Povabilo: %s @ %s"
 
 msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
-msgstr "Este evento ha sido cancelado."
+msgstr "Ta dogodek je bil preklican."
 
 msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
-msgstr "Este evento ha cambiado."
+msgstr "Ta dogodek je bil spremenjen."
 
 msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
-msgstr "Invitación actualizada: %s @ %s"
+msgstr "Posodobljeno povabilo: %s @ %s"
 
 msgctxt "error:calendar.event:"
 msgid "When"
-msgstr "Cuando"
+msgstr "Ko"
 
 msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
-msgstr "Ha sido invitado al siguiente evento."
+msgstr "Povabljeni ste bili na naslednji dogodek"
 
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
-msgstr "Agente de la planificación"
+msgstr "Odjemalec razporejanja"
 
 msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
-msgstr "Estado de la planificación"
+msgstr "Status razporejanja"
 
 msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
-msgstr "Invitaciones canceladas"
+msgstr "Preklicana povabila"
 
 msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
-msgstr "Nuevas invitaciones"
+msgstr "Nova povabila"
 
 msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
-msgstr "Respuestas a las invitaciones"
+msgstr "Odgovori na povabila"
 
 msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
-msgstr "Invitaciones cambiadas"
+msgstr "Spremenjena povabila"
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
@@ -118,15 +122,15 @@ msgstr ""
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
-msgstr "Cliente"
+msgstr "Odjemalec"
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
-msgstr "Ninguno"
+msgstr "Brez"
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
-msgstr "Servidor"
+msgstr "Strežnik"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
@@ -166,8 +170,8 @@ msgstr "5.3"
 
 msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
-msgstr "Notificaciones por correo electrónico del calendario"
+msgstr "Sporočila"
 
 msgctxt "view:res.user:"
 msgid "Notifications"
-msgstr "Notificaciones"
+msgstr "Sporočila"
diff --git a/setup.py b/setup.py
index b717f57..d562854 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(name='trytond_calendar_scheduling',
         'Natural Language :: French',
         'Natural Language :: German',
         'Natural Language :: Russian',
+        'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 4d8744e..7cd8f75 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
 #this repository contains the full copyright notices and license terms.
 
 from .test_calendar_scheduling import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 3d1c45e..8265cdd 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=3.0.0
 depends:
     calendar
     ir
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index f939a6e..75933a7 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-calendar-scheduling
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: trytond_calendar_scheduling
         ===========================
         
@@ -61,6 +61,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_calendar_scheduling.egg-info/SOURCES.txt b/trytond_calendar_scheduling.egg-info/SOURCES.txt
index 6c3eeb7..f804202 100644
--- a/trytond_calendar_scheduling.egg-info/SOURCES.txt
+++ b/trytond_calendar_scheduling.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
 locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
+locale/sl_SI.po
 trytond_calendar_scheduling.egg-info/PKG-INFO
 trytond_calendar_scheduling.egg-info/SOURCES.txt
 trytond_calendar_scheduling.egg-info/dependency_links.txt
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 376dd29..410d67c 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,6 +1,6 @@
 PyWebDAV >= 0.9.8
-trytond_calendar >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
+trytond_calendar >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
 
 [test]
 caldav
\ No newline at end of file
commit 12d0045e95c03dd9ed782e22ec15f42b5fceb3bb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 2 00:35:33 2013 +0200

    Adding upstream version 2.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index 2d44244..4522186 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 8ad4b79..a005001 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
-Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2013 Bertrand Chenal.
+Copyright (C) 2009-2013 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index 44969c7..18ce53c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,6 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 6b516b3..575f0f7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_calendar_scheduling
-Version: 2.6.0
+Version: 2.8.0
 Summary: Tryton module to add scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
 Description: trytond_calendar_scheduling
         ===========================
         
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
diff --git a/calendar_.py b/calendar_.py
index 7e0feb8..433c120 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -176,10 +176,10 @@ class Event:
                     value = getattr(self, field)
                 if lang.direction == 'ltr':
                     body += fields[field]['string'] + separator + ' ' \
-                            + value + '\n'
+                        + value + '\n'
                 else:
                     body += value + ' ' + separator \
-                            + fields[field]['string'] + '\n'
+                        + fields[field]['string'] + '\n'
         return subject, body
 
     @staticmethod
@@ -275,37 +275,39 @@ class Event:
         return to_notify, owner
 
     @classmethod
-    def create(cls, values):
+    def create(cls, vlist):
         Attendee = Pool().get('calendar.event.attendee')
-        event = super(Event, cls).create(values)
+        events = super(Event, cls).create(vlist)
 
         if Transaction().user == 0:
             # user is 0 means create is triggered by another one
-            return event
+            return events
 
-        to_notify, owner = event.attendees_to_notify()
-        if not to_notify:
-            return event
+        for event in events:
+            to_notify, owner = event.attendees_to_notify()
+            if not to_notify:
+                continue
 
-        with Transaction().set_context(skip_schedule_agent=True):
-            ical = event.event2ical()
-        ical.add('method')
-        ical.method.value = 'REQUEST'
+            with Transaction().set_context(skip_schedule_agent=True):
+                ical = event.event2ical()
+            ical.add('method')
+            ical.method.value = 'REQUEST'
 
-        attendee_emails = [a.email for a in to_notify]
+            attendee_emails = [a.email for a in to_notify]
 
-        subject, body = event.subject_body('new', owner)
-        msg = cls.create_msg(owner.email, attendee_emails, subject, body, ical)
-        sent = event.send_msg(owner.email, attendee_emails, msg, 'new')
+            subject, body = event.subject_body('new', owner)
+            msg = cls.create_msg(owner.email, attendee_emails, subject, body,
+                ical)
+            sent = event.send_msg(owner.email, attendee_emails, msg, 'new')
 
-        vals = {'status': 'needs-action'}
-        if sent:
-            vals['schedule_status'] = '1.1'  # successfully sent
-        else:
-            vals['schedule_status'] = '5.1'  # could not complete delivery
-        Attendee.write(to_notify, vals)
+            vals = {'status': 'needs-action'}
+            if sent:
+                vals['schedule_status'] = '1.1'  # successfully sent
+            else:
+                vals['schedule_status'] = '5.1'  # could not complete delivery
+            Attendee.write(to_notify, vals)
 
-        return event
+        return events
 
     @classmethod
     def write(cls, events, values):
@@ -595,7 +597,7 @@ class EventAttendee:
         fields_names = ['status']
         with Transaction().set_context(language=lang.code):
             fields = self.fields_get(fields_names=fields_names)
-        for k, v in  fields['status']['selection']:
+        for k, v in fields['status']['selection']:
             if k == status:
                 status_string = v
 
@@ -645,10 +647,10 @@ class EventAttendee:
                     value = event[field]
                 if lang.direction == 'ltr':
                     body += fields[field]['string'] + separator + ' ' \
-                            + value + '\n'
+                        + value + '\n'
                 else:
                     body += value + ' ' + separator \
-                            + fields[field]['string'] + '\n'
+                        + fields[field]['string'] + '\n'
         return subject, body
 
     @staticmethod
@@ -802,36 +804,38 @@ class EventAttendee:
             Event.write([attendee.event], vals)
 
     @classmethod
-    def create(cls, values):
+    def create(cls, vlist):
         Event = Pool().get('calendar.event')
 
-        attendee = super(EventAttendee, cls).create(values)
+        attendees = super(EventAttendee, cls).create(vlist)
         if Transaction().user == 0:
             # user is 0 means create is triggered by another one
-            return attendee
+            return attendees
 
-        owner = attendee.event.calendar.owner
+        for attendee in attendees:
+            owner = attendee.event.calendar.owner
 
-        if (not attendee.status) or attendee.status in ('', 'needs-action'):
-            return attendee
-        if not owner or not owner.calendar_email_notification_partstat:
-            return attendee
-        organizer = attendee.organiser_to_notify()
-        if not organizer:
-            return attendee
+            if ((not attendee.status)
+                    or attendee.status in ('', 'needs-action')):
+                continue
+            if not owner or not owner.calendar_email_notification_partstat:
+                continue
+            organizer = attendee.organiser_to_notify()
+            if not organizer:
+                continue
 
-        with Transaction().set_context(skip_schedule_agent=True):
-            ical = attendee.event.event2ical()
-        if not hasattr(ical, 'method'):
-            ical.add('method')
-        ical.method.value = 'REPLY'
+            with Transaction().set_context(skip_schedule_agent=True):
+                ical = attendee.event.event2ical()
+            if not hasattr(ical, 'method'):
+                ical.add('method')
+            ical.method.value = 'REPLY'
 
-        subject, body = attendee.subject_body(attendee.status, owner)
-        msg = cls.create_msg(owner.email, organizer, subject, body, ical)
+            subject, body = attendee.subject_body(attendee.status, owner)
+            msg = cls.create_msg(owner.email, organizer, subject, body, ical)
 
-        sent = attendee.send_msg(owner.email, organizer, msg)
+            sent = attendee.send_msg(owner.email, organizer, msg)
 
-        vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
-        Event.write([attendee.event], vals)
+            vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
+            Event.write([attendee.event], vals)
 
-        return attendee
+        return attendees
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index d8da990..10b46c4 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -86,14 +86,6 @@ msgid ""
 "\n"
 msgstr "Поканени сте на това събитие."
 
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr "Пълномощник на графика"
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr "Състояние на график"
-
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Пълномощник на графика"
@@ -118,58 +110,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Променени покани"
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Клиент"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Няма"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Сървър"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr "5.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index bcc82a6..1d3e53f 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -11,7 +11,7 @@ msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr ""
-"%s (%s) hl'estat de la seva participació a: %s\n"
+"%s (%s) ha canviat la seva participació a: %s\n"
 "\n"
 
 msgctxt "error:calendar.event.attendee:"
@@ -86,15 +86,7 @@ msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
-msgstr "Ha estat convidat al següent esdeveniment."
-
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr "Agent del planificador"
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr "Estat de la planificació"
+msgstr "Heu estat convidat al següent esdeveniment."
 
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
@@ -120,61 +112,9 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Invitacions canviades"
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr "Servidor"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Client"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Cap"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Servidor"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr "5.3"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr "5.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
-msgstr "Servidor"
+msgstr " "
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
@@ -190,7 +130,7 @@ msgstr "Servidor"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
-msgstr "5.3"
+msgstr " "
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 6990e8c..6ae5eeb 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -86,14 +86,6 @@ msgid ""
 "\n"
 msgstr ""
 
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr ""
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr ""
-
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr ""
@@ -118,58 +110,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr ""
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 36314ae..002b5bb 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -98,14 +98,6 @@ msgstr ""
 "Sie wurden zu dem folgendem Termin eingeladen:\n"
 "\n"
 
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr "Terminplaner Agent"
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr "Terminplaner Status"
-
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Terminplaner Agent"
@@ -130,58 +122,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Änderungen von Einladungen"
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Client"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Keiner"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Server"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr "5.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 8966448..c3b4f9c 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -88,14 +88,6 @@ msgid ""
 "\n"
 msgstr "Ha sido invitado al siguiente evento."
 
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr "Agente del planificador"
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr "Estado de la planificación"
-
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Agente del planificador"
@@ -120,58 +112,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Invitaciones cambiadas"
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Cliente"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Ninguno"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Servidor"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr "5.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
diff --git a/locale/es_CO.po b/locale/es_CO.po
index ffa2c91..2b81e9b 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -86,14 +86,6 @@ msgid ""
 "\n"
 msgstr "Usted fue invitado al siguiente evento."
 
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr "Agente de programación"
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr "Estado de Programación"
-
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Agente de Programación"
@@ -118,58 +110,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Invitaciones Cambiadas"
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr "Punto de Orden"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Cliente"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Ninguno"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Servidor"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr "Punto de Orden"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr "5.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr "Punto de Orden"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 63dbbe1..72ec708 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -11,7 +11,7 @@ msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr ""
-"%s (%s) cambió el estado de su participación a: %s\n"
+"%s (%s) cambió su participación a: %s\n"
 "\n"
 
 msgctxt "error:calendar.event.attendee:"
@@ -88,14 +88,6 @@ msgid ""
 "\n"
 msgstr "Ha sido invitado al siguiente evento."
 
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr "Agente de la planificación"
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr "Estado de la planificación"
-
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Agente de la planificación"
@@ -120,58 +112,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Invitaciones cambiadas"
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Cliente"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Ninguno"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Servidor"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr "5.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index e81c6e6..829b921 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -182,14 +182,6 @@ msgstr ""
 "Vous avez été invité à l'événement suivant.\n"
 "\n"
 
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr "Agent de planification"
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr "Statut de planification"
-
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Agent de planification"
@@ -214,110 +206,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Modification des invitations"
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Client"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Client"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Aucun"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Aucun"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Serveur"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Serveur"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr "1.0"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr "1.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr "1.2"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr "3.7"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr "3.8"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr "5.1"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr "5.3"
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 8910295..1141fde 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -86,14 +86,6 @@ msgid ""
 "\n"
 msgstr ""
 
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr ""
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr ""
-
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr ""
@@ -118,59 +110,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr ""
-
-#, fuzzy
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Geen"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr ""
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 3f19f7b..eec390b 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -11,18 +11,24 @@ msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr ""
+"%s (%s) изменил свой статус участия на: %s\n"
+"\n"
 
 msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
 msgstr ""
+"%s (%s) принял приглашение:\n"
+"\n"
 
 msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr ""
+"%s (%s) отказался от приглашения:\n"
+"\n"
 
 msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
@@ -64,17 +70,17 @@ msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
-msgstr ""
+msgstr "Событие было отменено."
 
 msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
-msgstr ""
+msgstr "Событие было изменено"
 
 msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
-msgstr ""
+msgstr "Обновлено приглашение: %s @ %s"
 
 msgctxt "error:calendar.event:"
 msgid "When"
@@ -84,15 +90,7 @@ msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
-msgstr ""
-
-msgctxt "field:calendar.attendee,schedule_agent:"
-msgid "Schedule Agent"
-msgstr "Расписание агента"
-
-msgctxt "field:calendar.attendee,schedule_status:"
-msgid "Schedule Status"
-msgstr "Статус расписания"
+msgstr "Вы были приглашены к следующему событию."
 
 msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
@@ -118,58 +116,6 @@ msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Изменен приглашения"
 
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Client"
-msgstr "Клиент"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "None"
-msgstr "Отсутствует"
-
-msgctxt "selection:calendar.attendee,schedule_agent:"
-msgid "Server"
-msgstr "Сервер"
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.0"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.1"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "1.2"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.7"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "3.8"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.1"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.2"
-msgstr ""
-
-msgctxt "selection:calendar.attendee,schedule_status:"
-msgid "5.3"
-msgstr ""
-
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
diff --git a/res.xml b/res.xml
index a704d27..7904b50 100644
--- a/res.xml
+++ b/res.xml
@@ -8,54 +8,14 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">res.user</field>
             <field name="type">form</field>
             <field name="inherit" ref="res.user_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath expr="/form/notebook" position="inside">
-                        <page string="Notifications"
-                            id="notification" col="2">
-                            <separator string="Calendar Email Notifications"
-                                id="calendar_email_notification" colspan="2"/>
-                            <label name="calendar_email_notification_new"/>
-                            <field name="calendar_email_notification_new"/>
-                            <label name="calendar_email_notification_update"/>
-                            <field name="calendar_email_notification_update"/>
-                            <label name="calendar_email_notification_cancel"/>
-                            <field name="calendar_email_notification_cancel"/>
-                            <label name="calendar_email_notification_partstat"/>
-                            <field name="calendar_email_notification_partstat"/>
-                        </page>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">user_form</field>
         </record>
 
         <record model="ir.ui.view" id="user_view_form_preferences">
             <field name="model">res.user</field>
             <field name="type">form</field>
             <field name="inherit" ref="res.user_view_form_preferences"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath expr="/form/notebook" position="inside">
-                        <page string="Notifications"
-                            id="notification" col="2">
-                            <separator string="Calendar Email Notifications"
-                                id="calendar_email_notification" colspan="2"/>
-                            <label name="calendar_email_notification_new"/>
-                            <field name="calendar_email_notification_new"/>
-                            <label name="calendar_email_notification_update"/>
-                            <field name="calendar_email_notification_update"/>
-                            <label name="calendar_email_notification_cancel"/>
-                            <field name="calendar_email_notification_cancel"/>
-                            <label name="calendar_email_notification_partstat"/>
-                            <field name="calendar_email_notification_partstat"/>
-                        </page>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">user_form_preferences</field>
         </record>
 
     </data>
diff --git a/setup.py b/setup.py
index b79e5ae..b717f57 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = ['PyWebDAV >= 0.9.8']
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
-                (dep, major_version, minor_version, major_version,
-                    minor_version + 1))
+            (dep, major_version, minor_version, major_version,
+                minor_version + 1))
 requires.append('trytond >= %s.%s, < %s.%s' %
-        (major_version, minor_version, major_version, minor_version + 1))
+    (major_version, minor_version, major_version, minor_version + 1))
 
 setup(name='trytond_calendar_scheduling',
     version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_calendar_scheduling',
     long_description=read('README'),
     author='Tryton',
     url='http://www.tryton.org/',
-    download_url="http://downloads.tryton.org/" + \
-            info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+    download_url=("http://downloads.tryton.org/" +
+            info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
     package_dir={'trytond.modules.calendar_scheduling': '.'},
     packages=[
         'trytond.modules.calendar_scheduling',
         'trytond.modules.calendar_scheduling.tests',
         ],
     package_data={
-        'trytond.modules.calendar_scheduling': info.get('xml', []) \
-            + ['tryton.cfg', 'locale/*.po'],
+        'trytond.modules.calendar_scheduling': (info.get('xml', [])
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -57,6 +57,7 @@ setup(name='trytond_calendar_scheduling',
         'Intended Audience :: Manufacturing',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
+        'Natural Language :: Catalan',
         'Natural Language :: Czech',
         'Natural Language :: Dutch',
         'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index 96774cf..3d1c45e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.8.0
 depends:
     calendar
     ir
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index 37237e3..f939a6e 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-calendar-scheduling
-Version: 2.6.0
+Version: 2.8.0
 Summary: Tryton module to add scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
 Description: trytond_calendar_scheduling
         ===========================
         
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
diff --git a/trytond_calendar_scheduling.egg-info/SOURCES.txt b/trytond_calendar_scheduling.egg-info/SOURCES.txt
index 6d2bd0e..6c3eeb7 100644
--- a/trytond_calendar_scheduling.egg-info/SOURCES.txt
+++ b/trytond_calendar_scheduling.egg-info/SOURCES.txt
@@ -30,4 +30,6 @@ trytond_calendar_scheduling.egg-info/dependency_links.txt
 trytond_calendar_scheduling.egg-info/entry_points.txt
 trytond_calendar_scheduling.egg-info/not-zip-safe
 trytond_calendar_scheduling.egg-info/requires.txt
-trytond_calendar_scheduling.egg-info/top_level.txt
\ No newline at end of file
+trytond_calendar_scheduling.egg-info/top_level.txt
+view/user_form.xml
+view/user_form_preferences.xml
\ No newline at end of file
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 46a9d20..376dd29 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,6 +1,6 @@
 PyWebDAV >= 0.9.8
-trytond_calendar >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
+trytond_calendar >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
 
 [test]
 caldav
\ No newline at end of file
diff --git a/view/user_form.xml b/view/user_form.xml
new file mode 100644
index 0000000..cad7454
--- /dev/null
+++ b/view/user_form.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/notebook" position="inside">
+        <page string="Notifications"
+            id="notification" col="2">
+            <separator string="Calendar Email Notifications"
+                id="calendar_email_notification" colspan="2"/>
+            <label name="calendar_email_notification_new"/>
+            <field name="calendar_email_notification_new"/>
+            <label name="calendar_email_notification_update"/>
+            <field name="calendar_email_notification_update"/>
+            <label name="calendar_email_notification_cancel"/>
+            <field name="calendar_email_notification_cancel"/>
+            <label name="calendar_email_notification_partstat"/>
+            <field name="calendar_email_notification_partstat"/>
+        </page>
+    </xpath>
+</data>
diff --git a/view/user_form_preferences.xml b/view/user_form_preferences.xml
new file mode 100644
index 0000000..cad7454
--- /dev/null
+++ b/view/user_form_preferences.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/notebook" position="inside">
+        <page string="Notifications"
+            id="notification" col="2">
+            <separator string="Calendar Email Notifications"
+                id="calendar_email_notification" colspan="2"/>
+            <label name="calendar_email_notification_new"/>
+            <field name="calendar_email_notification_new"/>
+            <label name="calendar_email_notification_update"/>
+            <field name="calendar_email_notification_update"/>
+            <label name="calendar_email_notification_cancel"/>
+            <field name="calendar_email_notification_cancel"/>
+            <label name="calendar_email_notification_partstat"/>
+            <field name="calendar_email_notification_partstat"/>
+        </page>
+    </xpath>
+</data>
commit 34d05edb721e48dfcace896b7b15177d7ef0edf9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 23 19:53:29 2012 +0200

    Adding upstream version 2.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index 8349101..2d44244 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.4.1 - 2012-09-02
+Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
 Version 2.4.0 - 2012-04-24
diff --git a/MANIFEST.in b/MANIFEST.in
index 7f5d5fd..44969c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
 include COPYRIGHT
 include CHANGELOG
 include LICENSE
+include tryton.cfg
 include *.xml
 include *.odt
 include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 0f22144..6b516b3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,49 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_scheduling
-Version: 2.4.1
-Summary: Add Scheduling support on CalDAV
+Version: 2.6.0
+Summary: Tryton module to add scheduling support on CalDAV
 Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_calendar_scheduling
+        ===========================
+        
+        The calendar_scheduling module of the Tryton application platform.  See
+        __tryton__.py
+        
+        Installing
+        ----------
+        
+        See INSTALL
+        
+        Support
+        -------
+        
+        If you encounter any problems with Tryton, please don't hesitate to ask
+        questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+        
+          http://bugs.tryton.org/
+          http://groups.tryton.org/
+          http://wiki.tryton.org/
+          irc://irc.freenode.net/tryton
+        
+        License
+        -------
+        
+        See LICENSE
+        
+        Copyright
+        ---------
+        
+        See COPYRIGHT
+        
+        
+        For more information please visit the Tryton web site:
+        
+          http://www.tryton.org/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/__init__.py b/__init__.py
index fffd91a..588e318 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,16 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
+from trytond.pool import Pool
 from . import caldav
 from .calendar_ import *
 from .res import *
+
+
+def register():
+    Pool.register(
+        Event,
+        Attendee,
+        EventAttendee,
+        User,
+        module='calendar_scheduling', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 4f31304..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
-    'name': 'Calendar Scheduling',
-    'name_bg_BG': 'График към календар',
-    'name_ca_ES': 'Planificador del calendari',
-    'name_de_DE': 'Kalender Terminplanung',
-    'name_es_AR': 'Planificador del calendario',
-    'name_es_CO': 'Planificador del calendario',
-    'name_es_ES': 'Planificador del calendario',
-    'name_fr_FR': 'Programmation calendrier',
-    'name_ru_RU': 'Календарное планирование',
-    'version': '2.4.1',
-    'author': 'B2CK',
-    'email': 'info at b2ck.com',
-    'website': 'http://www.tryton.org/',
-    'description': 'Add Scheduling support on CalDAV',
-    'description_bg_BG': 'Добавя график към CalDAV',
-    'description_ca_ES': 'Afegeix suport per la planificació al CalDAV.',
-    'description_de_DE': 'Fügt Unterstützung für die Terminplanung in CalDAV hinzu',
-    'description_es_AR': 'Añade gestión de planificación de eventos a CalDAV',
-    'description_es_CO': 'Añade gestión de planificación de eventos a CalDAV',
-    'description_es_ES': 'Añade la gestión de planificación de eventos a CalDAV',
-    'description_fr_FR': 'Ajoute la gestion de la programmation d\'évènements au CalDAV',
-    'description_ru_RU': 'Добавление поддержки планирования для CalDAV',
-    'depends': [
-        'ir',
-        'res',
-        'webdav',
-        'calendar',
-    ],
-    'xml': [
-        'res.xml',
-    ],
-    'translation': [
-        'locale/bg_BG.po',
-        'locale/ca_ES.po',
-        'locale/cs_CZ.po',
-        'locale/de_DE.po',
-        'locale/es_AR.po',
-        'locale/es_ES.po',
-        'locale/es_CO.po',
-        'locale/fr_FR.po',
-        'locale/nl_NL.po',
-        'locale/ru_RU.po',
-    ],
-}
diff --git a/calendar_.py b/calendar_.py
index fe6f8c3..7e0feb8 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -3,15 +3,18 @@
 from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
 import logging
-from trytond.model import ModelSQL, ModelView, fields
+
+from trytond.model import fields
 from trytond.tools import get_smtp_server
 from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
 
+__all__ = ['Event', 'Attendee', 'EventAttendee']
+__metaclass__ = PoolMeta
 
-class Event(ModelSQL, ModelView):
-    _name = 'calendar.event'
 
+class Event:
+    __name__ = 'calendar.event'
     organizer_schedule_status = fields.Selection([
             ('', ''),
             ('1.0', '1.0'),
@@ -30,12 +33,14 @@ class Event(ModelSQL, ModelView):
             ('CLIENT', 'Client'),
             ], 'Schedule Agent')
 
-    def default_schedule_agent(self):
+    @staticmethod
+    def default_schedule_agent():
         return 'SERVER'
 
-    def __init__(self):
-        super(Event, self).__init__()
-        self._error_messages.update({
+    @classmethod
+    def __setup__(cls):
+        super(Event, cls).__setup__()
+        cls._error_messages.update({
             'new_subject': 'Invitation: %s @ %s',
             'new_body': 'You have been invited to the following event.\n\n',
             'update_subject': 'Updated Invitation: %s @ %s',
@@ -48,9 +53,10 @@ class Event(ModelSQL, ModelView):
             'when': 'When',
             })
 
-    def ical2values(self, event_id, ical, calendar_id, vevent=None):
-        res = super(Event, self).ical2values(event_id, ical, calendar_id,
-                vevent=vevent)
+    @classmethod
+    def ical2values(cls, event_id, ical, calendar_id, vevent=None):
+        res = super(Event, cls).ical2values(event_id, ical, calendar_id,
+            vevent=vevent)
 
         if not vevent:
             vevent = ical.vevent
@@ -61,13 +67,14 @@ class Event(ModelSQL, ModelView):
         for key in ('status', 'agent'):
             field = 'organizer_schedule_' + key
             param = 'SCHEDULE-' + key.upper()
-            if param in vevent.organizer.params and vevent.organizer[param] \
-                    in dict(self[field].selection):
+            if (param in vevent.organizer.params
+                    and vevent.organizer[param] in dict(getattr(cls,
+                            field).selection)):
                 res[field] = vevent.organizer[param]
 
         return res
 
-    def event2ical(self, event):
+    def event2ical(self):
         """
         Override default event2ical to add schedule-status and
         schedule-agent properties
@@ -78,63 +85,57 @@ class Event(ModelSQL, ModelView):
         scheduling message.
         """
 
-        ical = super(Event, self).event2ical(event)
-        if isinstance(event, (int, long)):
-            event = self.browse(event)
-
+        ical = super(Event, self).event2ical()
         vevent = ical.vevent
 
-        if event.organizer_schedule_status:
+        if self.organizer_schedule_status:
             if not hasattr(vevent, 'organizer'):
                 vevent.add('organizer')
             vevent.organizer.params['SCHEDULE-STATUS'] = \
-                (event.organizer_schedule_status,)
+                (self.organizer_schedule_status,)
 
         if Transaction().context.get('skip_schedule_agent'):
             return ical
 
-        if event.organizer_schedule_agent:
+        if self.organizer_schedule_agent:
             if not hasattr(vevent, 'organizer'):
                 vevent.add('organizer')
             vevent.organizer.params['SCHEDULE-AGENT'] = \
-                event.organizer_schedule_agent
+                self.organizer_schedule_agent
 
         return ical
 
-    def subject_body(self, type, event, owner):
-        lang_obj = Pool().get('ir.lang')
+    def subject_body(self, type, owner):
+        Lang = Pool().get('ir.lang')
 
-        if not (event and owner):
+        if not owner:
             return "", ""
         lang = owner.language
         if not lang:
-            lang_ids = lang_obj.search([
-                ('code', '=', 'en_US'),
-                ], limit=1)
-            lang = lang_obj.browse(lang_ids[0])
+            lang, = Lang.search([
+                    ('code', '=', 'en_US'),
+                    ], limit=1)
 
         with Transaction().set_context(language=lang.code):
-            summary = event.summary
+            summary = self.summary
             if not summary:
                 summary = self.raise_user_error('no_subject',
                         raise_exception=False)
 
-        date = lang_obj.strftime(event.dtstart, lang.code, lang.date)
-        if not event.all_day:
-            date += ' ' + lang_obj.strftime(event.dtstart, lang.code, '%H:%M')
-            if event.dtend:
+        date = Lang.strftime(self.dtstart, lang.code, lang.date)
+        if not self.all_day:
+            date += ' ' + Lang.strftime(self.dtstart, lang.code, '%H:%M')
+            if self.dtend:
                 date += ' -'
-                if event.dtstart.date() != event.dtend.date():
-                    date += ' ' + lang_obj.strftime(event.dtend, lang.code,
-                            lang.date)
-                date += ' ' + lang_obj.strftime(event.dtend, lang.code,
-                        '%H:%M')
-        else:
-            if event.dtend and event.dtstart.date() != event.dtend.date():
-                date += ' - ' + lang_obj.strftime(event.dtend, lang.code,
+                if self.dtstart.date() != self.dtend.date():
+                    date += ' ' + Lang.strftime(self.dtend, lang.code,
                         lang.date)
-        if event.timezone:
-            date += ' ' + event.timezone
+                date += ' ' + Lang.strftime(self.dtend, lang.code, '%H:%M')
+        else:
+            if self.dtend and self.dtstart.date() != self.dtend.date():
+                date += ' - ' + Lang.strftime(self.dtend, lang.code, lang.date)
+        if self.timezone:
+            date += ' ' + self.timezone
 
         with Transaction().set_context(language=lang.code):
             subject = self.raise_user_error(type + '_subject',
@@ -157,22 +158,22 @@ class Event(ModelSQL, ModelView):
                 if lang.direction == 'ltr':
                     body += fields['attendees']['string'] + separator + '\n'
                     body += bullet + owner.email + '\n'
-                    for attendee in event.attendees:
+                    for attendee in self.attendees:
                         body += bullet + attendee.email + '\n'
                 else:
                     body += separator + fields['attendees']['string'] + '\n'
                     body += owner.email + bullet + '\n'
-                    for attendee in event.attendees:
+                    for attendee in self.attendees:
                         body += attendee.email + bullet + '\n'
-            elif event[field]:
+            elif getattr(self, field):
                 if field == 'summary':
                     value = summary
                 elif field == 'dtstart':
                     value = date
                 elif field == 'location':
-                    value = event.location.name
+                    value = self.location.name
                 else:
-                    value = event[field]
+                    value = getattr(self, field)
                 if lang.direction == 'ltr':
                     body += fields[field]['string'] + separator + ' ' \
                             + value + '\n'
@@ -181,7 +182,8 @@ class Event(ModelSQL, ModelView):
                             + fields[field]['string'] + '\n'
         return subject, body
 
-    def create_msg(self, from_addr, to_addrs, subject, body, ical=None):
+    @staticmethod
+    def create_msg(from_addr, to_addrs, subject, body, ical=None):
 
         if not to_addrs:
             return None
@@ -215,28 +217,21 @@ class Event(ModelSQL, ModelView):
 
         return msg
 
-    def send_msg(self, from_addr, to_addrs, msg, type, event_id):
+    def send_msg(self, from_addr, to_addrs, msg, type):
         '''
-        Send message
-
-        :param from_addr: a from-address string
-        :param to_addrs: a list of to-address strings
-        :param msg: a message string
-        :param type: the type (new, update, cancel)
-        :param event_id: the id of the calendar.event
-        :return: list of email addresses sent
+        Send message and return the list of email addresses sent
         '''
-        user_obj = Pool().get('res.user')
+        User = Pool().get('res.user')
 
         if not to_addrs:
             return to_addrs
         to_addrs = list(set(to_addrs))
 
-        user_ids = user_obj.search([
-            ('email', 'in', to_addrs),
-            ])
-        for user in user_obj.browse(user_ids):
-            if not user['calendar_email_notification_' + type]:
+        users = User.search([
+                ('email', 'in', to_addrs),
+                ])
+        for user in users:
+            if not getattr(user, 'calendar_email_notification_' + type):
                 to_addrs.remove(user.email)
 
         success = False
@@ -247,24 +242,23 @@ class Event(ModelSQL, ModelView):
             success = to_addrs
         except Exception:
             logging.getLogger('calendar_scheduling').error(
-                'Unable to deliver scheduling mail for event %s' % event_id)
+                'Unable to deliver scheduling mail for %s' % self)
         return success
 
-    @staticmethod
-    def attendees_to_notify(event):
-        if not event.calendar.owner:
+    def attendees_to_notify(self):
+        if not self.calendar.owner:
             return [], None
-        attendees = event.attendees
-        organizer = event.organizer
-        owner = event.calendar.owner
-        if event.parent:
+        attendees = self.attendees
+        organizer = self.organizer
+        owner = self.calendar.owner
+        if self.parent:
             if not attendees:
-                attendees = event.parent.attendees
-                organizer = event.parent.organizer
-                owner = event.parent.calendar.owner
+                attendees = self.parent.attendees
+                organizer = self.parent.organizer
+                owner = self.parent.calendar.owner
             elif not organizer:
-                organizer = event.parent.organizer
-                owner = event.parent.calendar.owner
+                organizer = self.parent.organizer
+                owner = self.parent.calendar.owner
 
         if organizer != owner.email:
             return [], None
@@ -273,61 +267,58 @@ class Event(ModelSQL, ModelView):
         for attendee in attendees:
             if attendee.email == organizer:
                 continue
-            if attendee.schedule_agent and\
-                    attendee.schedule_agent != 'SERVER':
+            if (attendee.schedule_agent
+                    and attendee.schedule_agent != 'SERVER'):
                 continue
             to_notify.append(attendee)
 
         return to_notify, owner
 
-    def create(self, values):
-        attendee_obj = Pool().get('calendar.event.attendee')
-        res = super(Event, self).create(values)
+    @classmethod
+    def create(cls, values):
+        Attendee = Pool().get('calendar.event.attendee')
+        event = super(Event, cls).create(values)
 
         if Transaction().user == 0:
             # user is 0 means create is triggered by another one
-            return res
+            return event
 
-        event = self.browse(res)
-
-        to_notify, owner = self.attendees_to_notify(event)
+        to_notify, owner = event.attendees_to_notify()
         if not to_notify:
-            return res
+            return event
 
         with Transaction().set_context(skip_schedule_agent=True):
-            ical = self.event2ical(event)
+            ical = event.event2ical()
         ical.add('method')
         ical.method.value = 'REQUEST'
 
         attendee_emails = [a.email for a in to_notify]
 
-        subject, body = self.subject_body('new', event, owner)
-        msg = self.create_msg(owner.email, attendee_emails, subject, body,
-                ical)
-        sent = self.send_msg(owner.email, attendee_emails, msg, 'new',
-                event.id)
+        subject, body = event.subject_body('new', owner)
+        msg = cls.create_msg(owner.email, attendee_emails, subject, body, ical)
+        sent = event.send_msg(owner.email, attendee_emails, msg, 'new')
 
         vals = {'status': 'needs-action'}
         if sent:
             vals['schedule_status'] = '1.1'  # successfully sent
         else:
             vals['schedule_status'] = '5.1'  # could not complete delivery
-        attendee_obj.write([a.id for a in to_notify], vals)
+        Attendee.write(to_notify, vals)
 
-        return res
+        return event
 
-    def write(self, ids, values):
-        attendee_obj = Pool().get('calendar.event.attendee')
+    @classmethod
+    def write(cls, events, values):
+        Attendee = Pool().get('calendar.event.attendee')
 
         if Transaction().user == 0:
             # user is 0 means write is triggered by another one
-            return super(Event, self).write(ids, values)
-
-        if isinstance(ids, (int, long)):
-            ids = [ids]
+            super(Event, cls).write(events, values)
+            return
 
-        if not values or not ids:
-            return super(Event, self).write(ids, values)
+        if not values or not events:
+            super(Event, cls).write(events, values)
+            return
 
         event_edited = False
         for k in values:
@@ -336,23 +327,20 @@ class Event(ModelSQL, ModelView):
                 break
 
         # store old attendee info
-        events = self.browse(ids)
         event2former_emails = {}
         former_organiser_mail = {}
         former_organiser_lang = {}
         for event in events:
-            to_notify, owner = self.attendees_to_notify(event)
+            to_notify, owner = event.attendees_to_notify()
             event2former_emails[event.id] = [a.email for a in to_notify]
             former_organiser_mail[event.id] = owner and owner.email
             former_organiser_lang[event.id] = owner and owner.language \
                 and owner.language.code
 
-        res = super(Event, self).write(ids, values)
-
-        events = self.browse(ids)
+        super(Event, cls).write(events, values)
 
         for event in events:
-            current_attendees, owner = self.attendees_to_notify(event)
+            current_attendees, owner = event.attendees_to_notify()
             owner_email = owner and owner.email
             current_emails = [a.email for a in current_attendees]
             former_emails = event2former_emails.get(event.id, [])
@@ -361,22 +349,22 @@ class Event(ModelSQL, ModelView):
 
             if missing_mails:
                 with Transaction().set_context(skip_schedule_agent=True):
-                    ical = self.event2ical(event)
+                    ical = event.event2ical()
                 ical.add('method')
                 ical.method.value = 'CANCEL'
 
-                subject, body = self.subject_body('cancel', event, owner)
-                msg = self.create_msg(former_organiser_mail[event.id],
-                        missing_mails, subject, body, ical)
-                sent = self.send_msg(former_organiser_mail[event.id],
-                        missing_mails, msg, 'cancel', event.id)
+                subject, body = event.subject_body('cancel', owner)
+                msg = cls.create_msg(former_organiser_mail[event.id],
+                    missing_mails, subject, body, ical)
+                sent = event.send_msg(former_organiser_mail[event.id],
+                    missing_mails, msg, 'cancel')
 
             new_attendees = filter(lambda a: a.email not in former_emails,
                 current_attendees)
             old_attendees = filter(lambda a: a.email in former_emails,
                 current_attendees)
             with Transaction().set_context(skip_schedule_agent=True):
-                ical = self.event2ical(event)
+                ical = event.event2ical()
             if not hasattr(ical, 'method'):
                 ical.add('method')
 
@@ -386,13 +374,13 @@ class Event(ModelSQL, ModelView):
                 if event.status == 'cancelled':
                     ical.method.value = 'CANCEL'
                     #send cancel to old attendee
-                    subject, body = self.subject_body('cancel', event, owner)
-                    msg = self.create_msg(owner_email,
-                            [a.email for a in old_attendees],
-                            subject, body, ical)
-                    sent = self.send_msg(owner_email,
-                            [a.email for a in old_attendees],
-                            msg, 'cancel', event.id)
+                    subject, body = event.subject_body('cancel', owner)
+                    msg = cls.create_msg(owner_email,
+                        [a.email for a in old_attendees],
+                        subject, body, ical)
+                    sent = event.send_msg(owner_email,
+                        [a.email for a in old_attendees],
+                        msg, 'cancel')
                     if sent:
                         sent_succes += old_attendees
                     else:
@@ -401,25 +389,25 @@ class Event(ModelSQL, ModelView):
                 else:
                     ical.method.value = 'REQUEST'
                     #send update to old attendees
-                    subject, body = self.subject_body('update', event, owner)
-                    msg = self.create_msg(owner_email,
-                            [a.email for a in old_attendees],
-                            subject, body, ical)
-                    sent = self.send_msg(owner_email,
-                            [a.email for a in old_attendees],
-                            msg, 'update', event.id)
+                    subject, body = event.subject_body('update', owner)
+                    msg = cls.create_msg(owner_email,
+                        [a.email for a in old_attendees],
+                        subject, body, ical)
+                    sent = event.send_msg(owner_email,
+                        [a.email for a in old_attendees],
+                        msg, 'update')
                     if sent:
                         sent_succes += old_attendees
                     else:
                         sent_fail += old_attendees
                     #send new to new attendees
-                    subject, body = self.subject_body('new', event, owner)
-                    msg = self.create_msg(owner_email,
-                            [a.email for a in new_attendees],
-                            subject, body, ical)
-                    sent = self.send_msg(owner_email,
-                            [a.email for a in new_attendees],
-                            msg, 'new', event.id)
+                    subject, body = event.subject_body('new', owner)
+                    msg = cls.create_msg(owner_email,
+                        [a.email for a in new_attendees],
+                        subject, body, ical)
+                    sent = event.send_msg(owner_email,
+                        [a.email for a in new_attendees],
+                        msg, 'new')
                     if sent:
                         sent_succes += new_attendees
                     else:
@@ -429,13 +417,13 @@ class Event(ModelSQL, ModelView):
                 if event.status != 'cancelled':
                     ical.method.value = 'REQUEST'
                     #send new to new attendees
-                    subject, body = self.subject_body('new', event, owner)
-                    msg = self.create_msg(owner_email,
-                            [a.email for a in new_attendees],
-                            subject, body, ical)
-                    sent = self.send_msg(owner_email,
-                            [a.email for a in new_attendees],
-                            msg, 'new', event.id)
+                    subject, body = event.subject_body('new', owner)
+                    msg = cls.create_msg(owner_email,
+                        [a.email for a in new_attendees],
+                        subject, body, ical)
+                    sent = event.send_msg(owner_email,
+                        [a.email for a in new_attendees],
+                        msg, 'new')
                     if sent:
                         sent_succes += new_attendees
                     else:
@@ -443,53 +431,45 @@ class Event(ModelSQL, ModelView):
 
                 vals = {'status': 'needs-action'}
                 vals['schedule_status'] = '1.1'  # successfully sent
-                attendee_obj.write([a.id for a in sent_succes], vals)
+                Attendee.write(sent_succes, vals)
                 vals['schedule_status'] = '5.1'  # could not complete delivery
-                attendee_obj.write([a.id for a in sent_fail], vals)
-        return res
+                Attendee.write(sent_fail, vals)
 
-    def delete(self, ids):
+    @classmethod
+    def delete(cls, events):
         if Transaction().user == 0:
             # user is 0 means the deletion is triggered by another one
-            return super(Event, self).delete(ids)
-
-        if isinstance(ids, (int, long)):
-            ids = [ids]
+            super(Event, cls).delete(events)
+            return
 
-        events = self.browse(ids)
         send_list = []
         for event in events:
             if event.status == 'cancelled':
                 continue
-            to_notify, owner = self.attendees_to_notify(event)
+            to_notify, owner = event.attendees_to_notify()
             if not to_notify:
                 continue
 
             with Transaction().set_context(skip_schedule_agent=True):
-                ical = self.event2ical(event)
+                ical = event.event2ical()
             ical.add('method')
             ical.method.value = 'CANCEL'
 
             attendee_emails = [a.email for a in to_notify]
-            subject, body = self.subject_body('cancel', event, owner)
-            msg = self.create_msg(owner.email, attendee_emails, subject, body,
-                    ical)
+            subject, body = event.subject_body('cancel', owner)
+            msg = cls.create_msg(owner.email, attendee_emails, subject, body,
+                ical)
 
-            send_list.append((owner.email, attendee_emails, msg, event.id,))
+            send_list.append((owner.email, attendee_emails, msg, event))
 
-        res = super(Event, self).delete(ids)
+        super(Event, cls).delete(events)
         for args in send_list:
-            owner_email, attendee_emails, msg, event_id = args
-            self.send_msg(owner_email, attendee_emails, msg, 'cancel',
-                    event_id)
-        return res
+            owner_email, attendee_emails, msg, event = args
+            event.send_msg(owner_email, attendee_emails, msg, 'cancel')
 
-Event()
-
-
-class Attendee(ModelSQL, ModelView):
-    _name = 'calendar.attendee'
 
+class Attendee:
+    __name__ = 'calendar.attendee'
     schedule_status = fields.Selection([
             ('', ''),
             ('1.0', '1.0'),
@@ -508,60 +488,62 @@ class Attendee(ModelSQL, ModelView):
             ('CLIENT', 'Client'),
             ], 'Schedule Agent')
 
-    def default_schedule_agent(self):
+    @staticmethod
+    def default_schedule_agent():
         return 'SERVER'
 
-    def attendee2values(self, attendee):
-        res = super(Attendee, self).attendee2values(attendee)
+    @classmethod
+    def attendee2values(cls, attendee):
+        values = super(Attendee, cls).attendee2values(attendee)
         if hasattr(attendee, 'schedule_status'):
             if attendee.schedule_status in dict(
-                    self.schedule_status.selection):
-                res['schedule_status'] = attendee.schedule_status
+                    cls.schedule_status.selection):
+                values['schedule_status'] = attendee.schedule_status
         if hasattr(attendee, 'schedule_agent'):
-            if attendee.schedule_agent in dict(self.schedule_agent.selection):
-                res['schedule_agent'] = attendee.schedule_agent
-        return res
-
-    def attendee2attendee(self, attendee):
-        res = super(Attendee, self).attendee2attendee(attendee)
-
-        if attendee.schedule_status:
-            if hasattr(res, 'schedule_status_param'):
-                if res.schedule_status_param in dict(
-                        self.schedule_status.selection):
-                    res.schedule_status_param = attendee.schedule_status
+            if attendee.schedule_agent in dict(cls.schedule_agent.selection):
+                values['schedule_agent'] = attendee.schedule_agent
+        return values
+
+    def attendee2attendee(self):
+        attendee = super(Attendee, self).attendee2attendee()
+
+        if self.schedule_status:
+            if hasattr(attendee, 'schedule_status_param'):
+                if attendee.schedule_status_param in dict(
+                        self.__class__.schedule_status.selection):
+                    attendee.schedule_status_param = self.schedule_status
             else:
-                res.schedule_status_param = attendee.schedule_status
-        elif hasattr(res, 'schedule_status_param'):
-            if res.schedule_status_param in dict(
-                    self.schedule_status.selection):
-                del res.schedule_status_param
+                attendee.schedule_status_param = self.schedule_status
+        elif hasattr(attendee, 'schedule_status_param'):
+            if attendee.schedule_status_param in dict(
+                    self.__class__.schedule_status.selection):
+                del attendee.schedule_status_param
 
         if Transaction().context.get('skip_schedule_agent'):
-            return res
+            return attendee
 
-        if attendee.schedule_agent:
-            if hasattr(res, 'schedule_agent_param'):
-                if res.schedule_agent_param in dict(
-                        self.schedule_agent.selection):
-                    res.schedule_agent_param = attendee.schedule_agent
+        if self.schedule_agent:
+            if hasattr(attendee, 'schedule_agent_param'):
+                if attendee.schedule_agent_param in dict(
+                        self.__class__.schedule_agent.selection):
+                    attendee.schedule_agent_param = self.schedule_agent
             else:
-                res.schedule_agent_param = attendee.schedule_agent
-        elif hasattr(res, 'schedule_agent_param'):
-            if res.schedule_agent_param in dict(self.schedule_agent.selection):
-                del res.schedule_agent_param
-
-        return res
+                attendee.schedule_agent_param = self.schedule_agent
+        elif hasattr(attendee, 'schedule_agent_param'):
+            if attendee.schedule_agent_param in dict(
+                    self.__class__.schedule_agent.selection):
+                del attendee.schedule_agent_param
 
-Attendee()
+        return attendee
 
 
-class EventAttendee(ModelSQL, ModelView):
-    _name = 'calendar.event.attendee'
+class EventAttendee:
+    __name__ = 'calendar.event.attendee'
 
-    def __init__(self):
-        super(EventAttendee, self).__init__()
-        self._error_messages.update({
+    @classmethod
+    def __setup__(cls):
+        super(EventAttendee, cls).__setup__()
+        cls._error_messages.update({
                 'subject': '%s: %s @ %s',
                 'body': ('%s (%s) changed his/her participation status '
                     'to: %s\n\n'),
@@ -573,18 +555,19 @@ class EventAttendee(ModelSQL, ModelView):
                 'when': 'When',
                 })
 
-    def subject_body(self, status, event, owner):
-        lang_obj = Pool().get('ir.lang')
-        event_obj = Pool().get('calendar.event')
+    def subject_body(self, status, owner):
+        pool = Pool()
+        Lang = pool.get('ir.lang')
+        Event = pool.get('calendar.event')
+        event = self.event
 
         if not (event and owner):
             return "", ""
         lang = owner.language
         if not lang:
-            lang_ids = lang_obj.search([
-                ('code', '=', 'en_US'),
-                ], limit=1)
-            lang = lang_obj.browse(lang_ids[0])
+            lang, = Lang.search([
+                    ('code', '=', 'en_US'),
+                    ], limit=1)
 
         summary = event.summary
         if not summary:
@@ -592,20 +575,19 @@ class EventAttendee(ModelSQL, ModelView):
                 summary = self.raise_user_error('no_subject',
                         raise_exception=False)
 
-        date = lang_obj.strftime(event.dtstart, lang.code, lang.date)
+        date = Lang.strftime(event.dtstart, lang.code, lang.date)
         if not event.all_day:
-            date += ' ' + lang_obj.strftime(event.dtstart, lang.code, '%H:%M')
+            date += ' ' + Lang.strftime(event.dtstart, lang.code, '%H:%M')
             if event.dtend:
                 date += ' -'
                 if event.dtstart.date() != event.dtend.date():
-                    date += ' ' + lang_obj.strftime(event.dtend, lang.code,
-                            lang.date)
-                date += ' ' + lang_obj.strftime(event.dtend, lang.code,
-                        '%H:%M')
+                    date += ' ' + Lang.strftime(event.dtend, lang.code,
+                        lang.date)
+                date += ' ' + Lang.strftime(event.dtend, lang.code, '%H:%M')
         else:
             if event.dtend and event.dtstart.date() != event.dtend.date():
-                date += ' - ' + lang_obj.strftime(event.dtend, lang.code,
-                        lang.date)
+                date += ' - ' + Lang.strftime(event.dtend, lang.code,
+                    lang.date)
         if event.timezone:
             date += ' ' + event.timezone
 
@@ -634,7 +616,7 @@ class EventAttendee(ModelSQL, ModelView):
             bullet = self.raise_user_error('bullet', raise_exception=False)
 
             fields_names = ['summary', 'dtstart', 'location', 'attendees']
-            fields = event_obj.fields_get(fields_names=fields_names)
+            fields = Event.fields_get(fields_names=fields_names)
             fields['dtstart']['string'] = self.raise_user_error('when',
                     raise_exception=False)
         for field in fields_names:
@@ -669,7 +651,8 @@ class EventAttendee(ModelSQL, ModelView):
                             + fields[field]['string'] + '\n'
         return subject, body
 
-    def create_msg(self, from_addr, to_addr, subject, body, ical=None):
+    @staticmethod
+    def create_msg(from_addr, to_addr, subject, body, ical=None):
 
         if not to_addr:
             return None
@@ -702,15 +685,9 @@ class EventAttendee(ModelSQL, ModelView):
 
         return msg
 
-    def send_msg(self, from_addr, to_addr, msg, event_id):
+    def send_msg(self, from_addr, to_addr, msg):
         '''
-        Send message
-
-        :param from_addr: a from-address string
-        :param to_addr: recipient address
-        :param msg: a message string
-        :param event_id: the id of the calendar.event
-        :return: a boolean (True if the mail has been sent)
+        Send message and return True if the mail has been sent
         '''
         success = False
         try:
@@ -720,12 +697,11 @@ class EventAttendee(ModelSQL, ModelView):
             success = True
         except Exception:
             logging.getLogger('calendar_scheduling').error(
-                    'Unable to deliver reply mail for event %s' % event_id)
+                'Unable to deliver reply mail for %s' % self)
         return success
 
-    @staticmethod
-    def organiser_to_notify(attendee):
-        event = attendee.event
+    def organiser_to_notify(self):
+        event = self.event
         organizer = event.organizer or event.parent and event.parent.organizer
         if not organizer:
             return None
@@ -734,37 +710,35 @@ class EventAttendee(ModelSQL, ModelView):
             return None
         if organizer == event.calendar.owner.email:
             return None
-        if attendee.email != event.calendar.owner.email:
+        if self.email != event.calendar.owner.email:
             return None
 
         return organizer
 
-    def write(self, ids, values):
-        event_obj = Pool().get('calendar.event')
+    @classmethod
+    def write(cls, attendees, values):
+        Event = Pool().get('calendar.event')
 
         if Transaction().user == 0:
             # user is 0 means write is triggered by another one
-            return super(EventAttendee, self).write(ids, values)
+            super(EventAttendee, cls).write(attendees, values)
+            return
 
         if 'status' not in values:
-            return super(EventAttendee, self).write(ids, values)
-
-        if isinstance(ids, (int, long)):
-            ids = [ids]
+            super(EventAttendee, cls).write(attendees, values)
+            return
 
         att2status = {}
-        attendees = self.browse(ids)
         for attendee in attendees:
             att2status[attendee.id] = attendee.status
 
-        res = super(EventAttendee, self).write(ids, values)
+        super(EventAttendee, cls).write(attendees, values)
 
-        attendees = self.browse(ids)
         for attendee in attendees:
             owner = attendee.event.calendar.owner
             if not owner or not owner.calendar_email_notification_partstat:
                 continue
-            organizer = self.organiser_to_notify(attendee)
+            organizer = attendee.organiser_to_notify()
             if not organizer:
                 continue
 
@@ -775,32 +749,28 @@ class EventAttendee(ModelSQL, ModelView):
                 continue
 
             with Transaction().set_context(skip_schedule_agent=True):
-                ical = event_obj.event2ical(attendee.event)
+                ical = attendee.event.event2ical()
             if not hasattr(ical, 'method'):
                 ical.add('method')
             ical.method.value = 'REPLY'
 
-            subject, body = self.subject_body(new, attendee.event, owner)
-            msg = self.create_msg(owner.email, organizer, subject, body, ical)
+            subject, body = attendee.subject_body(new, owner)
+            msg = cls.create_msg(owner.email, organizer, subject, body, ical)
 
-            sent = self.send_msg(owner.email, organizer, msg,
-                    attendee.event.id)
+            sent = attendee.send_msg(owner.email, organizer, msg)
 
             vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
-            event_obj.write(attendee.event.id, vals)
+            Event.write([attendee.event], vals)
 
-        return res
-
-    def delete(self, ids):
-        event_obj = Pool().get('calendar.event')
+    @classmethod
+    def delete(cls, attendees):
+        Event = Pool().get('calendar.event')
 
         if Transaction().user == 0:
             # user is 0 means the deletion is triggered by another one
-            return super(EventAttendee, self).delete(ids)
+            super(EventAttendee, cls).delete(attendees)
+            return
 
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        attendees = self.browse(ids)
         send_list = []
         for attendee in attendees:
             owner = attendee.event.calendar.owner
@@ -809,66 +779,59 @@ class EventAttendee(ModelSQL, ModelView):
                 continue
             if not owner or not owner.calendar_email_notification_partstat:
                 continue
-            organizer = self.organiser_to_notify(attendee)
+            organizer = attendee.organiser_to_notify()
             if not organizer:
                 continue
 
             with Transaction().set_context(skip_schedule_agent=True):
-                ical = event_obj.event2ical(attendee.event)
+                ical = attendee.event.event2ical()
             if not hasattr(ical, 'method'):
                 ical.add('method')
             ical.method.value = 'REPLY'
 
-            subject, body = self.subject_body('declined', attendee.event,
-                    owner)
-            msg = self.create_msg(owner.email, organizer, subject, body, ical)
+            subject, body = attendee.subject_body('declined', owner)
+            msg = cls.create_msg(owner.email, organizer, subject, body, ical)
 
-            send_list.append((owner.email, organizer, msg, attendee.event.id))
+            send_list.append((owner.email, organizer, msg, attendee))
 
-        res = super(EventAttendee, self).delete(ids)
+        super(EventAttendee, cls).delete(attendees)
         for args in send_list:
-            owner_email, organizer, msg, event_id = args
-            sent = self.send_msg(owner_email, organizer, msg, event_id)
+            owner_email, organizer, msg, attendee = args
+            sent = attendee.send_msg(owner_email, organizer, msg)
             vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
-            event_obj.write(event_id, vals)
-
-        return res
+            Event.write([attendee.event], vals)
 
-    def create(self, values):
-        event_obj = Pool().get('calendar.event')
+    @classmethod
+    def create(cls, values):
+        Event = Pool().get('calendar.event')
 
-        res_id = super(EventAttendee, self).create(values)
+        attendee = super(EventAttendee, cls).create(values)
         if Transaction().user == 0:
             # user is 0 means create is triggered by another one
-            return res_id
-
-        attendee = self.browse(res_id)
+            return attendee
 
         owner = attendee.event.calendar.owner
 
         if (not attendee.status) or attendee.status in ('', 'needs-action'):
-            return res_id
+            return attendee
         if not owner or not owner.calendar_email_notification_partstat:
-            return res_id
-        organizer = self.organiser_to_notify(attendee)
+            return attendee
+        organizer = attendee.organiser_to_notify()
         if not organizer:
-            return res_id
+            return attendee
 
         with Transaction().set_context(skip_schedule_agent=True):
-            ical = event_obj.event2ical(attendee.event)
+            ical = attendee.event.event2ical()
         if not hasattr(ical, 'method'):
             ical.add('method')
         ical.method.value = 'REPLY'
 
-        subject, body = self.subject_body(attendee.status, attendee.event,
-                owner)
-        msg = self.create_msg(owner.email, organizer, subject, body, ical)
+        subject, body = attendee.subject_body(attendee.status, owner)
+        msg = cls.create_msg(owner.email, organizer, subject, body, ical)
 
-        sent = self.send_msg(owner.email, organizer, msg, attendee.event.id)
+        sent = attendee.send_msg(owner.email, organizer, msg)
 
         vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
-        event_obj.write(attendee.event.id, vals)
-
-        return res_id
+        Event.write([attendee.event], vals)
 
-EventAttendee()
+        return attendee
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 7adea95..ffa2c91 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -120,7 +120,7 @@ msgstr "Invitaciones Cambiadas"
 
 msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
-msgstr ""
+msgstr "Punto de Orden"
 
 msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
@@ -136,7 +136,7 @@ msgstr "Servidor"
 
 msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
-msgstr ""
+msgstr "Punto de Orden"
 
 msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
@@ -172,7 +172,7 @@ msgstr "5.3"
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
-msgstr ""
+msgstr "Punto de Orden"
 
 msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
@@ -188,7 +188,7 @@ msgstr "Servidor"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
-msgstr ""
+msgstr "Punto de Orden"
 
 msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
diff --git a/res.py b/res.py
index 41641d0..7ce879f 100644
--- a/res.py
+++ b/res.py
@@ -1,11 +1,14 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.model import ModelSQL, ModelView, fields
+from trytond.model import fields
+from trytond.pool import PoolMeta
 
+__all__ = ['User']
+__metaclass__ = PoolMeta
 
-class User(ModelSQL, ModelView):
-    _name = 'res.user'
 
+class User:
+    __name__ = 'res.user'
     calendar_email_notification_new = fields.Boolean(
             'New invitations')
     calendar_email_notification_update = fields.Boolean(
@@ -15,25 +18,28 @@ class User(ModelSQL, ModelView):
     calendar_email_notification_partstat = fields.Boolean(
             'Invitation Replies')
 
-    def default_calendar_email_notification_new(self):
+    @staticmethod
+    def default_calendar_email_notification_new():
         return True
 
-    def default_calendar_email_notification_update(self):
+    @staticmethod
+    def default_calendar_email_notification_update():
         return True
 
-    def default_calendar_email_notification_cancel(self):
+    @staticmethod
+    def default_calendar_email_notification_cancel():
         return True
 
-    def default_calendar_email_notification_partstat(self):
+    @staticmethod
+    def default_calendar_email_notification_partstat():
         return True
 
-    def __init__(self):
-        super(User, self).__init__()
-        self._preferences_fields += [
+    @classmethod
+    def __setup__(cls):
+        super(User, cls).__setup__()
+        cls._preferences_fields += [
             'calendar_email_notification_new',
             'calendar_email_notification_update',
             'calendar_email_notification_cancel',
             'calendar_email_notification_partstat',
-        ]
-
-User()
+            ]
diff --git a/setup.py b/setup.py
index fa03850..b79e5ae 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
 
 from setuptools import setup
 import re
+import os
+import ConfigParser
 
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+    if key in info:
+        info[key] = info[key].strip().splitlines()
 major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
 major_version = int(major_version)
 minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
 
 setup(name='trytond_calendar_scheduling',
     version=info.get('version', '0.0.1'),
-    description=info.get('description', ''),
-    author=info.get('author', ''),
-    author_email=info.get('email', ''),
-    url=info.get('website', ''),
+    description='Tryton module to add scheduling support on CalDAV',
+    long_description=read('README'),
+    author='Tryton',
+    url='http://www.tryton.org/',
     download_url="http://downloads.tryton.org/" + \
             info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
     package_dir={'trytond.modules.calendar_scheduling': '.'},
     packages=[
         'trytond.modules.calendar_scheduling',
         'trytond.modules.calendar_scheduling.tests',
-    ],
+        ],
     package_data={
         'trytond.modules.calendar_scheduling': info.get('xml', []) \
-                + info.get('translation', []),
-    },
+            + ['tryton.cfg', 'locale/*.po'],
+        },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -57,12 +68,12 @@ setup(name='trytond_calendar_scheduling',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
-    ],
+        ],
     license='GPL-3',
     install_requires=requires,
     extras_require={
         'test': ['caldav'],
-    },
+        },
     zip_safe=False,
     entry_points="""
     [trytond.modules]
@@ -70,4 +81,4 @@ setup(name='trytond_calendar_scheduling',
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
-)
+    )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..96774cf
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,9 @@
+[tryton]
+version=2.6.0
+depends:
+    calendar
+    ir
+    res
+    webdav
+xml:
+    res.xml
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index af9dec4..37237e3 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,13 +1,49 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-scheduling
-Version: 2.4.1
-Summary: Add Scheduling support on CalDAV
+Version: 2.6.0
+Summary: Tryton module to add scheduling support on CalDAV
 Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_calendar_scheduling
+        ===========================
+        
+        The calendar_scheduling module of the Tryton application platform.  See
+        __tryton__.py
+        
+        Installing
+        ----------
+        
+        See INSTALL
+        
+        Support
+        -------
+        
+        If you encounter any problems with Tryton, please don't hesitate to ask
+        questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+        
+          http://bugs.tryton.org/
+          http://groups.tryton.org/
+          http://wiki.tryton.org/
+          irc://irc.freenode.net/tryton
+        
+        License
+        -------
+        
+        See LICENSE
+        
+        Copyright
+        ---------
+        
+        See COPYRIGHT
+        
+        
+        For more information please visit the Tryton web site:
+        
+          http://www.tryton.org/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/trytond_calendar_scheduling.egg-info/SOURCES.txt b/trytond_calendar_scheduling.egg-info/SOURCES.txt
index 170d844..6d2bd0e 100644
--- a/trytond_calendar_scheduling.egg-info/SOURCES.txt
+++ b/trytond_calendar_scheduling.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
 README
 res.xml
 setup.py
+tryton.cfg
 ./__init__.py
-./__tryton__.py
 ./caldav.py
 ./calendar_.py
 ./res.py
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index f1f0efa..46a9d20 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,6 +1,6 @@
 PyWebDAV >= 0.9.8
-trytond_calendar >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
+trytond_calendar >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
 
 [test]
 caldav
\ No newline at end of file
commit e60cbc44c49c8420c0c1977569136ce794539d82
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 11 13:16:46 2012 +0200

    Adding upstream version 2.4.1.

diff --git a/CHANGELOG b/CHANGELOG
index 485f819..8349101 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.4.0 - 2012-04-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 4838e5b..0f22144 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_scheduling
-Version: 2.4.0
+Version: 2.4.1
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 2423bf5..4f31304 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -11,7 +11,7 @@
     'name_es_ES': 'Planificador del calendario',
     'name_fr_FR': 'Programmation calendrier',
     'name_ru_RU': 'Календарное планирование',
-    'version': '2.4.0',
+    'version': '2.4.1',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar_.py b/calendar_.py
index d86873f..fe6f8c3 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -762,7 +762,7 @@ class EventAttendee(ModelSQL, ModelView):
         attendees = self.browse(ids)
         for attendee in attendees:
             owner = attendee.event.calendar.owner
-            if not owner.calendar_email_notification_partstat:
+            if not owner or not owner.calendar_email_notification_partstat:
                 continue
             organizer = self.organiser_to_notify(attendee)
             if not organizer:
@@ -807,7 +807,7 @@ class EventAttendee(ModelSQL, ModelView):
 
             if attendee.status == 'declined':
                 continue
-            if not owner.calendar_email_notification_partstat:
+            if not owner or not owner.calendar_email_notification_partstat:
                 continue
             organizer = self.organiser_to_notify(attendee)
             if not organizer:
@@ -848,7 +848,7 @@ class EventAttendee(ModelSQL, ModelView):
 
         if (not attendee.status) or attendee.status in ('', 'needs-action'):
             return res_id
-        if not owner.calendar_email_notification_partstat:
+        if not owner or not owner.calendar_email_notification_partstat:
             return res_id
         organizer = self.organiser_to_notify(attendee)
         if not organizer:
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index 7388500..af9dec4 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-scheduling
-Version: 2.4.0
+Version: 2.4.1
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
commit 034e0727fe3f885c9619a9e83c876a4924c54ad9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 24 19:30:39 2012 +0200

    Adding upstream version 2.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index 4646a7a..485f819 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.2.1 - 2011-12-26
+Version 2.4.0 - 2012-04-24
 * Bug fixes (see mercurial logs for details)
 
 Version 2.2.0 - 2011-10-24
diff --git a/COPYRIGHT b/COPYRIGHT
index 1245dd5..8ad4b79 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-2012 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index e47141c..e1bc701 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,10 +4,10 @@ Installing trytond_calendar_scheduling
 Prerequisites
 -------------
 
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_calendar (http://www.tryton.org/)
- * pywebdav 0.9.3 or later (http://sourceforge.net/projects/pywebdav/)
+ * pywebdav 0.9.8 or later (http://sourceforge.net/projects/pywebdav/)
 
 Installation
 ------------
diff --git a/PKG-INFO b/PKG-INFO
index f126c62..4838e5b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: trytond_calendar_scheduling
-Version: 2.2.1
+Version: 2.4.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index eca8f15..fffd91a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-import caldav
-from calendar import *
-from res import *
+from . import caldav
+from .calendar_ import *
+from .res import *
diff --git a/__tryton__.py b/__tryton__.py
index 52bc346..2423bf5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,37 +2,43 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 {
-    'name' : 'Calendar Scheduling',
-    'name_bg_BG' : 'График към календар',
-    'name_de_DE' : 'Kalender Terminplanung',
-    'name_es_CO' : 'Planificador del calendario',
-    'name_es_ES' : 'Planificador del calendario',
-    'name_fr_FR' : 'Programmation calendrier',
-    'name_ru_RU' : 'Календарное планирование',
-    'version' : '2.2.1',
-    'author' : 'B2CK',
+    'name': 'Calendar Scheduling',
+    'name_bg_BG': 'График към календар',
+    'name_ca_ES': 'Planificador del calendari',
+    'name_de_DE': 'Kalender Terminplanung',
+    'name_es_AR': 'Planificador del calendario',
+    'name_es_CO': 'Planificador del calendario',
+    'name_es_ES': 'Planificador del calendario',
+    'name_fr_FR': 'Programmation calendrier',
+    'name_ru_RU': 'Календарное планирование',
+    'version': '2.4.0',
+    'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
     'description': 'Add Scheduling support on CalDAV',
-    'description_bg_BG' : 'Добавя график към CalDAV',
-    'description_de_DE' : 'Fügt Unterstützung für die Terminplanung in CalDAV hinzu',
-    'description_es_CO' : 'Añade gestión de planificación de eventos a CalDAV',
-    'description_es_ES' : 'Añade la gestión de planificación de eventos a CalDAV',
-    'description_fr_FR' : 'Ajoute la gestion de la programmation d\'évènements au CalDAV',
-    'description_ru_RU' : 'Добавление поддержки планирования для CalDAV',
-    'depends' : [
+    'description_bg_BG': 'Добавя график към CalDAV',
+    'description_ca_ES': 'Afegeix suport per la planificació al CalDAV.',
+    'description_de_DE': 'Fügt Unterstützung für die Terminplanung in CalDAV hinzu',
+    'description_es_AR': 'Añade gestión de planificación de eventos a CalDAV',
+    'description_es_CO': 'Añade gestión de planificación de eventos a CalDAV',
+    'description_es_ES': 'Añade la gestión de planificación de eventos a CalDAV',
+    'description_fr_FR': 'Ajoute la gestion de la programmation d\'évènements au CalDAV',
+    'description_ru_RU': 'Добавление поддержки планирования для CalDAV',
+    'depends': [
         'ir',
         'res',
         'webdav',
         'calendar',
     ],
-    'xml' : [
+    'xml': [
         'res.xml',
     ],
     'translation': [
         'locale/bg_BG.po',
+        'locale/ca_ES.po',
         'locale/cs_CZ.po',
         'locale/de_DE.po',
+        'locale/es_AR.po',
         'locale/es_ES.po',
         'locale/es_CO.po',
         'locale/fr_FR.po',
diff --git a/caldav.py b/caldav.py
index b57e8a6..7f2f1b8 100644
--- a/caldav.py
+++ b/caldav.py
@@ -1,8 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-_TRYTON_RELOAD = False
-
-from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
+from pywebdav.lib.constants import DAV_VERSION_1, DAV_VERSION_2
 
 DAV_VERSION_1['version'] += ',calendar-auto-schedule'
 DAV_VERSION_2['version'] += ',calendar-auto-schedule'
diff --git a/calendar.py b/calendar_.py
similarity index 97%
rename from calendar.py
rename to calendar_.py
index 436604e..d86873f 100644
--- a/calendar.py
+++ b/calendar_.py
@@ -1,9 +1,7 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from email.mime.text import MIMEText
 from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
-import email.utils
 import logging
 from trytond.model import ModelSQL, ModelView, fields
 from trytond.tools import get_smtp_server
@@ -249,7 +247,7 @@ class Event(ModelSQL, ModelView):
             success = to_addrs
         except Exception:
             logging.getLogger('calendar_scheduling').error(
-                    'Unable to deliver scheduling mail for event %s' % event_id)
+                'Unable to deliver scheduling mail for event %s' % event_id)
         return success
 
     @staticmethod
@@ -311,9 +309,9 @@ class Event(ModelSQL, ModelView):
 
         vals = {'status': 'needs-action'}
         if sent:
-            vals['schedule_status'] = '1.1' #successfully sent
+            vals['schedule_status'] = '1.1'  # successfully sent
         else:
-            vals['schedule_status'] = '5.1' #could not complete delivery
+            vals['schedule_status'] = '5.1'  # could not complete delivery
         attendee_obj.write([a.id for a in to_notify], vals)
 
         return res
@@ -444,9 +442,9 @@ class Event(ModelSQL, ModelView):
                         sent_fail += new_attendees
 
                 vals = {'status': 'needs-action'}
-                vals['schedule_status'] = '1.1' #successfully sent
+                vals['schedule_status'] = '1.1'  # successfully sent
                 attendee_obj.write([a.id for a in sent_succes], vals)
-                vals['schedule_status'] = '5.1' #could not complete delivery
+                vals['schedule_status'] = '5.1'  # could not complete delivery
                 attendee_obj.write([a.id for a in sent_fail], vals)
         return res
 
@@ -516,7 +514,8 @@ class Attendee(ModelSQL, ModelView):
     def attendee2values(self, attendee):
         res = super(Attendee, self).attendee2values(attendee)
         if hasattr(attendee, 'schedule_status'):
-            if attendee.schedule_status in dict(self.schedule_status.selection):
+            if attendee.schedule_status in dict(
+                    self.schedule_status.selection):
                 res['schedule_status'] = attendee.schedule_status
         if hasattr(attendee, 'schedule_agent'):
             if attendee.schedule_agent in dict(self.schedule_agent.selection):
@@ -528,12 +527,14 @@ class Attendee(ModelSQL, ModelView):
 
         if attendee.schedule_status:
             if hasattr(res, 'schedule_status_param'):
-                if res.schedule_status_param in dict(self.schedule_status.selection):
+                if res.schedule_status_param in dict(
+                        self.schedule_status.selection):
                     res.schedule_status_param = attendee.schedule_status
             else:
                 res.schedule_status_param = attendee.schedule_status
         elif hasattr(res, 'schedule_status_param'):
-            if res.schedule_status_param in dict(self.schedule_status.selection):
+            if res.schedule_status_param in dict(
+                    self.schedule_status.selection):
                 del res.schedule_status_param
 
         if Transaction().context.get('skip_schedule_agent'):
@@ -541,7 +542,8 @@ class Attendee(ModelSQL, ModelView):
 
         if attendee.schedule_agent:
             if hasattr(res, 'schedule_agent_param'):
-                if res.schedule_agent_param in dict(self.schedule_agent.selection):
+                if res.schedule_agent_param in dict(
+                        self.schedule_agent.selection):
                     res.schedule_agent_param = attendee.schedule_agent
             else:
                 res.schedule_agent_param = attendee.schedule_agent
@@ -561,7 +563,8 @@ class EventAttendee(ModelSQL, ModelView):
         super(EventAttendee, self).__init__()
         self._error_messages.update({
                 'subject': '%s: %s @ %s',
-                'body': '%s (%s) changed his/her participation status to: %s\n\n',
+                'body': ('%s (%s) changed his/her participation status '
+                    'to: %s\n\n'),
                 'accepted_body': '%s (%s) has accepted this invitation:\n\n',
                 'declined_body': '%s (%s) has declined this invitattion:\n\n',
                 'no_subject': "(No Subject)",
@@ -610,7 +613,7 @@ class EventAttendee(ModelSQL, ModelView):
         fields_names = ['status']
         with Transaction().set_context(language=lang.code):
             fields = self.fields_get(fields_names=fields_names)
-        for k,v in  fields['status']['selection']:
+        for k, v in  fields['status']['selection']:
             if k == status:
                 status_string = v
 
@@ -822,7 +825,6 @@ class EventAttendee(ModelSQL, ModelView):
 
             send_list.append((owner.email, organizer, msg, attendee.event.id))
 
-
         res = super(EventAttendee, self).delete(ids)
         for args in send_list:
             owner_email, organizer, msg, event_id = args
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 9f52803..d8da990 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,230 +2,230 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "    * "
 msgstr "    * "
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr "%s (%s) промени състоянието за участието си на: %s"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
 msgstr "%s (%s) приеха поканата:"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr "%s (%s) отказаха поканата:"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
 msgstr "%s: %s @ %s"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr "(Няма тема)"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr "Кога"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr "    * "
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr "(Няма тема)"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr "Отказано събитие: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
 msgstr "Покана: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
 msgstr "Събитието бе прекратено."
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
 msgstr "Събитоето бе променено."
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr "Променена покана: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "When"
 msgstr "Кога"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
 msgstr "Поканени сте на това събитие."
 
-msgctxt "field:calendar.attendee,schedule_agent:0"
+msgctxt "field:calendar.attendee,schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Пълномощник на графика"
 
-msgctxt "field:calendar.attendee,schedule_status:0"
+msgctxt "field:calendar.attendee,schedule_status:"
 msgid "Schedule Status"
 msgstr "Състояние на график"
 
-msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Пълномощник на графика"
 
-msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
 msgstr "Състояние на график"
 
-msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
 msgstr "Отказани покани"
 
-msgctxt "field:res.user,calendar_email_notification_new:0"
+msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
 msgstr "Нови покани"
 
-msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
 msgstr "Отговори на покана"
 
-msgctxt "field:res.user,calendar_email_notification_update:0"
+msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Променени покани"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
 msgstr "Клиент"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "None"
 msgstr "Няма"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Server"
 msgstr "Сървър"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.2"
 msgstr "5.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr "Клиент"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr "Няма"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr "Сървър"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.2"
 msgstr "5.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
 msgstr "Известяване за събитие от календар"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr "Известия"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..bcc82a6
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,233 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr ""
+"%s (%s) hl'estat de la seva participació a: %s\n"
+"\n"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr "%s (%s) ha acceptat aquesta invitació:"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr "%s (%s) ha declinat aquesta invitació:"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "(No Subject)"
+msgstr "(Sense assumpte)"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "When"
+msgstr "Quan"
+
+msgctxt "error:calendar.event:"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event:"
+msgid "(No Subject)"
+msgstr "(Sense assumpte)"
+
+msgctxt "error:calendar.event:"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event:"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Esdeveniment cancel·lat: %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid "Invitation: %s @ %s"
+msgstr "Invitació: %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr "Aquest esdeveniment ha estat cancel·lat."
+
+msgctxt "error:calendar.event:"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr "Aquest esdeveniment ha canviat."
+
+msgctxt "error:calendar.event:"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Invitació actualitzada: %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid "When"
+msgstr "Quan"
+
+msgctxt "error:calendar.event:"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr "Ha estat convidat al següent esdeveniment."
+
+msgctxt "field:calendar.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agent del planificador"
+
+msgctxt "field:calendar.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Estat de la planificació"
+
+msgctxt "field:calendar.event,organizer_schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agent del planificador"
+
+msgctxt "field:calendar.event,organizer_schedule_status:"
+msgid "Schedule Status"
+msgstr "Estat de la planificació"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:"
+msgid "Cancelled invitations"
+msgstr "Invitacions cancel·lades"
+
+msgctxt "field:res.user,calendar_email_notification_new:"
+msgid "New invitations"
+msgstr "Noves invitacions"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:"
+msgid "Invitation Replies"
+msgstr "Respostes a les invitacions"
+
+msgctxt "field:res.user,calendar_email_notification_update:"
+msgid "Changed invitations"
+msgstr "Invitacions canviades"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid ""
+msgstr "Servidor"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "None"
+msgstr "Cap"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid ""
+msgstr "5.3"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid ""
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "None"
+msgstr "Cap"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid ""
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:"
+msgid "Calendar Email Notifications"
+msgstr "Notificacions per correu electrònic del calendari"
+
+msgctxt "view:res.user:"
+msgid "Notifications"
+msgstr "Notificacions"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index fee40f1..6990e8c 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,230 +2,230 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "    * "
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ":"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "When"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
 msgstr ""
 
-msgctxt "field:calendar.attendee,schedule_agent:0"
+msgctxt "field:calendar.attendee,schedule_agent:"
 msgid "Schedule Agent"
 msgstr ""
 
-msgctxt "field:calendar.attendee,schedule_status:0"
+msgctxt "field:calendar.attendee,schedule_status:"
 msgid "Schedule Status"
 msgstr ""
 
-msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr ""
 
-msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
 msgstr ""
 
-msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
 msgstr ""
 
-msgctxt "field:res.user,calendar_email_notification_new:0"
+msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
 msgstr ""
 
-msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
 msgstr ""
 
-msgctxt "field:res.user,calendar_email_notification_update:0"
+msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "None"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Server"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.1"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.2"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.7"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.8"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.1"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.2"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.3"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.2"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.8"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.2"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr ""
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
 msgstr ""
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 5b72a25..36314ae 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,11 +2,11 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "    * "
 msgstr "    * "
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
@@ -14,7 +14,7 @@ msgstr ""
 "%s (%s) hat den Teilnahmestatus geändert auf: %s\n"
 "\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
@@ -22,7 +22,7 @@ msgstr ""
 "%s (%s) hat folgende Einladung angenommen:\n"
 "\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
@@ -30,43 +30,43 @@ msgstr ""
 "%s (%s) hat folgende Einladung abgesagt:\n"
 "\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
 msgstr "%s: %s @ %s"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr "Wann"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr "    * "
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr "Abgesagter Termin: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
 msgstr "Einladung: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
@@ -74,7 +74,7 @@ msgstr ""
 "Dieser Termin wurde abgesagt.\n"
 "\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
@@ -82,15 +82,15 @@ msgstr ""
 "Dieser Termin wurde geändert.\n"
 "\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr "Aktualisierte Einladung: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "When"
 msgstr "Wann"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
@@ -98,146 +98,146 @@ msgstr ""
 "Sie wurden zu dem folgendem Termin eingeladen:\n"
 "\n"
 
-msgctxt "field:calendar.attendee,schedule_agent:0"
+msgctxt "field:calendar.attendee,schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Terminplaner Agent"
 
-msgctxt "field:calendar.attendee,schedule_status:0"
+msgctxt "field:calendar.attendee,schedule_status:"
 msgid "Schedule Status"
 msgstr "Terminplaner Status"
 
-msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Terminplaner Agent"
 
-msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
 msgstr "Terminplaner Status"
 
-msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
 msgstr "Absagen von Einladungen"
 
-msgctxt "field:res.user,calendar_email_notification_new:0"
+msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
 msgstr "Neue Einladungen"
 
-msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
 msgstr "Antworten auf Einladungen"
 
-msgctxt "field:res.user,calendar_email_notification_update:0"
+msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Änderungen von Einladungen"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
 msgstr "Client"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "None"
 msgstr "Keiner"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Server"
 msgstr "Server"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.2"
 msgstr "5.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr "Client"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr "Keiner"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr "Server"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.2"
 msgstr "5.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
 msgstr "Kalender E-Mail Benachrichtigungen"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr "Benachrichtigungen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..8966448
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,233 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr ""
+"%s (%s) cambió el estado de su participación a: %s\n"
+"\n"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr "%s (%s) ha aceptado esta invitación:"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr "%s (%s) ha declinado esta invitación:"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "(No Subject)"
+msgstr "(Sin asunto)"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "When"
+msgstr "Cuando"
+
+msgctxt "error:calendar.event:"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event:"
+msgid "(No Subject)"
+msgstr "(Sin asunto)"
+
+msgctxt "error:calendar.event:"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event:"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Evento cancelado: %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid "Invitation: %s @ %s"
+msgstr "Invitación: %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr "Este evento ha sido cancelado."
+
+msgctxt "error:calendar.event:"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr "Este evento ha cambiado."
+
+msgctxt "error:calendar.event:"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Invitación actualizada: %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid "When"
+msgstr "Cuando"
+
+msgctxt "error:calendar.event:"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr "Ha sido invitado al siguiente evento."
+
+msgctxt "field:calendar.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agente del planificador"
+
+msgctxt "field:calendar.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Estado de la planificación"
+
+msgctxt "field:calendar.event,organizer_schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agente del planificador"
+
+msgctxt "field:calendar.event,organizer_schedule_status:"
+msgid "Schedule Status"
+msgstr "Estado de la planificación"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:"
+msgid "Cancelled invitations"
+msgstr "Invitaciones canceladas"
+
+msgctxt "field:res.user,calendar_email_notification_new:"
+msgid "New invitations"
+msgstr "Nuevas invitaciones"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:"
+msgid "Invitation Replies"
+msgstr "Respuestas a las invitaciones"
+
+msgctxt "field:res.user,calendar_email_notification_update:"
+msgid "Changed invitations"
+msgstr "Invitaciones cambiadas"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:"
+msgid "Calendar Email Notifications"
+msgstr "Notificaciones por correo electrónico del calendario"
+
+msgctxt "view:res.user:"
+msgid "Notifications"
+msgstr "Notificaciones"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 429aaeb..7adea95 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,230 +2,230 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "    * "
 msgstr "    * "
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr "%s (%s) cambió su estado de participación"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
 msgstr "%s (%s) ha aceptado esta invitación:"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr "%s (%s) rechazó esta invitación:"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
 msgstr "%s: %s @ %s"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr "(Sin Asunto)"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr "Cuando"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr "    * "
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr "(Sin Asunto)"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr "Evento Cancelado: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
 msgstr "Invitación: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
 msgstr "Este evento se canceló."
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
 msgstr "Este evento cambió."
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr "Invitación actualizada: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "When"
 msgstr "Cuando"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
 msgstr "Usted fue invitado al siguiente evento."
 
-msgctxt "field:calendar.attendee,schedule_agent:0"
+msgctxt "field:calendar.attendee,schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Agente de programación"
 
-msgctxt "field:calendar.attendee,schedule_status:0"
+msgctxt "field:calendar.attendee,schedule_status:"
 msgid "Schedule Status"
 msgstr "Estado de Programación"
 
-msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Agente de Programación"
 
-msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
 msgstr "Estado de programación"
 
-msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
 msgstr "Invitaciones canceladas"
 
-msgctxt "field:res.user,calendar_email_notification_new:0"
+msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
 msgstr "Nuevas invitaciones"
 
-msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
 msgstr "Invitaciones Contestadas"
 
-msgctxt "field:res.user,calendar_email_notification_update:0"
+msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Invitaciones Cambiadas"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
 msgstr "Cliente"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "None"
 msgstr "Ninguno"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Server"
 msgstr "Servidor"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.2"
 msgstr "5.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr "Cliente"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr "Ninguna"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr "Servidor"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.2"
 msgstr "5.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
 msgstr "Notificaciones de Calendario por Email"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr "Notificaciones"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index c3b445d..63dbbe1 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,11 +2,11 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "    * "
 msgstr "    * "
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
@@ -14,220 +14,220 @@ msgstr ""
 "%s (%s) cambió el estado de su participación a: %s\n"
 "\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
 msgstr "%s (%s) ha aceptado esta invitación:"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr "%s (%s) ha declinado esta invitación:"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
 msgstr "%s: %s @ %s"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr "Cuando"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr "    * "
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr "Evento cancelado: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
 msgstr "Invitación: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
 msgstr "Este evento ha sido cancelado."
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
 msgstr "Este evento ha cambiado."
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr "Invitación actualizada: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "When"
 msgstr "Cuando"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
 msgstr "Ha sido invitado al siguiente evento."
 
-msgctxt "field:calendar.attendee,schedule_agent:0"
+msgctxt "field:calendar.attendee,schedule_agent:"
 msgid "Schedule Agent"
-msgstr "Agente del planificador"
+msgstr "Agente de la planificación"
 
-msgctxt "field:calendar.attendee,schedule_status:0"
+msgctxt "field:calendar.attendee,schedule_status:"
 msgid "Schedule Status"
 msgstr "Estado de la planificación"
 
-msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
-msgstr "Agente del planificador"
+msgstr "Agente de la planificación"
 
-msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
 msgstr "Estado de la planificación"
 
-msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
 msgstr "Invitaciones canceladas"
 
-msgctxt "field:res.user,calendar_email_notification_new:0"
+msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
 msgstr "Nuevas invitaciones"
 
-msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
 msgstr "Respuestas a las invitaciones"
 
-msgctxt "field:res.user,calendar_email_notification_update:0"
+msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Invitaciones cambiadas"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
 msgstr "Cliente"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "None"
 msgstr "Ninguno"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Server"
 msgstr "Servidor"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.2"
 msgstr "5.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr "Cliente"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr "Ninguno"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr "Servidor"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.2"
 msgstr "5.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
 msgstr "Notificaciones por correo electrónico del calendario"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr "Notificaciones"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f671739..e81c6e6 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,65 +2,131 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "    * "
 msgstr "    *"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
+msgid "    * "
+msgstr "    *"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr "%s (%s) a un nouveau statut de participation : %s\n"
+
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr "%s (%s) a un nouveau statut de participation : %s\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr "%s (%s) a accepté l'invitation suivante :\n"
+
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
 msgstr "%s (%s) a accepté l'invitation suivante :\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr "%s (%s) a décliné l'invitation suivante :\n"
+
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr "%s (%s) a décliné l'invitation suivante :\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
 msgstr "%s: %s @ %s"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
+msgid "(No Subject)"
+msgstr "(Pas de sujet)"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
+msgid "When"
+msgstr "Quand"
+
+msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr "Quand"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr "    *"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
+msgid "    * "
+msgstr "    *"
+
+msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
+msgid "(No Subject)"
+msgstr "(Pas de sujet)"
+
+msgctxt "error:calendar.event:"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event:"
 msgid ":"
 msgstr ":"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr "Événement annulé : %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Événement annulé : %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid "Invitation: %s @ %s"
+msgstr "Invitation: %s @ %s"
+
+msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
 msgstr "Invitation: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr ""
+"Cet événement a été annulé.\n"
+"\n"
+
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
@@ -68,7 +134,15 @@ msgstr ""
 "Cet événement a été annulé.\n"
 "\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr ""
+"Cet événement a été modifié.\n"
+"\n"
+
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
@@ -76,15 +150,23 @@ msgstr ""
 "Cet événement a été modifié.\n"
 "\n"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr "Invitation mise à jour : %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Invitation mise à jour : %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid "When"
+msgstr "Quand"
+
+msgctxt "error:calendar.event:"
 msgid "When"
 msgstr "Quand"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
@@ -92,146 +174,266 @@ msgstr ""
 "Vous avez été invité à l'événement suivant.\n"
 "\n"
 
-msgctxt "field:calendar.attendee,schedule_agent:0"
+msgctxt "error:calendar.event:"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr ""
+"Vous avez été invité à l'événement suivant.\n"
+"\n"
+
+msgctxt "field:calendar.attendee,schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Agent de planification"
 
-msgctxt "field:calendar.attendee,schedule_status:0"
+msgctxt "field:calendar.attendee,schedule_status:"
 msgid "Schedule Status"
 msgstr "Statut de planification"
 
-msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Agent de planification"
 
-msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
 msgstr "Statut de planification"
 
-msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
 msgstr "Invitations annulées"
 
-msgctxt "field:res.user,calendar_email_notification_new:0"
+msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
 msgstr "Nouvelles invitations"
 
-msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
 msgstr "Réponses aux invitations"
 
-msgctxt "field:res.user,calendar_email_notification_update:0"
+msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Modification des invitations"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
 msgstr "Client"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "None"
 msgstr "Aucun"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "None"
+msgstr "Aucun"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Serveur"
+
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Server"
 msgstr "Serveur"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.2"
 msgstr "5.1"
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr "Client"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr "Aucun"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "None"
+msgstr "Aucun"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "Server"
+msgstr "Serveur"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr "Serveur"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
 msgstr "1.0"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr "1.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.2"
 msgstr "1.2"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr "3.7"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.8"
 msgstr "3.8"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr "5.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.2"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.2"
 msgstr "5.1"
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr "5.3"
 
-msgctxt "view:res.user:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
 msgstr "Notifications calendrier par Email"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
+msgid "Calendar Email Notifications"
+msgstr "Notifications calendrier par Email"
+
+msgctxt "view:res.user:"
+msgid "Notifications"
+msgstr "Avertissements"
+
+msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr "Avertissements"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 5b6d456..8910295 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,232 +2,232 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "    * "
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ":"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "When"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
 msgstr ""
 
-msgctxt "field:calendar.attendee,schedule_agent:0"
+msgctxt "field:calendar.attendee,schedule_agent:"
 msgid "Schedule Agent"
 msgstr ""
 
-msgctxt "field:calendar.attendee,schedule_status:0"
+msgctxt "field:calendar.attendee,schedule_status:"
 msgid "Schedule Status"
 msgstr ""
 
-msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr ""
 
-msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
 msgstr ""
 
-msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
 msgstr ""
 
-msgctxt "field:res.user,calendar_email_notification_new:0"
+msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
 msgstr ""
 
-msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
 msgstr ""
 
-msgctxt "field:res.user,calendar_email_notification_update:0"
+msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
 msgstr ""
 
 #, fuzzy
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "None"
 msgstr "Geen"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Server"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.1"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.2"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.7"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.8"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.1"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.2"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.3"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr ""
 
 #, fuzzy
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr "Geen"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.2"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.8"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.2"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr ""
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
 msgstr ""
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index cdb699f..3f19f7b 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,234 +2,230 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "    * "
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) changed his/her participation status to: %s\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has accepted this invitation:\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ""
 "%s (%s) has declined this invitattion:\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "%s: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "(No Subject)"
 msgstr "(Нет описания)"
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid ":"
 msgstr ""
 
-msgctxt "error:calendar.event.attendee:0"
+msgctxt "error:calendar.event.attendee:"
 msgid "When"
 msgstr "Когда"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "    * "
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "(No Subject)"
 msgstr "(Нет описания)"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ":"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Cancelled Event: %s @ %s"
 msgstr "Событие отмененно: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Invitation: %s @ %s"
 msgstr "Приглашение: %s @ %s"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been canceled.\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "This event has been changed.\n"
 "\n"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "Updated Invitation: %s @ %s"
 msgstr ""
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid "When"
 msgstr "Когда"
 
-msgctxt "error:calendar.event:0"
+msgctxt "error:calendar.event:"
 msgid ""
 "You have been invited to the following event.\n"
 "\n"
 msgstr ""
 
-msgctxt "field:calendar.attendee,schedule_agent:0"
+msgctxt "field:calendar.attendee,schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Расписание агента"
 
-msgctxt "field:calendar.attendee,schedule_status:0"
+msgctxt "field:calendar.attendee,schedule_status:"
 msgid "Schedule Status"
 msgstr "Статус расписания"
 
-msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgctxt "field:calendar.event,organizer_schedule_agent:"
 msgid "Schedule Agent"
 msgstr "Расписание агента"
 
-msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgctxt "field:calendar.event,organizer_schedule_status:"
 msgid "Schedule Status"
 msgstr "Статус расписания"
 
-msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgctxt "field:res.user,calendar_email_notification_cancel:"
 msgid "Cancelled invitations"
 msgstr "Отменено приглашения"
 
-msgctxt "field:res.user,calendar_email_notification_new:0"
+msgctxt "field:res.user,calendar_email_notification_new:"
 msgid "New invitations"
 msgstr "Новые приглашения"
 
-msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgctxt "field:res.user,calendar_email_notification_partstat:"
 msgid "Invitation Replies"
 msgstr "Ответы на приглашения"
 
-msgctxt "field:res.user,calendar_email_notification_update:0"
+msgctxt "field:res.user,calendar_email_notification_update:"
 msgid "Changed invitations"
 msgstr "Изменен приглашения"
 
-#, fuzzy
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid ""
-msgstr "Резервный счет"
+msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Client"
 msgstr "Клиент"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "None"
 msgstr "Отсутствует"
 
-msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgctxt "selection:calendar.attendee,schedule_agent:"
 msgid "Server"
 msgstr "Сервер"
 
-#, fuzzy
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid ""
-msgstr "Резервный счет"
+msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.0"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.1"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "1.2"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.7"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "3.8"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.1"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.2"
 msgstr ""
 
-msgctxt "selection:calendar.attendee,schedule_status:0"
+msgctxt "selection:calendar.attendee,schedule_status:"
 msgid "5.3"
 msgstr ""
 
-#, fuzzy
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid ""
-msgstr "Резервный счет"
+msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Client"
 msgstr "Клиент"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "None"
 msgstr "Отсутствует"
 
-msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
 msgid "Server"
 msgstr "Сервер"
 
-#, fuzzy
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid ""
-msgstr "Резервный счет"
+msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.0"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.1"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "1.2"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.7"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "3.8"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.1"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.2"
 msgstr ""
 
-msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgctxt "selection:calendar.event,organizer_schedule_status:"
 msgid "5.3"
 msgstr ""
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Calendar Email Notifications"
 msgstr "Уведомление по почте"
 
-msgctxt "view:res.user:0"
+msgctxt "view:res.user:"
 msgid "Notifications"
 msgstr "Уведомления"
diff --git a/setup.py b/setup.py
index c863ecc..fa03850 100644
--- a/setup.py
+++ b/setup.py
@@ -10,9 +10,9 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
 major_version = int(major_version)
 minor_version = int(minor_version)
 
-requires = ['PyWebDAV >= 0.9.3']
+requires = ['PyWebDAV >= 0.9.8']
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
                 (dep, major_version, minor_version, major_version,
                     minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index cedf3e4..4d8744e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from test_calendar_scheduling import suite
+from .test_calendar_scheduling import suite
diff --git a/tests/scenario_calendar_scheduling.py b/tests/scenario_calendar_scheduling.py
index 688e5f6..0fea3c5 100644
--- a/tests/scenario_calendar_scheduling.py
+++ b/tests/scenario_calendar_scheduling.py
@@ -10,7 +10,7 @@ import datetime
 from dateutil.relativedelta import relativedelta
 import caldav
 import vobject
-from proteus import config, Model, Wizard
+from proteus import config
 from trytond.modules.calendar.tests.scenario_calendar import (
     install_module, configure_user, create_calendar)
 
diff --git a/tests/test_calendar_scheduling.py b/tests/test_calendar_scheduling.py
index a92c1bd..af9ffd8 100644
--- a/tests/test_calendar_scheduling.py
+++ b/tests/test_calendar_scheduling.py
@@ -2,7 +2,8 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-import sys, os
+import sys
+import os
 DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
     '..', '..', '..', '..', '..', 'trytond')))
 if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class CalendarSchedulingTestCase(unittest.TestCase):
         '''
         test_depends()
 
+
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index 2dc3b3c..7388500 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: trytond-calendar-scheduling
-Version: 2.2.1
+Version: 2.4.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_calendar_scheduling.egg-info/SOURCES.txt b/trytond_calendar_scheduling.egg-info/SOURCES.txt
index 484ce4b..170d844 100644
--- a/trytond_calendar_scheduling.egg-info/SOURCES.txt
+++ b/trytond_calendar_scheduling.egg-info/SOURCES.txt
@@ -9,14 +9,16 @@ setup.py
 ./__init__.py
 ./__tryton__.py
 ./caldav.py
-./calendar.py
+./calendar_.py
 ./res.py
 ./tests/__init__.py
 ./tests/scenario_calendar_scheduling.py
 ./tests/test_calendar_scheduling.py
 locale/bg_BG.po
+locale/ca_ES.po
 locale/cs_CZ.po
 locale/de_DE.po
+locale/es_AR.po
 locale/es_CO.po
 locale/es_ES.po
 locale/fr_FR.po
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 8b1b860..f1f0efa 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,6 +1,6 @@
-PyWebDAV >= 0.9.3
-trytond_calendar >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
+PyWebDAV >= 0.9.8
+trytond_calendar >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
 
 [test]
 caldav
\ No newline at end of file
commit 9cb726a5fa83ff064c9bf6353541157d7b01c030
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 26 13:35:46 2011 +0100

    Adding upstream version 2.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 958b0ba..4646a7a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2011-12-26
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.0 - 2011-10-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 79c7416..f126c62 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_calendar_scheduling
-Version: 2.2.0
+Version: 2.2.1
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index b97cecd..52bc346 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'name_es_ES' : 'Planificador del calendario',
     'name_fr_FR' : 'Programmation calendrier',
     'name_ru_RU' : 'Календарное планирование',
-    'version' : '2.2.0',
+    'version' : '2.2.1',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index adaeab5..436604e 100644
--- a/calendar.py
+++ b/calendar.py
@@ -699,7 +699,7 @@ class EventAttendee(ModelSQL, ModelView):
 
         return msg
 
-    def send_msg(self, from_addr, to_addr, msg, event):
+    def send_msg(self, from_addr, to_addr, msg, event_id):
         '''
         Send message
 
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index 8f1a51c..2dc3b3c 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-calendar-scheduling
-Version: 2.2.0
+Version: 2.2.1
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
commit e037ede6e73de838f8bcbf9a105674c8c392b56a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Oct 31 16:20:42 2011 +0100

    Adding upstream version 2.2.0.

diff --git a/CHANGELOG b/CHANGELOG
index 23ca0f1..958b0ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
 Version 2.0.0 - 2011-04-27
 * Bug fixes (see mercurial logs for details)
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..7f5d5fd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,4 +6,4 @@ include CHANGELOG
 include LICENSE
 include *.xml
 include *.odt
-include *.csv
+include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 0de49d8..79c7416 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,29 +1,31 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_scheduling
-Version: 2.0.0
+Version: 2.2.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index ca5ee0e..b97cecd 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'name_es_ES' : 'Planificador del calendario',
     'name_fr_FR' : 'Programmation calendrier',
     'name_ru_RU' : 'Календарное планирование',
-    'version' : '2.0.0',
+    'version' : '2.2.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -30,11 +30,13 @@
         'res.xml',
     ],
     'translation': [
-        'bg_BG.csv',
-        'de_DE.csv',
-        'es_ES.csv',
-        'es_CO.csv',
-        'fr_FR.csv',
-        'ru_RU.csv',
+        'locale/bg_BG.po',
+        'locale/cs_CZ.po',
+        'locale/de_DE.po',
+        'locale/es_ES.po',
+        'locale/es_CO.po',
+        'locale/fr_FR.po',
+        'locale/nl_NL.po',
+        'locale/ru_RU.po',
     ],
 }
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 732aed3..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,    * ,    * ,0
-error,calendar.event,0,(No Subject),(Няма тема),0
-error,calendar.event,0,:,:,0
-error,calendar.event,0,Cancelled Event: %s @ %s,Отказано събитие: %s @ %s,0
-error,calendar.event,0,Invitation: %s @ %s,Покана: %s @ %s,0
-error,calendar.event,0,"This event has been canceled.
-
-",Събитието бе прекратено.,0
-error,calendar.event,0,"This event has been changed.
-
-",Събитоето бе променено.,0
-error,calendar.event,0,Updated Invitation: %s @ %s,Променена покана: %s @ %s,0
-error,calendar.event,0,When,Кога,0
-error,calendar.event,0,"You have been invited to the following event.
-
-",Поканени сте на това събитие.,0
-error,calendar.event.attendee,0,    * ,    * ,0
-error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
-
-",%s (%s) промени състоянието за участието си на: %s,0
-error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
-
-",%s (%s) приеха поканата:,0
-error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
-
-",%s (%s) отказаха поканата:,0
-error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
-error,calendar.event.attendee,0,(No Subject),(Няма тема),0
-error,calendar.event.attendee,0,:,:,0
-error,calendar.event.attendee,0,When,Кога,0
-field,"calendar.attendee,schedule_agent",0,Schedule Agent,Пълномощник на графика,0
-field,"calendar.attendee,schedule_status",0,Schedule Status,Състояние на график,0
-field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Пълномощник на графика,0
-field,"calendar.event,organizer_schedule_status",0,Schedule Status,Състояние на график,0
-field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Отказани покани,0
-field,"res.user,calendar_email_notification_new",0,New invitations,Нови покани,0
-field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Отговори на покана,0
-field,"res.user,calendar_email_notification_update",0,Changed invitations,Променени покани,0
-selection,"calendar.attendee,schedule_agent",0,,,0
-selection,"calendar.attendee,schedule_agent",0,Client,Клиент,0
-selection,"calendar.attendee,schedule_agent",0,None,Няма,0
-selection,"calendar.attendee,schedule_agent",0,Server,Сървър,0
-selection,"calendar.attendee,schedule_status",0,,,0
-selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
-selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
-selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
-selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
-selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
-selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
-selection,"calendar.attendee,schedule_status",0,5.2,5.2,0
-selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
-selection,"calendar.event,organizer_schedule_agent",0,,,0
-selection,"calendar.event,organizer_schedule_agent",0,Client,Клиент,0
-selection,"calendar.event,organizer_schedule_agent",0,None,Няма,0
-selection,"calendar.event,organizer_schedule_agent",0,Server,Сървър,0
-selection,"calendar.event,organizer_schedule_status",0,,,0
-selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
-selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
-selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
-selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
-selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
-selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
-selection,"calendar.event,organizer_schedule_status",0,5.2,5.2,0
-selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
-view,res.user,0,Calendar Email Notifications,Известяване за събитие от календар,0
-view,res.user,0,Notifications,Известия,0
diff --git a/calendar.py b/calendar.py
index ff2f1da..adaeab5 100644
--- a/calendar.py
+++ b/calendar.py
@@ -1,6 +1,5 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from __future__ import with_statement
 from email.mime.text import MIMEText
 from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
@@ -9,6 +8,7 @@ import logging
 from trytond.model import ModelSQL, ModelView, fields
 from trytond.tools import get_smtp_server
 from trytond.transaction import Transaction
+from trytond.pool import Pool
 
 
 class Event(ModelSQL, ModelView):
@@ -104,7 +104,7 @@ class Event(ModelSQL, ModelView):
         return ical
 
     def subject_body(self, type, event, owner):
-        lang_obj = self.pool.get('ir.lang')
+        lang_obj = Pool().get('ir.lang')
 
         if not (event and owner):
             return "", ""
@@ -228,7 +228,7 @@ class Event(ModelSQL, ModelView):
         :param event_id: the id of the calendar.event
         :return: list of email addresses sent
         '''
-        user_obj = self.pool.get('res.user')
+        user_obj = Pool().get('res.user')
 
         if not to_addrs:
             return to_addrs
@@ -283,7 +283,7 @@ class Event(ModelSQL, ModelView):
         return to_notify, owner
 
     def create(self, values):
-        attendee_obj = self.pool.get('calendar.event.attendee')
+        attendee_obj = Pool().get('calendar.event.attendee')
         res = super(Event, self).create(values)
 
         if Transaction().user == 0:
@@ -319,7 +319,7 @@ class Event(ModelSQL, ModelView):
         return res
 
     def write(self, ids, values):
-        attendee_obj = self.pool.get('calendar.event.attendee')
+        attendee_obj = Pool().get('calendar.event.attendee')
 
         if Transaction().user == 0:
             # user is 0 means write is triggered by another one
@@ -571,8 +571,8 @@ class EventAttendee(ModelSQL, ModelView):
                 })
 
     def subject_body(self, status, event, owner):
-        lang_obj = self.pool.get('ir.lang')
-        event_obj = self.pool.get('calendar.event')
+        lang_obj = Pool().get('ir.lang')
+        event_obj = Pool().get('calendar.event')
 
         if not (event and owner):
             return "", ""
@@ -723,7 +723,7 @@ class EventAttendee(ModelSQL, ModelView):
     @staticmethod
     def organiser_to_notify(attendee):
         event = attendee.event
-        organizer = event.organizer or event.parent.organizer
+        organizer = event.organizer or event.parent and event.parent.organizer
         if not organizer:
             return None
         if event.organizer_schedule_agent \
@@ -737,7 +737,7 @@ class EventAttendee(ModelSQL, ModelView):
         return organizer
 
     def write(self, ids, values):
-        event_obj = self.pool.get('calendar.event')
+        event_obj = Pool().get('calendar.event')
 
         if Transaction().user == 0:
             # user is 0 means write is triggered by another one
@@ -789,7 +789,7 @@ class EventAttendee(ModelSQL, ModelView):
         return res
 
     def delete(self, ids):
-        event_obj = self.pool.get('calendar.event')
+        event_obj = Pool().get('calendar.event')
 
         if Transaction().user == 0:
             # user is 0 means the deletion is triggered by another one
@@ -833,7 +833,7 @@ class EventAttendee(ModelSQL, ModelView):
         return res
 
     def create(self, values):
-        event_obj = self.pool.get('calendar.event')
+        event_obj = Pool().get('calendar.event')
 
         res_id = super(EventAttendee, self).create(values)
         if Transaction().user == 0:
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index c1788af..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,79 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,    * ,    * ,0
-error,calendar.event,0,(No Subject),(Kein Betreff),0
-error,calendar.event,0,:,:,0
-error,calendar.event,0,Cancelled Event: %s @ %s,Abgesagter Termin: %s @ %s,0
-error,calendar.event,0,Invitation: %s @ %s,Einladung: %s @ %s,0
-error,calendar.event,0,"This event has been canceled.
-
-","Dieser Termin wurde abgesagt.
-
-",0
-error,calendar.event,0,"This event has been changed.
-
-","Dieser Termin wurde geändert.
-
-",0
-error,calendar.event,0,Updated Invitation: %s @ %s,Aktualisierte Einladung: %s @ %s,0
-error,calendar.event,0,When,Wann,0
-error,calendar.event,0,"You have been invited to the following event.
-
-","Sie wurden zu dem folgendem Termin eingeladen:
-
-",0
-error,calendar.event.attendee,0,    * ,    * ,0
-error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
-
-","%s (%s) hat den Teilnahmestatus geändert auf: %s
-
-",0
-error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
-
-","%s (%s) hat folgende Einladung angenommen:
-
-",0
-error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
-
-","%s (%s) hat folgende Einladung abgesagt:
-
-",0
-error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
-error,calendar.event.attendee,0,(No Subject),(Kein Betreff),0
-error,calendar.event.attendee,0,:,:,0
-error,calendar.event.attendee,0,When,Wann,0
-field,"calendar.attendee,schedule_agent",0,Schedule Agent,Terminplaner Agent,0
-field,"calendar.attendee,schedule_status",0,Schedule Status,Terminplaner Status,0
-field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Terminplaner Agent,0
-field,"calendar.event,organizer_schedule_status",0,Schedule Status,Terminplaner Status,0
-field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Absagen von Einladungen,0
-field,"res.user,calendar_email_notification_new",0,New invitations,Neue Einladungen,0
-field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Antworten auf Einladungen,0
-field,"res.user,calendar_email_notification_update",0,Changed invitations,Änderungen von Einladungen,0
-selection,"calendar.attendee,schedule_agent",0,,,0
-selection,"calendar.attendee,schedule_agent",0,Client,Client,0
-selection,"calendar.attendee,schedule_agent",0,None,Keiner,0
-selection,"calendar.attendee,schedule_agent",0,Server,Server,0
-selection,"calendar.attendee,schedule_status",0,,,0
-selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
-selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
-selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
-selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
-selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
-selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
-selection,"calendar.attendee,schedule_status",0,5.2,5.2,0
-selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
-selection,"calendar.event,organizer_schedule_agent",0,,,0
-selection,"calendar.event,organizer_schedule_agent",0,Client,Client,0
-selection,"calendar.event,organizer_schedule_agent",0,None,Keiner,0
-selection,"calendar.event,organizer_schedule_agent",0,Server,Server,0
-selection,"calendar.event,organizer_schedule_status",0,,,0
-selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
-selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
-selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
-selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
-selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
-selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
-selection,"calendar.event,organizer_schedule_status",0,5.2,5.2,0
-selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
-view,res.user,0,Calendar Email Notifications,Kalender E-Mail Benachrichtigungen,0
-view,res.user,0,Notifications,Benachrichtigungen,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index a0159ae..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,    * ,    * ,0
-error,calendar.event,0,(No Subject),(Sin Asunto),0
-error,calendar.event,0,:,:,0
-error,calendar.event,0,Cancelled Event: %s @ %s,Evento Cancelado: %s @ %s,0
-error,calendar.event,0,Invitation: %s @ %s,Invitación: %s @ %s,0
-error,calendar.event,0,"This event has been canceled.
-
-",Este evento se canceló.,0
-error,calendar.event,0,"This event has been changed.
-
-",Este evento cambió.,0
-error,calendar.event,0,Updated Invitation: %s @ %s,Invitación actualizada: %s @ %s,0
-error,calendar.event,0,When,Cuando,0
-error,calendar.event,0,"You have been invited to the following event.
-
-",Usted fue invitado al siguiente evento.,0
-error,calendar.event.attendee,0,    * ,    * ,0
-error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
-
-",%s (%s) cambió su estado de participación,0
-error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
-
-",%s (%s) ha aceptado esta invitación:,0
-error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
-
-",%s (%s) rechazó esta invitación:,0
-error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
-error,calendar.event.attendee,0,(No Subject),(Sin Asunto),0
-error,calendar.event.attendee,0,:,:,0
-error,calendar.event.attendee,0,When,Cuando,0
-field,"calendar.attendee,schedule_agent",0,Schedule Agent,Agente de programación,0
-field,"calendar.attendee,schedule_status",0,Schedule Status,Estado de Programación,0
-field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Agente de Programación,0
-field,"calendar.event,organizer_schedule_status",0,Schedule Status,Estado de programación,0
-field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Invitaciones canceladas,0
-field,"res.user,calendar_email_notification_new",0,New invitations,Nuevas invitaciones,0
-field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Invitaciones Contestadas,0
-field,"res.user,calendar_email_notification_update",0,Changed invitations,Invitaciones Cambiadas,0
-selection,"calendar.attendee,schedule_agent",0,,,0
-selection,"calendar.attendee,schedule_agent",0,Client,Cliente,0
-selection,"calendar.attendee,schedule_agent",0,None,Ninguno,0
-selection,"calendar.attendee,schedule_agent",0,Server,Servidor,0
-selection,"calendar.attendee,schedule_status",0,,,0
-selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
-selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
-selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
-selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
-selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
-selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
-selection,"calendar.attendee,schedule_status",0,5.2,5.2,0
-selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
-selection,"calendar.event,organizer_schedule_agent",0,,,0
-selection,"calendar.event,organizer_schedule_agent",0,Client,Cliente,0
-selection,"calendar.event,organizer_schedule_agent",0,None,Ninguna,0
-selection,"calendar.event,organizer_schedule_agent",0,Server,Servidor,0
-selection,"calendar.event,organizer_schedule_status",0,,,0
-selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
-selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
-selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
-selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
-selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
-selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
-selection,"calendar.event,organizer_schedule_status",0,5.2,5.2,0
-selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
-view,res.user,0,Calendar Email Notifications,Notificaciones de Calendario por Email,0
-view,res.user,0,Notifications,Notificaciones,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 3961d72..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,69 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,    * ,    * ,0
-error,calendar.event,0,:,:,0
-error,calendar.event,0,Cancelled Event: %s @ %s,Evento cancelado: %s @ %s,0
-error,calendar.event,0,Invitation: %s @ %s,Invitación: %s @ %s,0
-error,calendar.event,0,(No Subject),(Sin asunto),0
-error,calendar.event,0,"This event has been canceled.
-
-",Este evento ha sido cancelado.,0
-error,calendar.event,0,"This event has been changed.
-
-",Este evento ha cambiado.,0
-error,calendar.event,0,Updated Invitation: %s @ %s,Invitación actualizada: %s @ %s,0
-error,calendar.event,0,When,Cuando,0
-error,calendar.event,0,"You have been invited to the following event.
-
-",Ha sido invitado al siguiente evento.,0
-error,calendar.event.attendee,0,    * ,    * ,0
-error,calendar.event.attendee,0,:,:,0
-error,calendar.event.attendee,0,(No Subject),(Sin asunto),0
-error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
-
-","%s (%s) cambió el estado de su participación a: %s
-
-",0
-error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
-
-",%s (%s) ha aceptado esta invitación:,0
-error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
-
-",%s (%s) ha declinado esta invitación:,0
-error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
-error,calendar.event.attendee,0,When,Cuando,0
-field,"calendar.attendee,schedule_agent",0,Schedule Agent,Agente del planificador,0
-field,"calendar.attendee,schedule_status",0,Schedule Status,Estado de la planificación,0
-field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Agente del planificador,0
-field,"calendar.event,organizer_schedule_status",0,Schedule Status,Estado de la planificación,0
-field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Invitaciones canceladas,0
-field,"res.user,calendar_email_notification_new",0,New invitations,Nuevas invitaciones,0
-field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Respuestas a las invitaciones,0
-field,"res.user,calendar_email_notification_update",0,Changed invitations,Invitaciones cambiadas,0
-selection,"calendar.attendee,schedule_agent",0,,,0
-selection,"calendar.attendee,schedule_agent",0,Client,Cliente,0
-selection,"calendar.attendee,schedule_agent",0,None,Ninguno,0
-selection,"calendar.attendee,schedule_agent",0,Server,Servidor,0
-selection,"calendar.attendee,schedule_status",0,,,0
-selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
-selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
-selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
-selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
-selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
-selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
-selection,"calendar.attendee,schedule_status",0,5.2,5.2,0
-selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
-selection,"calendar.event,organizer_schedule_agent",0,,,0
-selection,"calendar.event,organizer_schedule_agent",0,Client,Cliente,0
-selection,"calendar.event,organizer_schedule_agent",0,None,Ninguno,0
-selection,"calendar.event,organizer_schedule_agent",0,Server,Servidor,0
-selection,"calendar.event,organizer_schedule_status",0,,,0
-selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
-selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
-selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
-selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
-selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
-selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
-selection,"calendar.event,organizer_schedule_status",0,5.2,5.2,0
-selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
-view,res.user,0,Calendar Email Notifications,Notificaciones por correo electrónico del calendario,0
-view,res.user,0,Notifications,Notificaciones,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index c8f03bd..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,76 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,    * ,    *,0
-error,calendar.event,0,(No Subject),(Pas de sujet),0
-error,calendar.event,0,:,:,0
-error,calendar.event,0,Cancelled Event: %s @ %s,Événement annulé : %s @ %s,0
-error,calendar.event,0,Invitation: %s @ %s,Invitation: %s @ %s,0
-error,calendar.event,0,"This event has been canceled.
-
-","Cet événement a été annulé.
-
-",0
-error,calendar.event,0,"This event has been changed.
-
-","Cet événement a été modifié.
-
-",0
-error,calendar.event,0,Updated Invitation: %s @ %s,Invitation mise à jour : %s @ %s,0
-error,calendar.event,0,When,Quand,0
-error,calendar.event,0,"You have been invited to the following event.
-
-","Vous avez été invité à l'événement suivant.
-
-",0
-error,calendar.event.attendee,0,    * ,    *,0
-error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
-
-","%s (%s) a un nouveau statut de participation : %s
-",0
-error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
-
-","%s (%s) a accepté l'invitation suivante :
-",0
-error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
-
-","%s (%s) a décliné l'invitation suivante :
-",0
-error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
-error,calendar.event.attendee,0,(No Subject),(Pas de sujet),0
-error,calendar.event.attendee,0,:,:,0
-error,calendar.event.attendee,0,When,Quand,0
-field,"calendar.attendee,schedule_agent",0,Schedule Agent,Agent de planification,0
-field,"calendar.attendee,schedule_status",0,Schedule Status,Statut de planification,0
-field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Agent de planification,0
-field,"calendar.event,organizer_schedule_status",0,Schedule Status,Statut de planification,0
-field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Invitations annulées,0
-field,"res.user,calendar_email_notification_new",0,New invitations,Nouvelles invitations,0
-field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Réponses aux invitations,0
-field,"res.user,calendar_email_notification_update",0,Changed invitations,Modification des invitations,0
-selection,"calendar.attendee,schedule_agent",0,,,0
-selection,"calendar.attendee,schedule_agent",0,Client,Client,0
-selection,"calendar.attendee,schedule_agent",0,None,Aucun,0
-selection,"calendar.attendee,schedule_agent",0,Server,Serveur,0
-selection,"calendar.attendee,schedule_status",0,,,0
-selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
-selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
-selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
-selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
-selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
-selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
-selection,"calendar.attendee,schedule_status",0,5.2,5.1,0
-selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
-selection,"calendar.event,organizer_schedule_agent",0,,,0
-selection,"calendar.event,organizer_schedule_agent",0,Client,Client,0
-selection,"calendar.event,organizer_schedule_agent",0,None,Aucun,0
-selection,"calendar.event,organizer_schedule_agent",0,Server,Serveur,0
-selection,"calendar.event,organizer_schedule_status",0,,,0
-selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
-selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
-selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
-selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
-selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
-selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
-selection,"calendar.event,organizer_schedule_status",0,5.2,5.1,0
-selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
-view,res.user,0,Calendar Email Notifications,Notifications calendrier par Email,0
-view,res.user,0,Notifications,Avertissements,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..9f52803
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,231 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr "%s (%s) промени състоянието за участието си на: %s"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr "%s (%s) приеха поканата:"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr "%s (%s) отказаха поканата:"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "(No Subject)"
+msgstr "(Няма тема)"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "When"
+msgstr "Кога"
+
+msgctxt "error:calendar.event:0"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event:0"
+msgid "(No Subject)"
+msgstr "(Няма тема)"
+
+msgctxt "error:calendar.event:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event:0"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Отказано събитие: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "Invitation: %s @ %s"
+msgstr "Покана: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr "Събитието бе прекратено."
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr "Събитоето бе променено."
+
+msgctxt "error:calendar.event:0"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Променена покана: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "When"
+msgstr "Кога"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr "Поканени сте на това събитие."
+
+msgctxt "field:calendar.attendee,schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Пълномощник на графика"
+
+msgctxt "field:calendar.attendee,schedule_status:0"
+msgid "Schedule Status"
+msgstr "Състояние на график"
+
+msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Пълномощник на графика"
+
+msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgid "Schedule Status"
+msgstr "Състояние на график"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgid "Cancelled invitations"
+msgstr "Отказани покани"
+
+msgctxt "field:res.user,calendar_email_notification_new:0"
+msgid "New invitations"
+msgstr "Нови покани"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgid "Invitation Replies"
+msgstr "Отговори на покана"
+
+msgctxt "field:res.user,calendar_email_notification_update:0"
+msgid "Changed invitations"
+msgstr "Променени покани"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Client"
+msgstr "Клиент"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "None"
+msgstr "Няма"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Server"
+msgstr "Сървър"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Client"
+msgstr "Клиент"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "None"
+msgstr "Няма"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Server"
+msgstr "Сървър"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:0"
+msgid "Calendar Email Notifications"
+msgstr "Известяване за събитие от календар"
+
+msgctxt "view:res.user:0"
+msgid "Notifications"
+msgstr "Известия"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..fee40f1
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,231 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "    * "
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "%s: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "(No Subject)"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ":"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "When"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "    * "
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "(No Subject)"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ":"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Cancelled Event: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Invitation: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Updated Invitation: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "When"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr ""
+
+msgctxt "field:calendar.attendee,schedule_agent:0"
+msgid "Schedule Agent"
+msgstr ""
+
+msgctxt "field:calendar.attendee,schedule_status:0"
+msgid "Schedule Status"
+msgstr ""
+
+msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgid "Schedule Agent"
+msgstr ""
+
+msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgid "Schedule Status"
+msgstr ""
+
+msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgid "Cancelled invitations"
+msgstr ""
+
+msgctxt "field:res.user,calendar_email_notification_new:0"
+msgid "New invitations"
+msgstr ""
+
+msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgid "Invitation Replies"
+msgstr ""
+
+msgctxt "field:res.user,calendar_email_notification_update:0"
+msgid "Changed invitations"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Client"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Server"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.3"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Client"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Server"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.3"
+msgstr ""
+
+msgctxt "view:res.user:0"
+msgid "Calendar Email Notifications"
+msgstr ""
+
+msgctxt "view:res.user:0"
+msgid "Notifications"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..5b72a25
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,243 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr ""
+"%s (%s) hat den Teilnahmestatus geändert auf: %s\n"
+"\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr ""
+"%s (%s) hat folgende Einladung angenommen:\n"
+"\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr ""
+"%s (%s) hat folgende Einladung abgesagt:\n"
+"\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "(No Subject)"
+msgstr "(Kein Betreff)"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "When"
+msgstr "Wann"
+
+msgctxt "error:calendar.event:0"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event:0"
+msgid "(No Subject)"
+msgstr "(Kein Betreff)"
+
+msgctxt "error:calendar.event:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event:0"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Abgesagter Termin: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "Invitation: %s @ %s"
+msgstr "Einladung: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr ""
+"Dieser Termin wurde abgesagt.\n"
+"\n"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr ""
+"Dieser Termin wurde geändert.\n"
+"\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Aktualisierte Einladung: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "When"
+msgstr "Wann"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr ""
+"Sie wurden zu dem folgendem Termin eingeladen:\n"
+"\n"
+
+msgctxt "field:calendar.attendee,schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Terminplaner Agent"
+
+msgctxt "field:calendar.attendee,schedule_status:0"
+msgid "Schedule Status"
+msgstr "Terminplaner Status"
+
+msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Terminplaner Agent"
+
+msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgid "Schedule Status"
+msgstr "Terminplaner Status"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgid "Cancelled invitations"
+msgstr "Absagen von Einladungen"
+
+msgctxt "field:res.user,calendar_email_notification_new:0"
+msgid "New invitations"
+msgstr "Neue Einladungen"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgid "Invitation Replies"
+msgstr "Antworten auf Einladungen"
+
+msgctxt "field:res.user,calendar_email_notification_update:0"
+msgid "Changed invitations"
+msgstr "Änderungen von Einladungen"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "None"
+msgstr "Keiner"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Server"
+msgstr "Server"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "None"
+msgstr "Keiner"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Server"
+msgstr "Server"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:0"
+msgid "Calendar Email Notifications"
+msgstr "Kalender E-Mail Benachrichtigungen"
+
+msgctxt "view:res.user:0"
+msgid "Notifications"
+msgstr "Benachrichtigungen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..429aaeb
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,231 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr "%s (%s) cambió su estado de participación"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr "%s (%s) ha aceptado esta invitación:"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr "%s (%s) rechazó esta invitación:"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "(No Subject)"
+msgstr "(Sin Asunto)"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "When"
+msgstr "Cuando"
+
+msgctxt "error:calendar.event:0"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event:0"
+msgid "(No Subject)"
+msgstr "(Sin Asunto)"
+
+msgctxt "error:calendar.event:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event:0"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Evento Cancelado: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "Invitation: %s @ %s"
+msgstr "Invitación: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr "Este evento se canceló."
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr "Este evento cambió."
+
+msgctxt "error:calendar.event:0"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Invitación actualizada: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "When"
+msgstr "Cuando"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr "Usted fue invitado al siguiente evento."
+
+msgctxt "field:calendar.attendee,schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Agente de programación"
+
+msgctxt "field:calendar.attendee,schedule_status:0"
+msgid "Schedule Status"
+msgstr "Estado de Programación"
+
+msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Agente de Programación"
+
+msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgid "Schedule Status"
+msgstr "Estado de programación"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgid "Cancelled invitations"
+msgstr "Invitaciones canceladas"
+
+msgctxt "field:res.user,calendar_email_notification_new:0"
+msgid "New invitations"
+msgstr "Nuevas invitaciones"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgid "Invitation Replies"
+msgstr "Invitaciones Contestadas"
+
+msgctxt "field:res.user,calendar_email_notification_update:0"
+msgid "Changed invitations"
+msgstr "Invitaciones Cambiadas"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "None"
+msgstr "Ninguna"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:0"
+msgid "Calendar Email Notifications"
+msgstr "Notificaciones de Calendario por Email"
+
+msgctxt "view:res.user:0"
+msgid "Notifications"
+msgstr "Notificaciones"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..c3b445d
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,233 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr ""
+"%s (%s) cambió el estado de su participación a: %s\n"
+"\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr "%s (%s) ha aceptado esta invitación:"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr "%s (%s) ha declinado esta invitación:"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "(No Subject)"
+msgstr "(Sin asunto)"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "When"
+msgstr "Cuando"
+
+msgctxt "error:calendar.event:0"
+msgid "    * "
+msgstr "    * "
+
+msgctxt "error:calendar.event:0"
+msgid "(No Subject)"
+msgstr "(Sin asunto)"
+
+msgctxt "error:calendar.event:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event:0"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Evento cancelado: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "Invitation: %s @ %s"
+msgstr "Invitación: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr "Este evento ha sido cancelado."
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr "Este evento ha cambiado."
+
+msgctxt "error:calendar.event:0"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Invitación actualizada: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "When"
+msgstr "Cuando"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr "Ha sido invitado al siguiente evento."
+
+msgctxt "field:calendar.attendee,schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Agente del planificador"
+
+msgctxt "field:calendar.attendee,schedule_status:0"
+msgid "Schedule Status"
+msgstr "Estado de la planificación"
+
+msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Agente del planificador"
+
+msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgid "Schedule Status"
+msgstr "Estado de la planificación"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgid "Cancelled invitations"
+msgstr "Invitaciones canceladas"
+
+msgctxt "field:res.user,calendar_email_notification_new:0"
+msgid "New invitations"
+msgstr "Nuevas invitaciones"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgid "Invitation Replies"
+msgstr "Respuestas a las invitaciones"
+
+msgctxt "field:res.user,calendar_email_notification_update:0"
+msgid "Changed invitations"
+msgstr "Invitaciones cambiadas"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:0"
+msgid "Calendar Email Notifications"
+msgstr "Notificaciones por correo electrónico del calendario"
+
+msgctxt "view:res.user:0"
+msgid "Notifications"
+msgstr "Notificaciones"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..f671739
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,237 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "    * "
+msgstr "    *"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr "%s (%s) a un nouveau statut de participation : %s\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr "%s (%s) a accepté l'invitation suivante :\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr "%s (%s) a décliné l'invitation suivante :\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "(No Subject)"
+msgstr "(Pas de sujet)"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "When"
+msgstr "Quand"
+
+msgctxt "error:calendar.event:0"
+msgid "    * "
+msgstr "    *"
+
+msgctxt "error:calendar.event:0"
+msgid "(No Subject)"
+msgstr "(Pas de sujet)"
+
+msgctxt "error:calendar.event:0"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event:0"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Événement annulé : %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "Invitation: %s @ %s"
+msgstr "Invitation: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr ""
+"Cet événement a été annulé.\n"
+"\n"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr ""
+"Cet événement a été modifié.\n"
+"\n"
+
+msgctxt "error:calendar.event:0"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Invitation mise à jour : %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "When"
+msgstr "Quand"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr ""
+"Vous avez été invité à l'événement suivant.\n"
+"\n"
+
+msgctxt "field:calendar.attendee,schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Agent de planification"
+
+msgctxt "field:calendar.attendee,schedule_status:0"
+msgid "Schedule Status"
+msgstr "Statut de planification"
+
+msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Agent de planification"
+
+msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgid "Schedule Status"
+msgstr "Statut de planification"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgid "Cancelled invitations"
+msgstr "Invitations annulées"
+
+msgctxt "field:res.user,calendar_email_notification_new:0"
+msgid "New invitations"
+msgstr "Nouvelles invitations"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgid "Invitation Replies"
+msgstr "Réponses aux invitations"
+
+msgctxt "field:res.user,calendar_email_notification_update:0"
+msgid "Changed invitations"
+msgstr "Modification des invitations"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "None"
+msgstr "Aucun"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Server"
+msgstr "Serveur"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.2"
+msgstr "5.1"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Client"
+msgstr "Client"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "None"
+msgstr "Aucun"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Server"
+msgstr "Serveur"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.2"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:0"
+msgid "Calendar Email Notifications"
+msgstr "Notifications calendrier par Email"
+
+msgctxt "view:res.user:0"
+msgid "Notifications"
+msgstr "Avertissements"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..5b6d456
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,233 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "    * "
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "%s: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "(No Subject)"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ":"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "When"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "    * "
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "(No Subject)"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ":"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Cancelled Event: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Invitation: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Updated Invitation: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "When"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr ""
+
+msgctxt "field:calendar.attendee,schedule_agent:0"
+msgid "Schedule Agent"
+msgstr ""
+
+msgctxt "field:calendar.attendee,schedule_status:0"
+msgid "Schedule Status"
+msgstr ""
+
+msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgid "Schedule Agent"
+msgstr ""
+
+msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgid "Schedule Status"
+msgstr ""
+
+msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgid "Cancelled invitations"
+msgstr ""
+
+msgctxt "field:res.user,calendar_email_notification_new:0"
+msgid "New invitations"
+msgstr ""
+
+msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgid "Invitation Replies"
+msgstr ""
+
+msgctxt "field:res.user,calendar_email_notification_update:0"
+msgid "Changed invitations"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Client"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "None"
+msgstr "Geen"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Server"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.3"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Client"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "None"
+msgstr "Geen"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Server"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.3"
+msgstr ""
+
+msgctxt "view:res.user:0"
+msgid "Calendar Email Notifications"
+msgstr ""
+
+msgctxt "view:res.user:0"
+msgid "Notifications"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..cdb699f
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,235 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "    * "
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "%s: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "(No Subject)"
+msgstr "(Нет описания)"
+
+msgctxt "error:calendar.event.attendee:0"
+msgid ":"
+msgstr ""
+
+msgctxt "error:calendar.event.attendee:0"
+msgid "When"
+msgstr "Когда"
+
+msgctxt "error:calendar.event:0"
+msgid "    * "
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "(No Subject)"
+msgstr "(Нет описания)"
+
+msgctxt "error:calendar.event:0"
+msgid ":"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Событие отмененно: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid "Invitation: %s @ %s"
+msgstr "Приглашение: %s @ %s"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "Updated Invitation: %s @ %s"
+msgstr ""
+
+msgctxt "error:calendar.event:0"
+msgid "When"
+msgstr "Когда"
+
+msgctxt "error:calendar.event:0"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr ""
+
+msgctxt "field:calendar.attendee,schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Расписание агента"
+
+msgctxt "field:calendar.attendee,schedule_status:0"
+msgid "Schedule Status"
+msgstr "Статус расписания"
+
+msgctxt "field:calendar.event,organizer_schedule_agent:0"
+msgid "Schedule Agent"
+msgstr "Расписание агента"
+
+msgctxt "field:calendar.event,organizer_schedule_status:0"
+msgid "Schedule Status"
+msgstr "Статус расписания"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:0"
+msgid "Cancelled invitations"
+msgstr "Отменено приглашения"
+
+msgctxt "field:res.user,calendar_email_notification_new:0"
+msgid "New invitations"
+msgstr "Новые приглашения"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:0"
+msgid "Invitation Replies"
+msgstr "Ответы на приглашения"
+
+msgctxt "field:res.user,calendar_email_notification_update:0"
+msgid "Changed invitations"
+msgstr "Изменен приглашения"
+
+#, fuzzy
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid ""
+msgstr "Резервный счет"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Client"
+msgstr "Клиент"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "None"
+msgstr "Отсутствует"
+
+msgctxt "selection:calendar.attendee,schedule_agent:0"
+msgid "Server"
+msgstr "Сервер"
+
+#, fuzzy
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid ""
+msgstr "Резервный счет"
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.attendee,schedule_status:0"
+msgid "5.3"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid ""
+msgstr "Резервный счет"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Client"
+msgstr "Клиент"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "None"
+msgstr "Отсутствует"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:0"
+msgid "Server"
+msgstr "Сервер"
+
+#, fuzzy
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid ""
+msgstr "Резервный счет"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.0"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.1"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "1.2"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.7"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "3.8"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.1"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.2"
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:0"
+msgid "5.3"
+msgstr ""
+
+msgctxt "view:res.user:0"
+msgid "Calendar Email Notifications"
+msgstr "Уведомление по почте"
+
+msgctxt "view:res.user:0"
+msgid "Notifications"
+msgstr "Уведомления"
diff --git a/ru_RU.csv b/ru_RU.csv
deleted file mode 100644
index d371a72..0000000
--- a/ru_RU.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,calendar.event,0,    * ,,0
-error,calendar.event,0,(No Subject),(Нет описания),0
-error,calendar.event,0,:,,0
-error,calendar.event,0,Cancelled Event: %s @ %s,Событие отмененно: %s @ %s,0
-error,calendar.event,0,Invitation: %s @ %s,Приглашение: %s @ %s,0
-error,calendar.event,0,"This event has been canceled.
-
-",,0
-error,calendar.event,0,"This event has been changed.
-
-",,0
-error,calendar.event,0,Updated Invitation: %s @ %s,,0
-error,calendar.event,0,When,Когда,0
-error,calendar.event,0,"You have been invited to the following event.
-
-",,0
-error,calendar.event.attendee,0,    * ,,0
-error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
-
-",,0
-error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
-
-",,0
-error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
-
-",,0
-error,calendar.event.attendee,0,%s: %s @ %s,,0
-error,calendar.event.attendee,0,(No Subject),(Нет описания),0
-error,calendar.event.attendee,0,:,,0
-error,calendar.event.attendee,0,When,Когда,0
-field,"calendar.attendee,schedule_agent",0,Schedule Agent,Расписание агента,0
-field,"calendar.attendee,schedule_status",0,Schedule Status,Статус расписания,0
-field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Расписание агента,0
-field,"calendar.event,organizer_schedule_status",0,Schedule Status,Статус расписания,0
-field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Отменено приглашения,0
-field,"res.user,calendar_email_notification_new",0,New invitations,Новые приглашения,0
-field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Ответы на приглашения,0
-field,"res.user,calendar_email_notification_update",0,Changed invitations,Изменен приглашения,0
-selection,"calendar.attendee,schedule_agent",0,,,0
-selection,"calendar.attendee,schedule_agent",0,Client,Клиент,0
-selection,"calendar.attendee,schedule_agent",0,None,Отсутствует,0
-selection,"calendar.attendee,schedule_agent",0,Server,Сервер,0
-selection,"calendar.attendee,schedule_status",0,,,0
-selection,"calendar.attendee,schedule_status",0,1.0,,0
-selection,"calendar.attendee,schedule_status",0,1.1,,0
-selection,"calendar.attendee,schedule_status",0,1.2,,0
-selection,"calendar.attendee,schedule_status",0,3.7,,0
-selection,"calendar.attendee,schedule_status",0,3.8,,0
-selection,"calendar.attendee,schedule_status",0,5.1,,0
-selection,"calendar.attendee,schedule_status",0,5.2,,0
-selection,"calendar.attendee,schedule_status",0,5.3,,0
-selection,"calendar.event,organizer_schedule_agent",0,,,0
-selection,"calendar.event,organizer_schedule_agent",0,Client,Клиент,0
-selection,"calendar.event,organizer_schedule_agent",0,None,Отсутствует,0
-selection,"calendar.event,organizer_schedule_agent",0,Server,Сервер,0
-selection,"calendar.event,organizer_schedule_status",0,,,0
-selection,"calendar.event,organizer_schedule_status",0,1.0,,0
-selection,"calendar.event,organizer_schedule_status",0,1.1,,0
-selection,"calendar.event,organizer_schedule_status",0,1.2,,0
-selection,"calendar.event,organizer_schedule_status",0,3.7,,0
-selection,"calendar.event,organizer_schedule_status",0,3.8,,0
-selection,"calendar.event,organizer_schedule_status",0,5.1,,0
-selection,"calendar.event,organizer_schedule_status",0,5.2,,0
-selection,"calendar.event,organizer_schedule_status",0,5.3,,0
-view,res.user,0,Calendar Email Notifications,Уведомление по почте,0
-view,res.user,0,Notifications,Уведомления,0
diff --git a/setup.py b/setup.py
index d86d0aa..c863ecc 100644
--- a/setup.py
+++ b/setup.py
@@ -39,25 +39,30 @@ setup(name='trytond_calendar_scheduling',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
+        'Framework :: Tryton',
         'Intended Audience :: Developers',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'Intended Audience :: Manufacturing',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
+        'Natural Language :: Czech',
+        'Natural Language :: Dutch',
         'Natural Language :: English',
         'Natural Language :: French',
         'Natural Language :: German',
         'Natural Language :: Russian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
     ],
     license='GPL-3',
     install_requires=requires,
+    extras_require={
+        'test': ['caldav'],
+    },
     zip_safe=False,
     entry_points="""
     [trytond.modules]
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
deleted file mode 100644
index 132d9e4..0000000
Binary files a/tests/__init__.pyc and /dev/null differ
diff --git a/tests/scenario_calendar_scheduling.py b/tests/scenario_calendar_scheduling.py
new file mode 100644
index 0000000..688e5f6
--- /dev/null
+++ b/tests/scenario_calendar_scheduling.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from optparse import OptionParser
+from urlparse import urlparse
+import unittest
+import sys
+import datetime
+
+from dateutil.relativedelta import relativedelta
+import caldav
+import vobject
+from proteus import config, Model, Wizard
+from trytond.modules.calendar.tests.scenario_calendar import (
+    install_module, configure_user, create_calendar)
+
+
+class TestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.client = caldav.DAVClient(URL)
+        self.principal = caldav.Principal(self.client, URL)
+        self.calendar, = [x for x in self.principal.calendars()
+            if x.url.path.endswith(user)]
+
+    def test0010create_event_external(self):
+        'Create event with external attendee'
+        ical = vobject.iCalendar()
+        vevent = ical.add('vevent')
+        vevent.add('summary')
+        vevent.summary.value = 'Test event with external attendee'
+        vevent.add('dtstart')
+        vevent.dtstart.value = datetime.datetime.now() + relativedelta(days=10)
+        vevent.add('dtend')
+        vevent.dtend.value = datetime.datetime.now() + relativedelta(days=10,
+            hours=4)
+        vevent.add('organizer')
+        vevent.organizer.value = 'admin at example.com'
+        attendee = vobject.base.ContentLine('ATTENDEE', [], '')
+        attendee.partstat_param = 'TENTATIVE'
+        attendee.value = 'MAILTO:bar at example.com'
+        vevent.attendee_list = [attendee]
+        caldav.Event(self.client, data=ical.serialize(),
+            parent=self.calendar).save()
+
+    def test0020create_event_ext_int(self):
+        'Create event with external and internal attendees'
+        ical = vobject.iCalendar()
+        vevent = ical.add('vevent')
+        vevent.add('summary')
+        vevent.summary.value = 'Test event with ext/int attendees'
+        vevent.add('dtstart')
+        vevent.dtstart.value = datetime.datetime.now() + relativedelta(days=5)
+        vevent.add('dtend')
+        vevent.dtend.value = datetime.datetime.now() + relativedelta(days=5,
+            hours=8)
+        vevent.add('organizer')
+        vevent.organizer.value = 'admin at example.com'
+        attendees = []
+        for email in ('foo at example', 'bar at example.com'):
+            attendee = vobject.base.ContentLine('ATTENDEE', [], '')
+            attendee.partstat_param = 'TENTATIVE'
+            attendee.value = 'MAILTO:%s' % email
+            attendees.append(attendee)
+        vevent.attendee_list = attendees
+        caldav.Event(self.client, data=ical.serialize(),
+            parent=self.calendar).save()
+
+if __name__ == '__main__':
+    parser = OptionParser()
+    parser.add_option('--xmlrpc', dest='xmlrpc', metavar='URL',
+        help='use trytond XML-RPC at URL')
+    parser.add_option('--url', dest='url', metavar='URL',
+        help='use calendar at URL')
+    (options, args) = parser.parse_args()
+    config = config.set_xmlrpc(options.xmlrpc)
+    xmlrpc_user = urlparse(options.xmlrpc).username
+    user = urlparse(options.url).username
+    assert xmlrpc_user == user
+    assert user != 'foo'
+    install_module('calendar_scheduling', config)
+    configure_user(user, config)
+    configure_user('foo', config)
+    create_calendar(user, user, config)
+    create_calendar('foo', user, config)
+    URL = options.url
+    unittest.main(argv=sys.argv[:1])
diff --git a/tests/test_calendar_scheduling.py b/tests/test_calendar_scheduling.py
index 62ed49a..a92c1bd 100644
--- a/tests/test_calendar_scheduling.py
+++ b/tests/test_calendar_scheduling.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
 
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
 
 
 class CalendarSchedulingTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class CalendarSchedulingTestCase(unittest.TestCase):
         '''
         test_view('calendar_scheduling')
 
+    def test0006depends(self):
+        '''
+        Test depends.
+        '''
+        test_depends()
+
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/tests/test_calendar_scheduling.pyc b/tests/test_calendar_scheduling.pyc
deleted file mode 100644
index 564710b..0000000
Binary files a/tests/test_calendar_scheduling.pyc and /dev/null differ
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index b5a4c06..8f1a51c 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,29 +1,31 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-scheduling
-Version: 2.0.0
+Version: 2.2.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/trytond_calendar_scheduling.egg-info/SOURCES.txt b/trytond_calendar_scheduling.egg-info/SOURCES.txt
index fb00800..484ce4b 100644
--- a/trytond_calendar_scheduling.egg-info/SOURCES.txt
+++ b/trytond_calendar_scheduling.egg-info/SOURCES.txt
@@ -4,13 +4,7 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
 res.xml
-ru_RU.csv
 setup.py
 ./__init__.py
 ./__tryton__.py
@@ -18,11 +12,16 @@ setup.py
 ./calendar.py
 ./res.py
 ./tests/__init__.py
+./tests/scenario_calendar_scheduling.py
 ./tests/test_calendar_scheduling.py
-tests/__init__.py
-tests/__init__.pyc
-tests/test_calendar_scheduling.py
-tests/test_calendar_scheduling.pyc
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
 trytond_calendar_scheduling.egg-info/PKG-INFO
 trytond_calendar_scheduling.egg-info/SOURCES.txt
 trytond_calendar_scheduling.egg-info/dependency_links.txt
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 5a2bd03..8b1b860 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,3 +1,6 @@
 PyWebDAV >= 0.9.3
-trytond_calendar >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_calendar >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
+
+[test]
+caldav
\ No newline at end of file
commit 543c8950e8ab04a73990794cb3ebfa8d8b104f57
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue May 24 19:12:44 2011 +0200

    Adding upstream version 2.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index b4f2b41..23ca0f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
 Version 1.8.0 - 2010-11-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 6e6811c..1245dd5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2010 Cédric Krier.
-Copyright (C) 2009-2010 Bertrand Chenal.
-Copyright (C) 2009-2010 B2CK SPRL.
+Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-2011 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 9ad95d2..0de49d8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_scheduling
-Version: 1.8.0
+Version: 2.0.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -16,10 +16,14 @@ Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 5374f19..ca5ee0e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,19 +3,23 @@
 #this repository contains the full copyright notices and license terms.
 {
     'name' : 'Calendar Scheduling',
+    'name_bg_BG' : 'График към календар',
     'name_de_DE' : 'Kalender Terminplanung',
     'name_es_CO' : 'Planificador del calendario',
     'name_es_ES' : 'Planificador del calendario',
     'name_fr_FR' : 'Programmation calendrier',
-    'version' : '1.8.0',
+    'name_ru_RU' : 'Календарное планирование',
+    'version' : '2.0.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
     'description': 'Add Scheduling support on CalDAV',
+    'description_bg_BG' : 'Добавя график към CalDAV',
     'description_de_DE' : 'Fügt Unterstützung für die Terminplanung in CalDAV hinzu',
     'description_es_CO' : 'Añade gestión de planificación de eventos a CalDAV',
     'description_es_ES' : 'Añade la gestión de planificación de eventos a CalDAV',
-    'description_fr_FR': 'Ajoute la gestion de la programmation d\'évènements au CalDAV',
+    'description_fr_FR' : 'Ajoute la gestion de la programmation d\'évènements au CalDAV',
+    'description_ru_RU' : 'Добавление поддержки планирования для CalDAV',
     'depends' : [
         'ir',
         'res',
@@ -26,9 +30,11 @@
         'res.xml',
     ],
     'translation': [
+        'bg_BG.csv',
         'de_DE.csv',
         'es_ES.csv',
         'es_CO.csv',
         'fr_FR.csv',
+        'ru_RU.csv',
     ],
 }
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..732aed3
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,67 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,    * ,    * ,0
+error,calendar.event,0,(No Subject),(Няма тема),0
+error,calendar.event,0,:,:,0
+error,calendar.event,0,Cancelled Event: %s @ %s,Отказано събитие: %s @ %s,0
+error,calendar.event,0,Invitation: %s @ %s,Покана: %s @ %s,0
+error,calendar.event,0,"This event has been canceled.
+
+",Събитието бе прекратено.,0
+error,calendar.event,0,"This event has been changed.
+
+",Събитоето бе променено.,0
+error,calendar.event,0,Updated Invitation: %s @ %s,Променена покана: %s @ %s,0
+error,calendar.event,0,When,Кога,0
+error,calendar.event,0,"You have been invited to the following event.
+
+",Поканени сте на това събитие.,0
+error,calendar.event.attendee,0,    * ,    * ,0
+error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
+
+",%s (%s) промени състоянието за участието си на: %s,0
+error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
+
+",%s (%s) приеха поканата:,0
+error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
+
+",%s (%s) отказаха поканата:,0
+error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
+error,calendar.event.attendee,0,(No Subject),(Няма тема),0
+error,calendar.event.attendee,0,:,:,0
+error,calendar.event.attendee,0,When,Кога,0
+field,"calendar.attendee,schedule_agent",0,Schedule Agent,Пълномощник на графика,0
+field,"calendar.attendee,schedule_status",0,Schedule Status,Състояние на график,0
+field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Пълномощник на графика,0
+field,"calendar.event,organizer_schedule_status",0,Schedule Status,Състояние на график,0
+field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Отказани покани,0
+field,"res.user,calendar_email_notification_new",0,New invitations,Нови покани,0
+field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Отговори на покана,0
+field,"res.user,calendar_email_notification_update",0,Changed invitations,Променени покани,0
+selection,"calendar.attendee,schedule_agent",0,,,0
+selection,"calendar.attendee,schedule_agent",0,Client,Клиент,0
+selection,"calendar.attendee,schedule_agent",0,None,Няма,0
+selection,"calendar.attendee,schedule_agent",0,Server,Сървър,0
+selection,"calendar.attendee,schedule_status",0,,,0
+selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
+selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
+selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
+selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
+selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
+selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
+selection,"calendar.attendee,schedule_status",0,5.2,5.2,0
+selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
+selection,"calendar.event,organizer_schedule_agent",0,,,0
+selection,"calendar.event,organizer_schedule_agent",0,Client,Клиент,0
+selection,"calendar.event,organizer_schedule_agent",0,None,Няма,0
+selection,"calendar.event,organizer_schedule_agent",0,Server,Сървър,0
+selection,"calendar.event,organizer_schedule_status",0,,,0
+selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
+selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
+selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
+selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
+selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
+selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
+selection,"calendar.event,organizer_schedule_status",0,5.2,5.2,0
+selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
+view,res.user,0,Calendar Email Notifications,Известяване за събитие от календар,0
+view,res.user,0,Notifications,Известия,0
diff --git a/ru_RU.csv b/ru_RU.csv
new file mode 100644
index 0000000..d371a72
--- /dev/null
+++ b/ru_RU.csv
@@ -0,0 +1,67 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,    * ,,0
+error,calendar.event,0,(No Subject),(Нет описания),0
+error,calendar.event,0,:,,0
+error,calendar.event,0,Cancelled Event: %s @ %s,Событие отмененно: %s @ %s,0
+error,calendar.event,0,Invitation: %s @ %s,Приглашение: %s @ %s,0
+error,calendar.event,0,"This event has been canceled.
+
+",,0
+error,calendar.event,0,"This event has been changed.
+
+",,0
+error,calendar.event,0,Updated Invitation: %s @ %s,,0
+error,calendar.event,0,When,Когда,0
+error,calendar.event,0,"You have been invited to the following event.
+
+",,0
+error,calendar.event.attendee,0,    * ,,0
+error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
+
+",,0
+error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
+
+",,0
+error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
+
+",,0
+error,calendar.event.attendee,0,%s: %s @ %s,,0
+error,calendar.event.attendee,0,(No Subject),(Нет описания),0
+error,calendar.event.attendee,0,:,,0
+error,calendar.event.attendee,0,When,Когда,0
+field,"calendar.attendee,schedule_agent",0,Schedule Agent,Расписание агента,0
+field,"calendar.attendee,schedule_status",0,Schedule Status,Статус расписания,0
+field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Расписание агента,0
+field,"calendar.event,organizer_schedule_status",0,Schedule Status,Статус расписания,0
+field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Отменено приглашения,0
+field,"res.user,calendar_email_notification_new",0,New invitations,Новые приглашения,0
+field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Ответы на приглашения,0
+field,"res.user,calendar_email_notification_update",0,Changed invitations,Изменен приглашения,0
+selection,"calendar.attendee,schedule_agent",0,,,0
+selection,"calendar.attendee,schedule_agent",0,Client,Клиент,0
+selection,"calendar.attendee,schedule_agent",0,None,Отсутствует,0
+selection,"calendar.attendee,schedule_agent",0,Server,Сервер,0
+selection,"calendar.attendee,schedule_status",0,,,0
+selection,"calendar.attendee,schedule_status",0,1.0,,0
+selection,"calendar.attendee,schedule_status",0,1.1,,0
+selection,"calendar.attendee,schedule_status",0,1.2,,0
+selection,"calendar.attendee,schedule_status",0,3.7,,0
+selection,"calendar.attendee,schedule_status",0,3.8,,0
+selection,"calendar.attendee,schedule_status",0,5.1,,0
+selection,"calendar.attendee,schedule_status",0,5.2,,0
+selection,"calendar.attendee,schedule_status",0,5.3,,0
+selection,"calendar.event,organizer_schedule_agent",0,,,0
+selection,"calendar.event,organizer_schedule_agent",0,Client,Клиент,0
+selection,"calendar.event,organizer_schedule_agent",0,None,Отсутствует,0
+selection,"calendar.event,organizer_schedule_agent",0,Server,Сервер,0
+selection,"calendar.event,organizer_schedule_status",0,,,0
+selection,"calendar.event,organizer_schedule_status",0,1.0,,0
+selection,"calendar.event,organizer_schedule_status",0,1.1,,0
+selection,"calendar.event,organizer_schedule_status",0,1.2,,0
+selection,"calendar.event,organizer_schedule_status",0,3.7,,0
+selection,"calendar.event,organizer_schedule_status",0,3.8,,0
+selection,"calendar.event,organizer_schedule_status",0,5.1,,0
+selection,"calendar.event,organizer_schedule_status",0,5.2,,0
+selection,"calendar.event,organizer_schedule_status",0,5.3,,0
+view,res.user,0,Calendar Email Notifications,Уведомление по почте,0
+view,res.user,0,Notifications,Уведомления,0
diff --git a/setup.py b/setup.py
index 656c768..d86d0aa 100644
--- a/setup.py
+++ b/setup.py
@@ -44,12 +44,16 @@ setup(name='trytond_calendar_scheduling',
         'Intended Audience :: Legal Industry',
         'Intended Audience :: Manufacturing',
         'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: Bulgarian',
         'Natural Language :: English',
         'Natural Language :: French',
         'Natural Language :: German',
+        'Natural Language :: Russian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
     ],
     license='GPL-3',
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index b3c4147..b5a4c06 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-scheduling
-Version: 1.8.0
+Version: 2.0.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -16,10 +16,14 @@ Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/trytond_calendar_scheduling.egg-info/SOURCES.txt b/trytond_calendar_scheduling.egg-info/SOURCES.txt
index 468ac0e..fb00800 100644
--- a/trytond_calendar_scheduling.egg-info/SOURCES.txt
+++ b/trytond_calendar_scheduling.egg-info/SOURCES.txt
@@ -4,11 +4,13 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
+bg_BG.csv
 de_DE.csv
 es_CO.csv
 es_ES.csv
 fr_FR.csv
 res.xml
+ru_RU.csv
 setup.py
 ./__init__.py
 ./__tryton__.py
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 809b805..5a2bd03 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,3 +1,3 @@
 PyWebDAV >= 0.9.3
-trytond_calendar >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_calendar >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit fe79f6325780a3fd7cb2f22c09ba17448c42ec98
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Nov 4 20:12:14 2010 +0100

    Adding upstream version 1.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index 634ce6b..b4f2b41 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
 Version 1.6.0 - 2010-05-09
 * Bug fixes (see mercurial logs for details)
 
diff --git a/INSTALL b/INSTALL
index 40e5120..e47141c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_calendar_scheduling
 Prerequisites
 -------------
 
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_calendar (http://www.tryton.org/)
  * pywebdav 0.9.3 or later (http://sourceforge.net/projects/pywebdav/)
diff --git a/MANIFEST.in b/MANIFEST.in
index c61b52d..5343ad8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,3 @@ include LICENSE
 include *.xml
 include *.odt
 include *.csv
-include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index 0417288..9ad95d2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_scheduling
-Version: 1.6.0
+Version: 1.8.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 8e73d5d..5374f19 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     'name_es_CO' : 'Planificador del calendario',
     'name_es_ES' : 'Planificador del calendario',
     'name_fr_FR' : 'Programmation calendrier',
-    'version' : '1.6.0',
+    'version' : '1.8.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index f5c3ded..ff2f1da 100644
--- a/calendar.py
+++ b/calendar.py
@@ -1,12 +1,14 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.model import ModelSQL, ModelView, fields
-from trytond.tools import get_smtp_server
+from __future__ import with_statement
 from email.mime.text import MIMEText
 from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
 import email.utils
 import logging
+from trytond.model import ModelSQL, ModelView, fields
+from trytond.tools import get_smtp_server
+from trytond.transaction import Transaction
 
 
 class Event(ModelSQL, ModelView):
@@ -30,7 +32,7 @@ class Event(ModelSQL, ModelView):
             ('CLIENT', 'Client'),
             ], 'Schedule Agent')
 
-    def default_schedule_agent(self, cursor, user, context=None):
+    def default_schedule_agent(self):
         return 'SERVER'
 
     def __init__(self):
@@ -48,10 +50,9 @@ class Event(ModelSQL, ModelView):
             'when': 'When',
             })
 
-    def ical2values(self, cursor, user, event_id, ical, calendar_id,
-            vevent=None, context=None):
-        res = super(Event, self).ical2values(cursor, user, event_id, ical,
-                calendar_id, vevent=vevent, context=context)
+    def ical2values(self, event_id, ical, calendar_id, vevent=None):
+        res = super(Event, self).ical2values(event_id, ical, calendar_id,
+                vevent=vevent)
 
         if not vevent:
             vevent = ical.vevent
@@ -68,25 +69,22 @@ class Event(ModelSQL, ModelView):
 
         return res
 
-    def event2ical(self, cursor, user, event, context=None):
+    def event2ical(self, event):
         """
         Override default event2ical to add schedule-status and
         schedule-agent properties
 
-        :param context: if key skip_schedule_agent is present and
-                associated to True, will prevent the schedule-status
-                to be add to the organiser property. This is needed
-                when one want to generate an ical that will be used
-                for scheduling message.
+        If key skip_schedule_agent is present and associated to True, will
+        prevent the schedule-status to be add to the organiser property. This
+        is needed when one want to generate an ical that will be used for
+        scheduling message.
         """
 
-        ical = super(Event, self).event2ical(cursor, user, event,
-                context=context)
+        ical = super(Event, self).event2ical(event)
         if isinstance(event, (int, long)):
-            event = self.browse(cursor, user, event, context=context)
+            event = self.browse(event)
 
         vevent = ical.vevent
-        context = context or {}
 
         if event.organizer_schedule_status:
             if not hasattr(vevent, 'organizer'):
@@ -94,7 +92,7 @@ class Event(ModelSQL, ModelView):
             vevent.organizer.params['SCHEDULE-STATUS'] = \
                 (event.organizer_schedule_status,)
 
-        if context.get('skip_schedule_agent'):
+        if Transaction().context.get('skip_schedule_agent'):
             return ical
 
         if event.organizer_schedule_agent:
@@ -105,27 +103,23 @@ class Event(ModelSQL, ModelView):
 
         return ical
 
-    def subject_body(self, cursor, user, type, event, owner, context=None):
+    def subject_body(self, type, event, owner):
         lang_obj = self.pool.get('ir.lang')
 
-        if context is None:
-            context = {}
-
         if not (event and owner):
             return "", ""
         lang = owner.language
         if not lang:
-            lang_ids = lang_obj.search(cursor, user, [
+            lang_ids = lang_obj.search([
                 ('code', '=', 'en_US'),
-                ], limit=1, context=context)
-            lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
-        context = context.copy()
-        context['language'] = lang.code
+                ], limit=1)
+            lang = lang_obj.browse(lang_ids[0])
 
-        summary = event.summary
-        if not summary:
-            summary = self.raise_user_error(cursor, 'no_subject',
-                    raise_exception=False, context=context)
+        with Transaction().set_context(language=lang.code):
+            summary = event.summary
+            if not summary:
+                summary = self.raise_user_error('no_subject',
+                        raise_exception=False)
 
         date = lang_obj.strftime(event.dtstart, lang.code, lang.date)
         if not event.all_day:
@@ -144,22 +138,22 @@ class Event(ModelSQL, ModelView):
         if event.timezone:
             date += ' ' + event.timezone
 
-        subject = self.raise_user_error(cursor, type + '_subject',
-                (summary, date), raise_exception=False, context=context)
-        body = self.raise_user_error(cursor, type + '_body', (summary, ),
-                raise_exception=False, context=context)
-        separator = self.raise_user_error(cursor, 'separator',
-                raise_exception=False, context=context)
-        bullet = self.raise_user_error(cursor, 'bullet', raise_exception=False,
-                context=context)
+        with Transaction().set_context(language=lang.code):
+            subject = self.raise_user_error(type + '_subject',
+                    (summary, date), raise_exception=False)
+            body = self.raise_user_error(type + '_body', (summary, ),
+                    raise_exception=False)
+            separator = self.raise_user_error('separator',
+                    raise_exception=False)
+            bullet = self.raise_user_error('bullet', raise_exception=False)
 
         fields_names = ['summary', 'dtstart', 'location', 'attendees']
         if type == 'cancel':
             fields_names.remove('attendees')
-        fields = self.fields_get(cursor, user, fields_names=fields_names,
-                context=context)
-        fields['dtstart']['string'] = self.raise_user_error(cursor,
-                'when', raise_exception=False, context=context)
+        with Transaction().set_context(language=lang.code):
+            fields = self.fields_get(fields_names=fields_names)
+            fields['dtstart']['string'] = self.raise_user_error('when',
+                    raise_exception=False)
         for field in fields_names:
             if field == 'attendees':
                 if lang.direction == 'ltr':
@@ -189,8 +183,7 @@ class Event(ModelSQL, ModelView):
                             + fields[field]['string'] + '\n'
         return subject, body
 
-    def create_msg(self, cursor, user, from_addr, to_addrs, subject,
-            body, ical=None, context=None):
+    def create_msg(self, from_addr, to_addrs, subject, body, ical=None):
 
         if not to_addrs:
             return None
@@ -224,19 +217,15 @@ class Event(ModelSQL, ModelView):
 
         return msg
 
-    def send_msg(self, cursor, user_id, from_addr, to_addrs, msg,
-            type, event_id, context=None):
+    def send_msg(self, from_addr, to_addrs, msg, type, event_id):
         '''
         Send message
 
-        :param cursor: the database cursor
-        :param user_id: the user id
         :param from_addr: a from-address string
         :param to_addrs: a list of to-address strings
         :param msg: a message string
         :param type: the type (new, update, cancel)
         :param event_id: the id of the calendar.event
-        :param context: the context
         :return: list of email addresses sent
         '''
         user_obj = self.pool.get('res.user')
@@ -245,10 +234,10 @@ class Event(ModelSQL, ModelView):
             return to_addrs
         to_addrs = list(set(to_addrs))
 
-        user_ids = user_obj.search(cursor, user_id, [
+        user_ids = user_obj.search([
             ('email', 'in', to_addrs),
-            ], context=context)
-        for user in user_obj.browse(cursor, user_id, user_ids, context=context):
+            ])
+        for user in user_obj.browse(user_ids):
             if not user['calendar_email_notification_' + type]:
                 to_addrs.remove(user.email)
 
@@ -258,7 +247,7 @@ class Event(ModelSQL, ModelView):
             server.sendmail(from_addr, to_addrs, msg.as_string())
             server.quit()
             success = to_addrs
-        except:
+        except Exception:
             logging.getLogger('calendar_scheduling').error(
                     'Unable to deliver scheduling mail for event %s' % event_id)
         return success
@@ -293,59 +282,54 @@ class Event(ModelSQL, ModelView):
 
         return to_notify, owner
 
-    def create(self, cursor, user, values, context=None):
+    def create(self, values):
         attendee_obj = self.pool.get('calendar.event.attendee')
-        res = super(Event, self).create(cursor, user, values, context=context)
+        res = super(Event, self).create(values)
 
-        if user == 0:
+        if Transaction().user == 0:
             # user is 0 means create is triggered by another one
             return res
 
-        event = self.browse(cursor, user, res, context=context)
+        event = self.browse(res)
 
         to_notify, owner = self.attendees_to_notify(event)
         if not to_notify:
             return res
 
-        ctx = context and context.copy() or {}
-        ctx['skip_schedule_agent'] = True
-        ical = self.event2ical(cursor, user, event, context=ctx)
+        with Transaction().set_context(skip_schedule_agent=True):
+            ical = self.event2ical(event)
         ical.add('method')
         ical.method.value = 'REQUEST'
 
         attendee_emails = [a.email for a in to_notify]
 
-        subject, body = self.subject_body(cursor, user, 'new', event, owner,
-                context=context)
-        msg = self.create_msg(cursor, user, owner.email, attendee_emails,
-                subject, body, ical, context=context)
-        sent = self.send_msg(cursor, user, owner.email,
-                attendee_emails, msg, 'new', event.id, context=context)
+        subject, body = self.subject_body('new', event, owner)
+        msg = self.create_msg(owner.email, attendee_emails, subject, body,
+                ical)
+        sent = self.send_msg(owner.email, attendee_emails, msg, 'new',
+                event.id)
 
         vals = {'status': 'needs-action'}
         if sent:
             vals['schedule_status'] = '1.1' #successfully sent
         else:
             vals['schedule_status'] = '5.1' #could not complete delivery
-        attendee_obj.write(cursor, user, [a.id for a in to_notify],
-                vals, context=context)
+        attendee_obj.write([a.id for a in to_notify], vals)
 
         return res
 
-    def write(self, cursor, user, ids, values, context=None):
+    def write(self, ids, values):
         attendee_obj = self.pool.get('calendar.event.attendee')
 
-        if user == 0:
+        if Transaction().user == 0:
             # user is 0 means write is triggered by another one
-            return super(Event, self).write(cursor, user, ids, values,
-                context=context)
+            return super(Event, self).write(ids, values)
 
         if isinstance(ids, (int, long)):
             ids = [ids]
 
         if not values or not ids:
-            return super(Event, self).write(cursor, user, ids, values,
-                    context=context)
+            return super(Event, self).write(ids, values)
 
         event_edited = False
         for k in values:
@@ -354,7 +338,7 @@ class Event(ModelSQL, ModelView):
                 break
 
         # store old attendee info
-        events = self.browse(cursor, user, ids, context=context)
+        events = self.browse(ids)
         event2former_emails = {}
         former_organiser_mail = {}
         former_organiser_lang = {}
@@ -365,10 +349,9 @@ class Event(ModelSQL, ModelView):
             former_organiser_lang[event.id] = owner and owner.language \
                 and owner.language.code
 
-        res = super(Event, self).write(cursor, user, ids, values,
-                context=context)
+        res = super(Event, self).write(ids, values)
 
-        events = self.browse(cursor, user, ids, context=context)
+        events = self.browse(ids)
 
         for event in events:
             current_attendees, owner = self.attendees_to_notify(event)
@@ -379,28 +362,23 @@ class Event(ModelSQL, ModelView):
                     former_emails)
 
             if missing_mails:
-                ctx = context and context.copy() or {}
-                ctx['skip_schedule_agent'] = True
-                ical = self.event2ical(cursor, user, event, context=ctx)
+                with Transaction().set_context(skip_schedule_agent=True):
+                    ical = self.event2ical(event)
                 ical.add('method')
                 ical.method.value = 'CANCEL'
 
-                subject, body = self.subject_body(cursor, user, 'cancel', event,
-                        owner, context=context)
-                msg = self.create_msg(cursor, user,
-                        former_organiser_mail[event.id], missing_mails, subject,
-                        body, ical, context=context)
-                sent = self.send_msg(cursor, user,
-                        former_organiser_mail[event.id], missing_mails, msg,
-                        'cancel', event.id, context=context)
+                subject, body = self.subject_body('cancel', event, owner)
+                msg = self.create_msg(former_organiser_mail[event.id],
+                        missing_mails, subject, body, ical)
+                sent = self.send_msg(former_organiser_mail[event.id],
+                        missing_mails, msg, 'cancel', event.id)
 
             new_attendees = filter(lambda a: a.email not in former_emails,
                 current_attendees)
             old_attendees = filter(lambda a: a.email in former_emails,
                 current_attendees)
-            ctx = context and context.copy() or {}
-            ctx['skip_schedule_agent'] = True
-            ical = self.event2ical(cursor, user, event, context=ctx)
+            with Transaction().set_context(skip_schedule_agent=True):
+                ical = self.event2ical(event)
             if not hasattr(ical, 'method'):
                 ical.add('method')
 
@@ -410,14 +388,13 @@ class Event(ModelSQL, ModelView):
                 if event.status == 'cancelled':
                     ical.method.value = 'CANCEL'
                     #send cancel to old attendee
-                    subject, body = self.subject_body(cursor, user, 'cancel',
-                            event, owner, context=context)
-                    msg = self.create_msg(cursor, user,
-                            owner_email, [a.email for a in old_attendees],
-                            subject, body, ical, context=context)
-                    sent = self.send_msg(cursor, user,
-                            owner_email, [a.email for a in old_attendees], msg,
-                            'cancel', event.id, context=context)
+                    subject, body = self.subject_body('cancel', event, owner)
+                    msg = self.create_msg(owner_email,
+                            [a.email for a in old_attendees],
+                            subject, body, ical)
+                    sent = self.send_msg(owner_email,
+                            [a.email for a in old_attendees],
+                            msg, 'cancel', event.id)
                     if sent:
                         sent_succes += old_attendees
                     else:
@@ -426,27 +403,25 @@ class Event(ModelSQL, ModelView):
                 else:
                     ical.method.value = 'REQUEST'
                     #send update to old attendees
-                    subject, body = self.subject_body(cursor, user, 'update',
-                            event, owner, context=context)
-                    msg = self.create_msg(cursor, user,
-                            owner_email, [a.email for a in old_attendees],
-                            subject, body, ical, context=context)
-                    sent = self.send_msg(cursor, user,
-                            owner_email, [a.email for a in old_attendees], msg,
-                            'update', event.id, context=context)
+                    subject, body = self.subject_body('update', event, owner)
+                    msg = self.create_msg(owner_email,
+                            [a.email for a in old_attendees],
+                            subject, body, ical)
+                    sent = self.send_msg(owner_email,
+                            [a.email for a in old_attendees],
+                            msg, 'update', event.id)
                     if sent:
                         sent_succes += old_attendees
                     else:
                         sent_fail += old_attendees
                     #send new to new attendees
-                    subject, body = self.subject_body(cursor, user, 'new',
-                            event, owner, context=context)
-                    msg = self.create_msg(cursor, user,
-                            owner_email, [a.email for a in new_attendees],
-                            subject, body, ical, context=context)
-                    sent = self.send_msg(cursor, user,
-                            owner_email, [a.email for a in new_attendees], msg,
-                            'new', event.id, context=context)
+                    subject, body = self.subject_body('new', event, owner)
+                    msg = self.create_msg(owner_email,
+                            [a.email for a in new_attendees],
+                            subject, body, ical)
+                    sent = self.send_msg(owner_email,
+                            [a.email for a in new_attendees],
+                            msg, 'new', event.id)
                     if sent:
                         sent_succes += new_attendees
                     else:
@@ -456,14 +431,13 @@ class Event(ModelSQL, ModelView):
                 if event.status != 'cancelled':
                     ical.method.value = 'REQUEST'
                     #send new to new attendees
-                    subject, body = self.subject_body(cursor, user, 'new',
-                            event, owner, context=context)
-                    msg = self.create_msg(cursor, user,
-                            owner_email, [a.email for a in new_attendees],
-                            subject, body, ical, context=context)
-                    sent = self.send_msg(cursor, user,
-                            owner_email, [a.email for a in new_attendees], msg,
-                            'new', event.id, context=context)
+                    subject, body = self.subject_body('new', event, owner)
+                    msg = self.create_msg(owner_email,
+                            [a.email for a in new_attendees],
+                            subject, body, ical)
+                    sent = self.send_msg(owner_email,
+                            [a.email for a in new_attendees],
+                            msg, 'new', event.id)
                     if sent:
                         sent_succes += new_attendees
                     else:
@@ -471,22 +445,20 @@ class Event(ModelSQL, ModelView):
 
                 vals = {'status': 'needs-action'}
                 vals['schedule_status'] = '1.1' #successfully sent
-                attendee_obj.write(cursor, user,
-                        [a.id for a in sent_succes], vals, context=context)
+                attendee_obj.write([a.id for a in sent_succes], vals)
                 vals['schedule_status'] = '5.1' #could not complete delivery
-                attendee_obj.write(cursor, user,
-                        [a.id for a in sent_fail], vals, context=context)
+                attendee_obj.write([a.id for a in sent_fail], vals)
         return res
 
-    def delete(self, cursor, user, ids, context=None):
-        if user == 0:
+    def delete(self, ids):
+        if Transaction().user == 0:
             # user is 0 means the deletion is triggered by another one
-            return super(Event, self).delete(cursor, user, ids, context=context)
+            return super(Event, self).delete(ids)
 
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        events = self.browse(cursor, user, ids, context=context)
+        events = self.browse(ids)
         send_list = []
         for event in events:
             if event.status == 'cancelled':
@@ -495,25 +467,23 @@ class Event(ModelSQL, ModelView):
             if not to_notify:
                 continue
 
-            ctx = context and context.copy() or {}
-            ctx['skip_schedule_agent'] = True
-            ical = self.event2ical(cursor, user, event, context=ctx)
+            with Transaction().set_context(skip_schedule_agent=True):
+                ical = self.event2ical(event)
             ical.add('method')
             ical.method.value = 'CANCEL'
 
             attendee_emails = [a.email for a in to_notify]
-            subject, body = self.subject_body(cursor, user, 'cancel',
-                    event, owner, context=context)
-            msg = self.create_msg(cursor, user, owner.email, attendee_emails,
-                    subject, body, ical, context=context)
+            subject, body = self.subject_body('cancel', event, owner)
+            msg = self.create_msg(owner.email, attendee_emails, subject, body,
+                    ical)
 
             send_list.append((owner.email, attendee_emails, msg, event.id,))
 
-        res = super(Event, self).delete(cursor, user, ids, context=context)
+        res = super(Event, self).delete(ids)
         for args in send_list:
             owner_email, attendee_emails, msg, event_id = args
-            self.send_msg(cursor, user, owner_email, attendee_emails, msg,
-                    'cancel', event_id, context=context)
+            self.send_msg(owner_email, attendee_emails, msg, 'cancel',
+                    event_id)
         return res
 
 Event()
@@ -540,12 +510,11 @@ class Attendee(ModelSQL, ModelView):
             ('CLIENT', 'Client'),
             ], 'Schedule Agent')
 
-    def default_schedule_agent(self, cursor, user, context=None):
+    def default_schedule_agent(self):
         return 'SERVER'
 
-    def attendee2values(self, cursor, user, attendee, context=None):
-        res = super(Attendee, self).attendee2values(cursor, user, attendee,
-                context=context)
+    def attendee2values(self, attendee):
+        res = super(Attendee, self).attendee2values(attendee)
         if hasattr(attendee, 'schedule_status'):
             if attendee.schedule_status in dict(self.schedule_status.selection):
                 res['schedule_status'] = attendee.schedule_status
@@ -554,11 +523,8 @@ class Attendee(ModelSQL, ModelView):
                 res['schedule_agent'] = attendee.schedule_agent
         return res
 
-    def attendee2attendee(self, cursor, user, attendee, context=None):
-        res = super(Attendee, self).attendee2attendee(cursor, user, attendee,
-                context=context)
-
-        context = context or {}
+    def attendee2attendee(self, attendee):
+        res = super(Attendee, self).attendee2attendee(attendee)
 
         if attendee.schedule_status:
             if hasattr(res, 'schedule_status_param'):
@@ -570,7 +536,7 @@ class Attendee(ModelSQL, ModelView):
             if res.schedule_status_param in dict(self.schedule_status.selection):
                 del res.schedule_status_param
 
-        if context.get('skip_schedule_agent'):
+        if Transaction().context.get('skip_schedule_agent'):
             return res
 
         if attendee.schedule_agent:
@@ -604,27 +570,24 @@ class EventAttendee(ModelSQL, ModelView):
                 'when': 'When',
                 })
 
-    def subject_body(self, cursor, user, status, event, owner, context=None):
+    def subject_body(self, status, event, owner):
         lang_obj = self.pool.get('ir.lang')
         event_obj = self.pool.get('calendar.event')
-        if context is None:
-            context = {}
 
         if not (event and owner):
             return "", ""
         lang = owner.language
         if not lang:
-            lang_ids = lang_obj.search(cursor, user, [
+            lang_ids = lang_obj.search([
                 ('code', '=', 'en_US'),
-                ], limit=1, context=context)
-            lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
-        context = context.copy()
-        context['language'] = lang.code
+                ], limit=1)
+            lang = lang_obj.browse(lang_ids[0])
 
         summary = event.summary
         if not summary:
-            summary = self.raise_user_error(cursor, 'no_subject',
-                    raise_exception=False, context=context)
+            with Transaction().set_context(language=lang.code):
+                summary = self.raise_user_error('no_subject',
+                        raise_exception=False)
 
         date = lang_obj.strftime(event.dtstart, lang.code, lang.date)
         if not event.all_day:
@@ -645,35 +608,32 @@ class EventAttendee(ModelSQL, ModelView):
 
         status_string = status
         fields_names = ['status']
-        fields = self.fields_get(cursor, user, fields_names=fields_names,
-                context=context)
+        with Transaction().set_context(language=lang.code):
+            fields = self.fields_get(fields_names=fields_names)
         for k,v in  fields['status']['selection']:
             if k == status:
                 status_string = v
 
-        subject = self.raise_user_error(cursor, 'subject',
-                (status, summary, date), raise_exception=False,
-                context=context)
-
-        if status + '_body' in self._error_messages:
-            body = self.raise_user_error(cursor, status + '_body',
-                    (owner.name, owner.email), raise_exception=False,
-                    context=context)
-        else:
-            body = self.raise_user_error(cursor, 'body',
-                (owner.name, owner.email, status_string ), raise_exception=False,
-                context=context)
-
-        separator = self.raise_user_error(cursor, 'separator',
-                raise_exception=False, context=context)
-        bullet = self.raise_user_error(cursor, 'bullet', raise_exception=False,
-                context=context)
+        with Transaction().set_context(language=lang.code):
+            subject = self.raise_user_error('subject', (status, summary, date),
+                    raise_exception=False)
 
-        fields_names = ['summary', 'dtstart', 'location', 'attendees']
-        fields = event_obj.fields_get(cursor, user, fields_names=fields_names,
-                context=context)
-        fields['dtstart']['string'] = self.raise_user_error(cursor,
-                'when', raise_exception=False, context=context)
+            if status + '_body' in self._error_messages:
+                body = self.raise_user_error(status + '_body',
+                        (owner.name, owner.email), raise_exception=False)
+            else:
+                body = self.raise_user_error('body',
+                        (owner.name, owner.email, status_string),
+                        raise_exception=False)
+
+            separator = self.raise_user_error('separator',
+                    raise_exception=False)
+            bullet = self.raise_user_error('bullet', raise_exception=False)
+
+            fields_names = ['summary', 'dtstart', 'location', 'attendees']
+            fields = event_obj.fields_get(fields_names=fields_names)
+            fields['dtstart']['string'] = self.raise_user_error('when',
+                    raise_exception=False)
         for field in fields_names:
             if field == 'attendees':
                 organizer = event.organizer or event.parent.organizer
@@ -706,8 +666,7 @@ class EventAttendee(ModelSQL, ModelView):
                             + fields[field]['string'] + '\n'
         return subject, body
 
-    def create_msg(self, cursor, user, from_addr, to_addr, subject,
-            body, ical=None, context=None):
+    def create_msg(self, from_addr, to_addr, subject, body, ical=None):
 
         if not to_addr:
             return None
@@ -740,18 +699,14 @@ class EventAttendee(ModelSQL, ModelView):
 
         return msg
 
-    def send_msg(self, cursor, user_id, from_addr, to_addr, msg,
-            event, context=None):
+    def send_msg(self, from_addr, to_addr, msg, event):
         '''
         Send message
 
-        :param cursor: the database cursor
-        :param user_id: the user id
         :param from_addr: a from-address string
         :param to_addr: recipient address
         :param msg: a message string
         :param event_id: the id of the calendar.event
-        :param context: the context
         :return: a boolean (True if the mail has been sent)
         '''
         success = False
@@ -760,7 +715,7 @@ class EventAttendee(ModelSQL, ModelView):
             server.sendmail(from_addr, to_addr, msg.as_string())
             server.quit()
             success = True
-        except:
+        except Exception:
             logging.getLogger('calendar_scheduling').error(
                     'Unable to deliver reply mail for event %s' % event_id)
         return success
@@ -781,30 +736,27 @@ class EventAttendee(ModelSQL, ModelView):
 
         return organizer
 
-    def write(self, cursor, user, ids, values, context=None):
+    def write(self, ids, values):
         event_obj = self.pool.get('calendar.event')
 
-        if user == 0:
+        if Transaction().user == 0:
             # user is 0 means write is triggered by another one
-            return super(EventAttendee, self).write(cursor, user, ids, values,
-                    context=context)
+            return super(EventAttendee, self).write(ids, values)
 
         if 'status' not in values:
-            return super(EventAttendee, self).write(cursor, user, ids, values,
-                    context=context)
+            return super(EventAttendee, self).write(ids, values)
 
         if isinstance(ids, (int, long)):
             ids = [ids]
 
         att2status = {}
-        attendees = self.browse(cursor, user, ids, context=context)
+        attendees = self.browse(ids)
         for attendee in attendees:
             att2status[attendee.id] = attendee.status
 
-        res = super(EventAttendee, self).write(cursor, user, ids, values,
-                    context=context)
+        res = super(EventAttendee, self).write(ids, values)
 
-        attendees = self.browse(cursor, user, ids, context=context)
+        attendees = self.browse(ids)
         for attendee in attendees:
             owner = attendee.event.calendar.owner
             if not owner.calendar_email_notification_partstat:
@@ -819,41 +771,33 @@ class EventAttendee(ModelSQL, ModelView):
             if old == new:
                 continue
 
-            ctx = context and context.copy() or {}
-            ctx['skip_schedule_agent'] = True
-            ical = event_obj.event2ical(cursor, user, attendee.event,
-                    context=ctx)
+            with Transaction().set_context(skip_schedule_agent=True):
+                ical = event_obj.event2ical(attendee.event)
             if not hasattr(ical, 'method'):
                 ical.add('method')
             ical.method.value = 'REPLY'
 
-            subject, body = self.subject_body(cursor, user, new,
-                    attendee.event, owner, context=context)
-            msg = self.create_msg(cursor, user,
-                    owner.email, organizer,
-                    subject, body, ical, context=context)
+            subject, body = self.subject_body(new, attendee.event, owner)
+            msg = self.create_msg(owner.email, organizer, subject, body, ical)
 
-            sent = self.send_msg(cursor, user,
-                    owner.email, organizer, msg, attendee.event.id,
-                    context=context)
+            sent = self.send_msg(owner.email, organizer, msg,
+                    attendee.event.id)
 
             vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
-            event_obj.write(cursor, user, attendee.event.id, vals,
-                    context=context)
+            event_obj.write(attendee.event.id, vals)
 
         return res
 
-    def delete(self, cursor, user, ids, context=None):
+    def delete(self, ids):
         event_obj = self.pool.get('calendar.event')
 
-        if user == 0:
+        if Transaction().user == 0:
             # user is 0 means the deletion is triggered by another one
-            return super(EventAttendee, self).delete(cursor, user, ids,
-                    context=context)
+            return super(EventAttendee, self).delete(ids)
 
         if isinstance(ids, (int, long)):
             ids = [ids]
-        attendees = self.browse(cursor, user, ids, context=context)
+        attendees = self.browse(ids)
         send_list = []
         for attendee in attendees:
             owner = attendee.event.calendar.owner
@@ -866,44 +810,37 @@ class EventAttendee(ModelSQL, ModelView):
             if not organizer:
                 continue
 
-            ctx = context and context.copy() or {}
-            ctx['skip_schedule_agent'] = True
-            ical = event_obj.event2ical(cursor, user, attendee.event,
-                    context=ctx)
+            with Transaction().set_context(skip_schedule_agent=True):
+                ical = event_obj.event2ical(attendee.event)
             if not hasattr(ical, 'method'):
                 ical.add('method')
             ical.method.value = 'REPLY'
 
-            subject, body = self.subject_body(cursor, user, 'declined',
-                    attendee.event, owner, context=context)
-            msg = self.create_msg(cursor, user, owner.email, organizer,
-                    subject, body, ical, context=context)
+            subject, body = self.subject_body('declined', attendee.event,
+                    owner)
+            msg = self.create_msg(owner.email, organizer, subject, body, ical)
 
             send_list.append((owner.email, organizer, msg, attendee.event.id))
 
 
-        res = super(EventAttendee, self).delete(cursor, user, ids,
-                context=context)
+        res = super(EventAttendee, self).delete(ids)
         for args in send_list:
             owner_email, organizer, msg, event_id = args
-            sent = self.send_msg(cursor, user, owner_email, organizer, msg,
-                    event_id, context=context)
+            sent = self.send_msg(owner_email, organizer, msg, event_id)
             vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
-            event_obj.write(cursor, user, event_id, vals,
-                    context=context)
+            event_obj.write(event_id, vals)
 
         return res
 
-    def create(self, cursor, user, values, context=None):
+    def create(self, values):
         event_obj = self.pool.get('calendar.event')
 
-        res_id = super(EventAttendee, self).create(cursor, user, values,
-                context=context)
-        if user == 0:
+        res_id = super(EventAttendee, self).create(values)
+        if Transaction().user == 0:
             # user is 0 means create is triggered by another one
             return res_id
 
-        attendee = self.browse(cursor, user, res_id, context=context)
+        attendee = self.browse(res_id)
 
         owner = attendee.event.calendar.owner
 
@@ -915,26 +852,20 @@ class EventAttendee(ModelSQL, ModelView):
         if not organizer:
             return res_id
 
-        ctx = context and context.copy() or {}
-        ctx['skip_schedule_agent'] = True
-        ical = event_obj.event2ical(cursor, user, attendee.event,
-                context=ctx)
+        with Transaction().set_context(skip_schedule_agent=True):
+            ical = event_obj.event2ical(attendee.event)
         if not hasattr(ical, 'method'):
             ical.add('method')
         ical.method.value = 'REPLY'
 
-        subject, body = self.subject_body(cursor, user, attendee.status,
-                attendee.event, owner, context=context)
-        msg = self.create_msg(cursor, user,
-                owner.email, organizer,
-                subject, body, ical, context=context)
+        subject, body = self.subject_body(attendee.status, attendee.event,
+                owner)
+        msg = self.create_msg(owner.email, organizer, subject, body, ical)
 
-        sent = self.send_msg(cursor, user,
-                owner.email, organizer, msg, attendee.event.id,
-                context=context)
+        sent = self.send_msg(owner.email, organizer, msg, attendee.event.id)
 
         vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
-        event_obj.write(cursor, user, attendee.event.id, vals, context=context)
+        event_obj.write(attendee.event.id, vals)
 
         return res_id
 
diff --git a/de_DE.csv b/de_DE.csv
index cdd6ef6..c1788af 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,9 +1,9 @@
 type,name,res_id,src,value,fuzzy
 error,calendar.event,0,    * ,    * ,0
+error,calendar.event,0,(No Subject),(Kein Betreff),0
 error,calendar.event,0,:,:,0
 error,calendar.event,0,Cancelled Event: %s @ %s,Abgesagter Termin: %s @ %s,0
 error,calendar.event,0,Invitation: %s @ %s,Einladung: %s @ %s,0
-error,calendar.event,0,(No Subject),(Kein Betreff),0
 error,calendar.event,0,"This event has been canceled.
 
 ","Dieser Termin wurde abgesagt.
@@ -22,8 +22,6 @@ error,calendar.event,0,"You have been invited to the following event.
 
 ",0
 error,calendar.event.attendee,0,    * ,    * ,0
-error,calendar.event.attendee,0,:,:,0
-error,calendar.event.attendee,0,(No Subject),(Kein Betreff),0
 error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
 
 ","%s (%s) hat den Teilnahmestatus geändert auf: %s
@@ -40,6 +38,8 @@ error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
 
 ",0
 error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
+error,calendar.event.attendee,0,(No Subject),(Kein Betreff),0
+error,calendar.event.attendee,0,:,:,0
 error,calendar.event.attendee,0,When,Wann,0
 field,"calendar.attendee,schedule_agent",0,Schedule Agent,Terminplaner Agent,0
 field,"calendar.attendee,schedule_status",0,Schedule Status,Terminplaner Status,0
diff --git a/fr_FR.csv b/fr_FR.csv
index ec94c87..c8f03bd 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,9 +1,9 @@
 type,name,res_id,src,value,fuzzy
 error,calendar.event,0,    * ,    *,0
+error,calendar.event,0,(No Subject),(Pas de sujet),0
 error,calendar.event,0,:,:,0
 error,calendar.event,0,Cancelled Event: %s @ %s,Événement annulé : %s @ %s,0
 error,calendar.event,0,Invitation: %s @ %s,Invitation: %s @ %s,0
-error,calendar.event,0,(No Subject),(Pas de sujet),0
 error,calendar.event,0,"This event has been canceled.
 
 ","Cet événement a été annulé.
@@ -22,8 +22,6 @@ error,calendar.event,0,"You have been invited to the following event.
 
 ",0
 error,calendar.event.attendee,0,    * ,    *,0
-error,calendar.event.attendee,0,:,:,0
-error,calendar.event.attendee,0,(No Subject),(Pas de sujet),0
 error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
 
 ","%s (%s) a un nouveau statut de participation : %s
@@ -37,6 +35,8 @@ error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
 ","%s (%s) a décliné l'invitation suivante :
 ",0
 error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
+error,calendar.event.attendee,0,(No Subject),(Pas de sujet),0
+error,calendar.event.attendee,0,:,:,0
 error,calendar.event.attendee,0,When,Quand,0
 field,"calendar.attendee,schedule_agent",0,Schedule Agent,Agent de planification,0
 field,"calendar.attendee,schedule_status",0,Schedule Status,Statut de planification,0
diff --git a/res.py b/res.py
index d15f88e..41641d0 100644
--- a/res.py
+++ b/res.py
@@ -15,20 +15,16 @@ class User(ModelSQL, ModelView):
     calendar_email_notification_partstat = fields.Boolean(
             'Invitation Replies')
 
-    def default_calendar_email_notification_new(self, cursor, user,
-            context=None):
+    def default_calendar_email_notification_new(self):
         return True
 
-    def default_calendar_email_notification_update(self, cursor, user,
-            context=None):
+    def default_calendar_email_notification_update(self):
         return True
 
-    def default_calendar_email_notification_cancel(self, cursor, user,
-            context=None):
+    def default_calendar_email_notification_cancel(self):
         return True
 
-    def default_calendar_email_notification_partstat(self, cursor, user,
-            context=None):
+    def default_calendar_email_notification_partstat(self):
         return True
 
     def __init__(self):
diff --git a/tests/test_calendar_scheduling.py b/tests/test_calendar_scheduling.py
index c8d5658..62ed49a 100644
--- a/tests/test_calendar_scheduling.py
+++ b/tests/test_calendar_scheduling.py
@@ -25,7 +25,7 @@ class CalendarSchedulingTestCase(unittest.TestCase):
         '''
         Test views.
         '''
-        self.assertRaises(Exception, test_view('calendar_scheduling'))
+        test_view('calendar_scheduling')
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
diff --git a/tests/test_calendar_scheduling.pyc b/tests/test_calendar_scheduling.pyc
index a485a9f..564710b 100644
Binary files a/tests/test_calendar_scheduling.pyc and b/tests/test_calendar_scheduling.pyc differ
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index b018573..b3c4147 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-scheduling
-Version: 1.6.0
+Version: 1.8.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 6cb424b..809b805 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,3 +1,3 @@
 PyWebDAV >= 0.9.3
-trytond_calendar >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_calendar >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit c642f127876fbc44fe37710e51de34d1ea6a11a2
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date:   Mon May 10 17:12:50 2010 +0200

    Adding upstream version 1.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index 0339153..634ce6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.6.0 - 2010-05-09
+* Bug fixes (see mercurial logs for details)
+
 Version 1.4.0 - 2009-12-22
 * Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a474ed..6e6811c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009 Cédric Krier.
-Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009 B2CK SPRL.
+Copyright (C) 2009-2010 Cédric Krier.
+Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2009-2010 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 65ff437..0417288 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond_calendar_scheduling
-Version: 1.4.0
+Version: 1.6.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 87059b2..8e73d5d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     'name_es_CO' : 'Planificador del calendario',
     'name_es_ES' : 'Planificador del calendario',
     'name_fr_FR' : 'Programmation calendrier',
-    'version' : '1.4.0',
+    'version' : '1.6.0',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index 4635383..f5c3ded 100644
--- a/calendar.py
+++ b/calendar.py
@@ -127,22 +127,20 @@ class Event(ModelSQL, ModelView):
             summary = self.raise_user_error(cursor, 'no_subject',
                     raise_exception=False, context=context)
 
-        date = lang_obj.strftime(event.dtstart.timetuple(), lang.code,
-                lang.date)
+        date = lang_obj.strftime(event.dtstart, lang.code, lang.date)
         if not event.all_day:
-            date += ' ' + lang_obj.strftime(event.dtstart.timetuple(),
-                    lang.code, '%H:%M')
+            date += ' ' + lang_obj.strftime(event.dtstart, lang.code, '%H:%M')
             if event.dtend:
                 date += ' -'
                 if event.dtstart.date() != event.dtend.date():
-                    date += ' ' + lang_obj.strftime(event.dtend.timetuple(),
-                            lang.code, lang.date)
-                date += ' ' + lang_obj.strftime(event.dtend.timetuple(),
-                        lang.code, '%H:%M')
+                    date += ' ' + lang_obj.strftime(event.dtend, lang.code,
+                            lang.date)
+                date += ' ' + lang_obj.strftime(event.dtend, lang.code,
+                        '%H:%M')
         else:
             if event.dtend and event.dtstart.date() != event.dtend.date():
-                date += ' - ' + lang_obj.strftime(event.dtend.timetuple(),
-                        lang.code, lang.date)
+                date += ' - ' + lang_obj.strftime(event.dtend, lang.code,
+                        lang.date)
         if event.timezone:
             date += ' ' + event.timezone
 
@@ -628,22 +626,20 @@ class EventAttendee(ModelSQL, ModelView):
             summary = self.raise_user_error(cursor, 'no_subject',
                     raise_exception=False, context=context)
 
-        date = lang_obj.strftime(event.dtstart.timetuple(), lang.code,
-                lang.date)
+        date = lang_obj.strftime(event.dtstart, lang.code, lang.date)
         if not event.all_day:
-            date += ' ' + lang_obj.strftime(event.dtstart.timetuple(),
-                    lang.code, '%H:%M')
+            date += ' ' + lang_obj.strftime(event.dtstart, lang.code, '%H:%M')
             if event.dtend:
                 date += ' -'
                 if event.dtstart.date() != event.dtend.date():
-                    date += ' ' + lang_obj.strftime(event.dtend.timetuple(),
-                            lang.code, lang.date)
-                date += ' ' + lang_obj.strftime(event.dtend.timetuple(),
-                        lang.code, '%H:%M')
+                    date += ' ' + lang_obj.strftime(event.dtend, lang.code,
+                            lang.date)
+                date += ' ' + lang_obj.strftime(event.dtend, lang.code,
+                        '%H:%M')
         else:
             if event.dtend and event.dtstart.date() != event.dtend.date():
-                date += ' - ' + lang_obj.strftime(event.dtend.timetuple(),
-                        lang.code, lang.date)
+                date += ' - ' + lang_obj.strftime(event.dtend, lang.code,
+                        lang.date)
         if event.timezone:
             date += ' ' + event.timezone
 
diff --git a/setup.py b/setup.py
index 552455e..656c768 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from setuptools import setup, find_packages
+from setuptools import setup
 import re
 
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
 
 requires = ['PyWebDAV >= 0.9.3']
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
-        requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+        requires.append('trytond_%s >= %s.%s, < %s.%s' %
+                (dep, major_version, minor_version, major_version,
+                    minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+        (major_version, minor_version, major_version, minor_version + 1))
 
 setup(name='trytond_calendar_scheduling',
     version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_calendar_scheduling',
     package_dir={'trytond.modules.calendar_scheduling': '.'},
     packages=[
         'trytond.modules.calendar_scheduling',
+        'trytond.modules.calendar_scheduling.tests',
     ],
     package_data={
         'trytond.modules.calendar_scheduling': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_calendar_scheduling',
     [trytond.modules]
     calendar_scheduling = trytond.modules.calendar_scheduling
     """,
+    test_suite='tests',
+    test_loader='trytond.test_loader:Loader',
 )
diff --git a/tests/__init__.py b/tests/__init__.py
index 3b67355..cedf3e4 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from test_calendar_scheduling import *
+from test_calendar_scheduling import suite
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
new file mode 100644
index 0000000..132d9e4
Binary files /dev/null and b/tests/__init__.pyc differ
diff --git a/tests/test_calendar_scheduling.py b/tests/test_calendar_scheduling.py
index 6fa0fba..c8d5658 100644
--- a/tests/test_calendar_scheduling.py
+++ b/tests/test_calendar_scheduling.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
 
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
 
 
 class CalendarSchedulingTestCase(unittest.TestCase):
@@ -28,12 +28,10 @@ class CalendarSchedulingTestCase(unittest.TestCase):
         self.assertRaises(Exception, test_view('calendar_scheduling'))
 
 def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(
-            CalendarSchedulingTestCase)
+    suite = trytond.tests.test_tryton.suite()
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+            CalendarSchedulingTestCase))
+    return suite
 
 if __name__ == '__main__':
-    suiteTrytond = trytond.tests.test_tryton.suite()
-    suiteCalendarScheduling = suite()
-    alltests = unittest.TestSuite([suiteTrytond, suiteCalendarScheduling])
-    unittest.TextTestRunner(verbosity=2).run(alltests)
-    SOCK.disconnect()
+    unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tests/test_calendar_scheduling.pyc b/tests/test_calendar_scheduling.pyc
new file mode 100644
index 0000000..a485a9f
Binary files /dev/null and b/tests/test_calendar_scheduling.pyc differ
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index 05ecd4f..b018573 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: trytond-calendar-scheduling
-Version: 1.4.0
+Version: 1.6.0
 Summary: Add Scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_calendar_scheduling.egg-info/SOURCES.txt b/trytond_calendar_scheduling.egg-info/SOURCES.txt
index 99ac396..468ac0e 100644
--- a/trytond_calendar_scheduling.egg-info/SOURCES.txt
+++ b/trytond_calendar_scheduling.egg-info/SOURCES.txt
@@ -15,8 +15,12 @@ setup.py
 ./caldav.py
 ./calendar.py
 ./res.py
+./tests/__init__.py
+./tests/test_calendar_scheduling.py
 tests/__init__.py
+tests/__init__.pyc
 tests/test_calendar_scheduling.py
+tests/test_calendar_scheduling.pyc
 trytond_calendar_scheduling.egg-info/PKG-INFO
 trytond_calendar_scheduling.egg-info/SOURCES.txt
 trytond_calendar_scheduling.egg-info/dependency_links.txt
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 4287e5f..6cb424b 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,4 +1,3 @@
 PyWebDAV >= 0.9.3
-trytond_calendar
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_calendar >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit f636e9f31e775668875cb6d06ad700a8145d1434
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Dec 22 17:28:46 2009 +0100

    Adding upstream version 1.4.0.

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..0339153
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-12-22
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..3a474ed
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2009 Cédric Krier.
+Copyright (C) 2009 Bertrand Chenal.
+Copyright (C) 2009 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..40e5120
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_calendar_scheduling
+======================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_calendar (http://www.tryton.org/)
+ * pywebdav 0.9.3 or later (http://sourceforge.net/projects/pywebdav/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_calendar_scheduling source
+release, enter the directory where the archive was unpacked, and run:
+
+    python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+  http://peak.telecommunity.com/DevCenter/EasyInstall
+  http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name calendar_scheduling.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..c61b52d
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,10 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..65ff437
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_calendar_scheduling
+Version: 1.4.0
+Summary: Add Scheduling support on CalDAV
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..fbe2204
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_calendar_scheduling
+===========================
+
+The calendar_scheduling module of the Tryton application platform.  See
+__tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+  http://bugs.tryton.org/
+  http://groups.tryton.org/
+  http://wiki.tryton.org/
+  irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+  http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..eca8f15
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,6 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import caldav
+from calendar import *
+from res import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..87059b2
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+    'name' : 'Calendar Scheduling',
+    'name_de_DE' : 'Kalender Terminplanung',
+    'name_es_CO' : 'Planificador del calendario',
+    'name_es_ES' : 'Planificador del calendario',
+    'name_fr_FR' : 'Programmation calendrier',
+    'version' : '1.4.0',
+    'author' : 'B2CK',
+    'email': 'info at b2ck.com',
+    'website': 'http://www.tryton.org/',
+    'description': 'Add Scheduling support on CalDAV',
+    'description_de_DE' : 'Fügt Unterstützung für die Terminplanung in CalDAV hinzu',
+    'description_es_CO' : 'Añade gestión de planificación de eventos a CalDAV',
+    'description_es_ES' : 'Añade la gestión de planificación de eventos a CalDAV',
+    'description_fr_FR': 'Ajoute la gestion de la programmation d\'évènements au CalDAV',
+    'depends' : [
+        'ir',
+        'res',
+        'webdav',
+        'calendar',
+    ],
+    'xml' : [
+        'res.xml',
+    ],
+    'translation': [
+        'de_DE.csv',
+        'es_ES.csv',
+        'es_CO.csv',
+        'fr_FR.csv',
+    ],
+}
diff --git a/caldav.py b/caldav.py
new file mode 100644
index 0000000..b57e8a6
--- /dev/null
+++ b/caldav.py
@@ -0,0 +1,8 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+_TRYTON_RELOAD = False
+
+from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
+
+DAV_VERSION_1['version'] += ',calendar-auto-schedule'
+DAV_VERSION_2['version'] += ',calendar-auto-schedule'
diff --git a/calendar.py b/calendar.py
new file mode 100644
index 0000000..4635383
--- /dev/null
+++ b/calendar.py
@@ -0,0 +1,945 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelSQL, ModelView, fields
+from trytond.tools import get_smtp_server
+from email.mime.text import MIMEText
+from email.mime.base import MIMEBase
+from email.mime.multipart import MIMEMultipart
+import email.utils
+import logging
+
+
+class Event(ModelSQL, ModelView):
+    _name = 'calendar.event'
+
+    organizer_schedule_status = fields.Selection([
+            ('', ''),
+            ('1.0', '1.0'),
+            ('1.1', '1.1'),
+            ('1.2', '1.2'),
+            ('3.7', '3.7'),
+            ('3.8', '3.8'),
+            ('5.1', '5.1'),
+            ('5.2', '5.2'),
+            ('5.3', '5.3'),
+            ], 'Schedule Status')
+    organizer_schedule_agent = fields.Selection([
+            ('', ''),
+            ('NONE', 'None'),
+            ('SERVER', 'Server'),
+            ('CLIENT', 'Client'),
+            ], 'Schedule Agent')
+
+    def default_schedule_agent(self, cursor, user, context=None):
+        return 'SERVER'
+
+    def __init__(self):
+        super(Event, self).__init__()
+        self._error_messages.update({
+            'new_subject': 'Invitation: %s @ %s',
+            'new_body': 'You have been invited to the following event.\n\n',
+            'update_subject': 'Updated Invitation: %s @ %s',
+            'update_body': 'This event has been changed.\n\n',
+            'cancel_subject': 'Cancelled Event: %s @ %s',
+            'cancel_body': 'This event has been canceled.\n\n',
+            'no_subject': "(No Subject)",
+            'separator': ':',
+            'bullet': '    * ',
+            'when': 'When',
+            })
+
+    def ical2values(self, cursor, user, event_id, ical, calendar_id,
+            vevent=None, context=None):
+        res = super(Event, self).ical2values(cursor, user, event_id, ical,
+                calendar_id, vevent=vevent, context=context)
+
+        if not vevent:
+            vevent = ical.vevent
+
+        if not hasattr(vevent, 'organizer'):
+            return res
+
+        for key in ('status', 'agent'):
+            field = 'organizer_schedule_' + key
+            param = 'SCHEDULE-' + key.upper()
+            if param in vevent.organizer.params and vevent.organizer[param] \
+                    in dict(self[field].selection):
+                res[field] = vevent.organizer[param]
+
+        return res
+
+    def event2ical(self, cursor, user, event, context=None):
+        """
+        Override default event2ical to add schedule-status and
+        schedule-agent properties
+
+        :param context: if key skip_schedule_agent is present and
+                associated to True, will prevent the schedule-status
+                to be add to the organiser property. This is needed
+                when one want to generate an ical that will be used
+                for scheduling message.
+        """
+
+        ical = super(Event, self).event2ical(cursor, user, event,
+                context=context)
+        if isinstance(event, (int, long)):
+            event = self.browse(cursor, user, event, context=context)
+
+        vevent = ical.vevent
+        context = context or {}
+
+        if event.organizer_schedule_status:
+            if not hasattr(vevent, 'organizer'):
+                vevent.add('organizer')
+            vevent.organizer.params['SCHEDULE-STATUS'] = \
+                (event.organizer_schedule_status,)
+
+        if context.get('skip_schedule_agent'):
+            return ical
+
+        if event.organizer_schedule_agent:
+            if not hasattr(vevent, 'organizer'):
+                vevent.add('organizer')
+            vevent.organizer.params['SCHEDULE-AGENT'] = \
+                event.organizer_schedule_agent
+
+        return ical
+
+    def subject_body(self, cursor, user, type, event, owner, context=None):
+        lang_obj = self.pool.get('ir.lang')
+
+        if context is None:
+            context = {}
+
+        if not (event and owner):
+            return "", ""
+        lang = owner.language
+        if not lang:
+            lang_ids = lang_obj.search(cursor, user, [
+                ('code', '=', 'en_US'),
+                ], limit=1, context=context)
+            lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
+        context = context.copy()
+        context['language'] = lang.code
+
+        summary = event.summary
+        if not summary:
+            summary = self.raise_user_error(cursor, 'no_subject',
+                    raise_exception=False, context=context)
+
+        date = lang_obj.strftime(event.dtstart.timetuple(), lang.code,
+                lang.date)
+        if not event.all_day:
+            date += ' ' + lang_obj.strftime(event.dtstart.timetuple(),
+                    lang.code, '%H:%M')
+            if event.dtend:
+                date += ' -'
+                if event.dtstart.date() != event.dtend.date():
+                    date += ' ' + lang_obj.strftime(event.dtend.timetuple(),
+                            lang.code, lang.date)
+                date += ' ' + lang_obj.strftime(event.dtend.timetuple(),
+                        lang.code, '%H:%M')
+        else:
+            if event.dtend and event.dtstart.date() != event.dtend.date():
+                date += ' - ' + lang_obj.strftime(event.dtend.timetuple(),
+                        lang.code, lang.date)
+        if event.timezone:
+            date += ' ' + event.timezone
+
+        subject = self.raise_user_error(cursor, type + '_subject',
+                (summary, date), raise_exception=False, context=context)
+        body = self.raise_user_error(cursor, type + '_body', (summary, ),
+                raise_exception=False, context=context)
+        separator = self.raise_user_error(cursor, 'separator',
+                raise_exception=False, context=context)
+        bullet = self.raise_user_error(cursor, 'bullet', raise_exception=False,
+                context=context)
+
+        fields_names = ['summary', 'dtstart', 'location', 'attendees']
+        if type == 'cancel':
+            fields_names.remove('attendees')
+        fields = self.fields_get(cursor, user, fields_names=fields_names,
+                context=context)
+        fields['dtstart']['string'] = self.raise_user_error(cursor,
+                'when', raise_exception=False, context=context)
+        for field in fields_names:
+            if field == 'attendees':
+                if lang.direction == 'ltr':
+                    body += fields['attendees']['string'] + separator + '\n'
+                    body += bullet + owner.email + '\n'
+                    for attendee in event.attendees:
+                        body += bullet + attendee.email + '\n'
+                else:
+                    body += separator + fields['attendees']['string'] + '\n'
+                    body += owner.email + bullet + '\n'
+                    for attendee in event.attendees:
+                        body += attendee.email + bullet + '\n'
+            elif event[field]:
+                if field == 'summary':
+                    value = summary
+                elif field == 'dtstart':
+                    value = date
+                elif field == 'location':
+                    value = event.location.name
+                else:
+                    value = event[field]
+                if lang.direction == 'ltr':
+                    body += fields[field]['string'] + separator + ' ' \
+                            + value + '\n'
+                else:
+                    body += value + ' ' + separator \
+                            + fields[field]['string'] + '\n'
+        return subject, body
+
+    def create_msg(self, cursor, user, from_addr, to_addrs, subject,
+            body, ical=None, context=None):
+
+        if not to_addrs:
+            return None
+
+        msg = MIMEMultipart()
+        msg['To'] = ', '.join(to_addrs)
+        msg['From'] = from_addr
+        msg['Subject'] = subject
+
+        inner = MIMEMultipart('alternative')
+
+        msg_body = MIMEBase('text', 'plain')
+        msg_body.set_payload(body.encode('UTF-8'), 'UTF-8')
+        inner.attach(msg_body)
+
+        attachment = MIMEBase('text', 'calendar')
+        attachment.set_payload(ical.serialize())
+        attachment.add_header('Content-Transfer-Encoding', 'quoted-printable',
+                charset='UTF-8',
+                method=ical.method.value.lower())
+        inner.attach(attachment)
+
+        msg.attach(inner)
+
+        attachment = MIMEBase('application', 'ics')
+        attachment.set_payload(ical.serialize(), 'UTF-8')
+        attachment.add_header('Content-Disposition', 'attachment',
+                filename='invite.ics', name='invite.ics')
+
+        msg.attach(attachment)
+
+        return msg
+
+    def send_msg(self, cursor, user_id, from_addr, to_addrs, msg,
+            type, event_id, context=None):
+        '''
+        Send message
+
+        :param cursor: the database cursor
+        :param user_id: the user id
+        :param from_addr: a from-address string
+        :param to_addrs: a list of to-address strings
+        :param msg: a message string
+        :param type: the type (new, update, cancel)
+        :param event_id: the id of the calendar.event
+        :param context: the context
+        :return: list of email addresses sent
+        '''
+        user_obj = self.pool.get('res.user')
+
+        if not to_addrs:
+            return to_addrs
+        to_addrs = list(set(to_addrs))
+
+        user_ids = user_obj.search(cursor, user_id, [
+            ('email', 'in', to_addrs),
+            ], context=context)
+        for user in user_obj.browse(cursor, user_id, user_ids, context=context):
+            if not user['calendar_email_notification_' + type]:
+                to_addrs.remove(user.email)
+
+        success = False
+        try:
+            server = get_smtp_server()
+            server.sendmail(from_addr, to_addrs, msg.as_string())
+            server.quit()
+            success = to_addrs
+        except:
+            logging.getLogger('calendar_scheduling').error(
+                    'Unable to deliver scheduling mail for event %s' % event_id)
+        return success
+
+    @staticmethod
+    def attendees_to_notify(event):
+        if not event.calendar.owner:
+            return [], None
+        attendees = event.attendees
+        organizer = event.organizer
+        owner = event.calendar.owner
+        if event.parent:
+            if not attendees:
+                attendees = event.parent.attendees
+                organizer = event.parent.organizer
+                owner = event.parent.calendar.owner
+            elif not organizer:
+                organizer = event.parent.organizer
+                owner = event.parent.calendar.owner
+
+        if organizer != owner.email:
+            return [], None
+
+        to_notify = []
+        for attendee in attendees:
+            if attendee.email == organizer:
+                continue
+            if attendee.schedule_agent and\
+                    attendee.schedule_agent != 'SERVER':
+                continue
+            to_notify.append(attendee)
+
+        return to_notify, owner
+
+    def create(self, cursor, user, values, context=None):
+        attendee_obj = self.pool.get('calendar.event.attendee')
+        res = super(Event, self).create(cursor, user, values, context=context)
+
+        if user == 0:
+            # user is 0 means create is triggered by another one
+            return res
+
+        event = self.browse(cursor, user, res, context=context)
+
+        to_notify, owner = self.attendees_to_notify(event)
+        if not to_notify:
+            return res
+
+        ctx = context and context.copy() or {}
+        ctx['skip_schedule_agent'] = True
+        ical = self.event2ical(cursor, user, event, context=ctx)
+        ical.add('method')
+        ical.method.value = 'REQUEST'
+
+        attendee_emails = [a.email for a in to_notify]
+
+        subject, body = self.subject_body(cursor, user, 'new', event, owner,
+                context=context)
+        msg = self.create_msg(cursor, user, owner.email, attendee_emails,
+                subject, body, ical, context=context)
+        sent = self.send_msg(cursor, user, owner.email,
+                attendee_emails, msg, 'new', event.id, context=context)
+
+        vals = {'status': 'needs-action'}
+        if sent:
+            vals['schedule_status'] = '1.1' #successfully sent
+        else:
+            vals['schedule_status'] = '5.1' #could not complete delivery
+        attendee_obj.write(cursor, user, [a.id for a in to_notify],
+                vals, context=context)
+
+        return res
+
+    def write(self, cursor, user, ids, values, context=None):
+        attendee_obj = self.pool.get('calendar.event.attendee')
+
+        if user == 0:
+            # user is 0 means write is triggered by another one
+            return super(Event, self).write(cursor, user, ids, values,
+                context=context)
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if not values or not ids:
+            return super(Event, self).write(cursor, user, ids, values,
+                    context=context)
+
+        event_edited = False
+        for k in values:
+            if k != 'attendees':
+                event_edited = True
+                break
+
+        # store old attendee info
+        events = self.browse(cursor, user, ids, context=context)
+        event2former_emails = {}
+        former_organiser_mail = {}
+        former_organiser_lang = {}
+        for event in events:
+            to_notify, owner = self.attendees_to_notify(event)
+            event2former_emails[event.id] = [a.email for a in to_notify]
+            former_organiser_mail[event.id] = owner and owner.email
+            former_organiser_lang[event.id] = owner and owner.language \
+                and owner.language.code
+
+        res = super(Event, self).write(cursor, user, ids, values,
+                context=context)
+
+        events = self.browse(cursor, user, ids, context=context)
+
+        for event in events:
+            current_attendees, owner = self.attendees_to_notify(event)
+            owner_email = owner and owner.email
+            current_emails = [a.email for a in current_attendees]
+            former_emails = event2former_emails.get(event.id, [])
+            missing_mails = filter(lambda mail: mail not in current_emails,
+                    former_emails)
+
+            if missing_mails:
+                ctx = context and context.copy() or {}
+                ctx['skip_schedule_agent'] = True
+                ical = self.event2ical(cursor, user, event, context=ctx)
+                ical.add('method')
+                ical.method.value = 'CANCEL'
+
+                subject, body = self.subject_body(cursor, user, 'cancel', event,
+                        owner, context=context)
+                msg = self.create_msg(cursor, user,
+                        former_organiser_mail[event.id], missing_mails, subject,
+                        body, ical, context=context)
+                sent = self.send_msg(cursor, user,
+                        former_organiser_mail[event.id], missing_mails, msg,
+                        'cancel', event.id, context=context)
+
+            new_attendees = filter(lambda a: a.email not in former_emails,
+                current_attendees)
+            old_attendees = filter(lambda a: a.email in former_emails,
+                current_attendees)
+            ctx = context and context.copy() or {}
+            ctx['skip_schedule_agent'] = True
+            ical = self.event2ical(cursor, user, event, context=ctx)
+            if not hasattr(ical, 'method'):
+                ical.add('method')
+
+            sent_succes = []
+            sent_fail = []
+            if event_edited:
+                if event.status == 'cancelled':
+                    ical.method.value = 'CANCEL'
+                    #send cancel to old attendee
+                    subject, body = self.subject_body(cursor, user, 'cancel',
+                            event, owner, context=context)
+                    msg = self.create_msg(cursor, user,
+                            owner_email, [a.email for a in old_attendees],
+                            subject, body, ical, context=context)
+                    sent = self.send_msg(cursor, user,
+                            owner_email, [a.email for a in old_attendees], msg,
+                            'cancel', event.id, context=context)
+                    if sent:
+                        sent_succes += old_attendees
+                    else:
+                        sent_fail += old_attendees
+
+                else:
+                    ical.method.value = 'REQUEST'
+                    #send update to old attendees
+                    subject, body = self.subject_body(cursor, user, 'update',
+                            event, owner, context=context)
+                    msg = self.create_msg(cursor, user,
+                            owner_email, [a.email for a in old_attendees],
+                            subject, body, ical, context=context)
+                    sent = self.send_msg(cursor, user,
+                            owner_email, [a.email for a in old_attendees], msg,
+                            'update', event.id, context=context)
+                    if sent:
+                        sent_succes += old_attendees
+                    else:
+                        sent_fail += old_attendees
+                    #send new to new attendees
+                    subject, body = self.subject_body(cursor, user, 'new',
+                            event, owner, context=context)
+                    msg = self.create_msg(cursor, user,
+                            owner_email, [a.email for a in new_attendees],
+                            subject, body, ical, context=context)
+                    sent = self.send_msg(cursor, user,
+                            owner_email, [a.email for a in new_attendees], msg,
+                            'new', event.id, context=context)
+                    if sent:
+                        sent_succes += new_attendees
+                    else:
+                        sent_fail += new_attendees
+
+            else:
+                if event.status != 'cancelled':
+                    ical.method.value = 'REQUEST'
+                    #send new to new attendees
+                    subject, body = self.subject_body(cursor, user, 'new',
+                            event, owner, context=context)
+                    msg = self.create_msg(cursor, user,
+                            owner_email, [a.email for a in new_attendees],
+                            subject, body, ical, context=context)
+                    sent = self.send_msg(cursor, user,
+                            owner_email, [a.email for a in new_attendees], msg,
+                            'new', event.id, context=context)
+                    if sent:
+                        sent_succes += new_attendees
+                    else:
+                        sent_fail += new_attendees
+
+                vals = {'status': 'needs-action'}
+                vals['schedule_status'] = '1.1' #successfully sent
+                attendee_obj.write(cursor, user,
+                        [a.id for a in sent_succes], vals, context=context)
+                vals['schedule_status'] = '5.1' #could not complete delivery
+                attendee_obj.write(cursor, user,
+                        [a.id for a in sent_fail], vals, context=context)
+        return res
+
+    def delete(self, cursor, user, ids, context=None):
+        if user == 0:
+            # user is 0 means the deletion is triggered by another one
+            return super(Event, self).delete(cursor, user, ids, context=context)
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        events = self.browse(cursor, user, ids, context=context)
+        send_list = []
+        for event in events:
+            if event.status == 'cancelled':
+                continue
+            to_notify, owner = self.attendees_to_notify(event)
+            if not to_notify:
+                continue
+
+            ctx = context and context.copy() or {}
+            ctx['skip_schedule_agent'] = True
+            ical = self.event2ical(cursor, user, event, context=ctx)
+            ical.add('method')
+            ical.method.value = 'CANCEL'
+
+            attendee_emails = [a.email for a in to_notify]
+            subject, body = self.subject_body(cursor, user, 'cancel',
+                    event, owner, context=context)
+            msg = self.create_msg(cursor, user, owner.email, attendee_emails,
+                    subject, body, ical, context=context)
+
+            send_list.append((owner.email, attendee_emails, msg, event.id,))
+
+        res = super(Event, self).delete(cursor, user, ids, context=context)
+        for args in send_list:
+            owner_email, attendee_emails, msg, event_id = args
+            self.send_msg(cursor, user, owner_email, attendee_emails, msg,
+                    'cancel', event_id, context=context)
+        return res
+
+Event()
+
+
+class Attendee(ModelSQL, ModelView):
+    _name = 'calendar.attendee'
+
+    schedule_status = fields.Selection([
+            ('', ''),
+            ('1.0', '1.0'),
+            ('1.1', '1.1'),
+            ('1.2', '1.2'),
+            ('3.7', '3.7'),
+            ('3.8', '3.8'),
+            ('5.1', '5.1'),
+            ('5.2', '5.2'),
+            ('5.3', '5.3'),
+            ], 'Schedule Status')
+    schedule_agent = fields.Selection([
+            ('', ''),
+            ('NONE', 'None'),
+            ('SERVER', 'Server'),
+            ('CLIENT', 'Client'),
+            ], 'Schedule Agent')
+
+    def default_schedule_agent(self, cursor, user, context=None):
+        return 'SERVER'
+
+    def attendee2values(self, cursor, user, attendee, context=None):
+        res = super(Attendee, self).attendee2values(cursor, user, attendee,
+                context=context)
+        if hasattr(attendee, 'schedule_status'):
+            if attendee.schedule_status in dict(self.schedule_status.selection):
+                res['schedule_status'] = attendee.schedule_status
+        if hasattr(attendee, 'schedule_agent'):
+            if attendee.schedule_agent in dict(self.schedule_agent.selection):
+                res['schedule_agent'] = attendee.schedule_agent
+        return res
+
+    def attendee2attendee(self, cursor, user, attendee, context=None):
+        res = super(Attendee, self).attendee2attendee(cursor, user, attendee,
+                context=context)
+
+        context = context or {}
+
+        if attendee.schedule_status:
+            if hasattr(res, 'schedule_status_param'):
+                if res.schedule_status_param in dict(self.schedule_status.selection):
+                    res.schedule_status_param = attendee.schedule_status
+            else:
+                res.schedule_status_param = attendee.schedule_status
+        elif hasattr(res, 'schedule_status_param'):
+            if res.schedule_status_param in dict(self.schedule_status.selection):
+                del res.schedule_status_param
+
+        if context.get('skip_schedule_agent'):
+            return res
+
+        if attendee.schedule_agent:
+            if hasattr(res, 'schedule_agent_param'):
+                if res.schedule_agent_param in dict(self.schedule_agent.selection):
+                    res.schedule_agent_param = attendee.schedule_agent
+            else:
+                res.schedule_agent_param = attendee.schedule_agent
+        elif hasattr(res, 'schedule_agent_param'):
+            if res.schedule_agent_param in dict(self.schedule_agent.selection):
+                del res.schedule_agent_param
+
+        return res
+
+Attendee()
+
+
+class EventAttendee(ModelSQL, ModelView):
+    _name = 'calendar.event.attendee'
+
+    def __init__(self):
+        super(EventAttendee, self).__init__()
+        self._error_messages.update({
+                'subject': '%s: %s @ %s',
+                'body': '%s (%s) changed his/her participation status to: %s\n\n',
+                'accepted_body': '%s (%s) has accepted this invitation:\n\n',
+                'declined_body': '%s (%s) has declined this invitattion:\n\n',
+                'no_subject': "(No Subject)",
+                'separator': ':',
+                'bullet': '    * ',
+                'when': 'When',
+                })
+
+    def subject_body(self, cursor, user, status, event, owner, context=None):
+        lang_obj = self.pool.get('ir.lang')
+        event_obj = self.pool.get('calendar.event')
+        if context is None:
+            context = {}
+
+        if not (event and owner):
+            return "", ""
+        lang = owner.language
+        if not lang:
+            lang_ids = lang_obj.search(cursor, user, [
+                ('code', '=', 'en_US'),
+                ], limit=1, context=context)
+            lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
+        context = context.copy()
+        context['language'] = lang.code
+
+        summary = event.summary
+        if not summary:
+            summary = self.raise_user_error(cursor, 'no_subject',
+                    raise_exception=False, context=context)
+
+        date = lang_obj.strftime(event.dtstart.timetuple(), lang.code,
+                lang.date)
+        if not event.all_day:
+            date += ' ' + lang_obj.strftime(event.dtstart.timetuple(),
+                    lang.code, '%H:%M')
+            if event.dtend:
+                date += ' -'
+                if event.dtstart.date() != event.dtend.date():
+                    date += ' ' + lang_obj.strftime(event.dtend.timetuple(),
+                            lang.code, lang.date)
+                date += ' ' + lang_obj.strftime(event.dtend.timetuple(),
+                        lang.code, '%H:%M')
+        else:
+            if event.dtend and event.dtstart.date() != event.dtend.date():
+                date += ' - ' + lang_obj.strftime(event.dtend.timetuple(),
+                        lang.code, lang.date)
+        if event.timezone:
+            date += ' ' + event.timezone
+
+        status_string = status
+        fields_names = ['status']
+        fields = self.fields_get(cursor, user, fields_names=fields_names,
+                context=context)
+        for k,v in  fields['status']['selection']:
+            if k == status:
+                status_string = v
+
+        subject = self.raise_user_error(cursor, 'subject',
+                (status, summary, date), raise_exception=False,
+                context=context)
+
+        if status + '_body' in self._error_messages:
+            body = self.raise_user_error(cursor, status + '_body',
+                    (owner.name, owner.email), raise_exception=False,
+                    context=context)
+        else:
+            body = self.raise_user_error(cursor, 'body',
+                (owner.name, owner.email, status_string ), raise_exception=False,
+                context=context)
+
+        separator = self.raise_user_error(cursor, 'separator',
+                raise_exception=False, context=context)
+        bullet = self.raise_user_error(cursor, 'bullet', raise_exception=False,
+                context=context)
+
+        fields_names = ['summary', 'dtstart', 'location', 'attendees']
+        fields = event_obj.fields_get(cursor, user, fields_names=fields_names,
+                context=context)
+        fields['dtstart']['string'] = self.raise_user_error(cursor,
+                'when', raise_exception=False, context=context)
+        for field in fields_names:
+            if field == 'attendees':
+                organizer = event.organizer or event.parent.organizer
+                if lang.direction == 'ltr':
+                    body += fields['attendees']['string'] + separator + '\n'
+                    if organizer:
+                        body += bullet + organizer + '\n'
+                    for attendee in event.attendees:
+                        body += bullet + attendee.email + '\n'
+                else:
+                    body += separator + fields['attendees']['string'] + '\n'
+                    if organizer:
+                        body += owner.email + bullet + '\n'
+                    for attendee in event.attendees:
+                        body += attendee.email + bullet + '\n'
+            elif event[field]:
+                if field == 'summary':
+                    value = summary
+                elif field == 'dtstart':
+                    value = date
+                elif field == 'location':
+                    value = event.location.name
+                else:
+                    value = event[field]
+                if lang.direction == 'ltr':
+                    body += fields[field]['string'] + separator + ' ' \
+                            + value + '\n'
+                else:
+                    body += value + ' ' + separator \
+                            + fields[field]['string'] + '\n'
+        return subject, body
+
+    def create_msg(self, cursor, user, from_addr, to_addr, subject,
+            body, ical=None, context=None):
+
+        if not to_addr:
+            return None
+
+        msg = MIMEMultipart()
+        msg['To'] = to_addr
+        msg['From'] = from_addr
+        msg['Subject'] = subject
+
+        inner = MIMEMultipart('alternative')
+
+        msg_body = MIMEBase('text', 'plain')
+        msg_body.set_payload(body.encode('UTF-8'), 'UTF-8')
+        inner.attach(msg_body)
+
+        attachment = MIMEBase('text', 'calendar')
+        attachment.set_payload(ical.serialize())
+        attachment.add_header('Content-Transfer-Encoding', 'quoted-printable',
+                charset='UTF-8',
+                method=ical.method.value.lower())
+        inner.attach(attachment)
+
+        msg.attach(inner)
+        attachment = MIMEBase('application', 'ics')
+        attachment.set_payload(ical.serialize(), 'UTF-8')
+        attachment.add_header('Content-Disposition', 'attachment',
+                filename='invite.ics', name='invite.ics')
+
+        msg.attach(attachment)
+
+        return msg
+
+    def send_msg(self, cursor, user_id, from_addr, to_addr, msg,
+            event, context=None):
+        '''
+        Send message
+
+        :param cursor: the database cursor
+        :param user_id: the user id
+        :param from_addr: a from-address string
+        :param to_addr: recipient address
+        :param msg: a message string
+        :param event_id: the id of the calendar.event
+        :param context: the context
+        :return: a boolean (True if the mail has been sent)
+        '''
+        success = False
+        try:
+            server = get_smtp_server()
+            server.sendmail(from_addr, to_addr, msg.as_string())
+            server.quit()
+            success = True
+        except:
+            logging.getLogger('calendar_scheduling').error(
+                    'Unable to deliver reply mail for event %s' % event_id)
+        return success
+
+    @staticmethod
+    def organiser_to_notify(attendee):
+        event = attendee.event
+        organizer = event.organizer or event.parent.organizer
+        if not organizer:
+            return None
+        if event.organizer_schedule_agent \
+                and event.organizer_schedule_agent != 'SERVER':
+            return None
+        if organizer == event.calendar.owner.email:
+            return None
+        if attendee.email != event.calendar.owner.email:
+            return None
+
+        return organizer
+
+    def write(self, cursor, user, ids, values, context=None):
+        event_obj = self.pool.get('calendar.event')
+
+        if user == 0:
+            # user is 0 means write is triggered by another one
+            return super(EventAttendee, self).write(cursor, user, ids, values,
+                    context=context)
+
+        if 'status' not in values:
+            return super(EventAttendee, self).write(cursor, user, ids, values,
+                    context=context)
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        att2status = {}
+        attendees = self.browse(cursor, user, ids, context=context)
+        for attendee in attendees:
+            att2status[attendee.id] = attendee.status
+
+        res = super(EventAttendee, self).write(cursor, user, ids, values,
+                    context=context)
+
+        attendees = self.browse(cursor, user, ids, context=context)
+        for attendee in attendees:
+            owner = attendee.event.calendar.owner
+            if not owner.calendar_email_notification_partstat:
+                continue
+            organizer = self.organiser_to_notify(attendee)
+            if not organizer:
+                continue
+
+            old, new = (att2status.get(attendee.id) or 'needs-action',
+                        attendee.status or 'needs-action')
+
+            if old == new:
+                continue
+
+            ctx = context and context.copy() or {}
+            ctx['skip_schedule_agent'] = True
+            ical = event_obj.event2ical(cursor, user, attendee.event,
+                    context=ctx)
+            if not hasattr(ical, 'method'):
+                ical.add('method')
+            ical.method.value = 'REPLY'
+
+            subject, body = self.subject_body(cursor, user, new,
+                    attendee.event, owner, context=context)
+            msg = self.create_msg(cursor, user,
+                    owner.email, organizer,
+                    subject, body, ical, context=context)
+
+            sent = self.send_msg(cursor, user,
+                    owner.email, organizer, msg, attendee.event.id,
+                    context=context)
+
+            vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
+            event_obj.write(cursor, user, attendee.event.id, vals,
+                    context=context)
+
+        return res
+
+    def delete(self, cursor, user, ids, context=None):
+        event_obj = self.pool.get('calendar.event')
+
+        if user == 0:
+            # user is 0 means the deletion is triggered by another one
+            return super(EventAttendee, self).delete(cursor, user, ids,
+                    context=context)
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        attendees = self.browse(cursor, user, ids, context=context)
+        send_list = []
+        for attendee in attendees:
+            owner = attendee.event.calendar.owner
+
+            if attendee.status == 'declined':
+                continue
+            if not owner.calendar_email_notification_partstat:
+                continue
+            organizer = self.organiser_to_notify(attendee)
+            if not organizer:
+                continue
+
+            ctx = context and context.copy() or {}
+            ctx['skip_schedule_agent'] = True
+            ical = event_obj.event2ical(cursor, user, attendee.event,
+                    context=ctx)
+            if not hasattr(ical, 'method'):
+                ical.add('method')
+            ical.method.value = 'REPLY'
+
+            subject, body = self.subject_body(cursor, user, 'declined',
+                    attendee.event, owner, context=context)
+            msg = self.create_msg(cursor, user, owner.email, organizer,
+                    subject, body, ical, context=context)
+
+            send_list.append((owner.email, organizer, msg, attendee.event.id))
+
+
+        res = super(EventAttendee, self).delete(cursor, user, ids,
+                context=context)
+        for args in send_list:
+            owner_email, organizer, msg, event_id = args
+            sent = self.send_msg(cursor, user, owner_email, organizer, msg,
+                    event_id, context=context)
+            vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
+            event_obj.write(cursor, user, event_id, vals,
+                    context=context)
+
+        return res
+
+    def create(self, cursor, user, values, context=None):
+        event_obj = self.pool.get('calendar.event')
+
+        res_id = super(EventAttendee, self).create(cursor, user, values,
+                context=context)
+        if user == 0:
+            # user is 0 means create is triggered by another one
+            return res_id
+
+        attendee = self.browse(cursor, user, res_id, context=context)
+
+        owner = attendee.event.calendar.owner
+
+        if (not attendee.status) or attendee.status in ('', 'needs-action'):
+            return res_id
+        if not owner.calendar_email_notification_partstat:
+            return res_id
+        organizer = self.organiser_to_notify(attendee)
+        if not organizer:
+            return res_id
+
+        ctx = context and context.copy() or {}
+        ctx['skip_schedule_agent'] = True
+        ical = event_obj.event2ical(cursor, user, attendee.event,
+                context=ctx)
+        if not hasattr(ical, 'method'):
+            ical.add('method')
+        ical.method.value = 'REPLY'
+
+        subject, body = self.subject_body(cursor, user, attendee.status,
+                attendee.event, owner, context=context)
+        msg = self.create_msg(cursor, user,
+                owner.email, organizer,
+                subject, body, ical, context=context)
+
+        sent = self.send_msg(cursor, user,
+                owner.email, organizer, msg, attendee.event.id,
+                context=context)
+
+        vals = {'organizer_schedule_status': sent and '1.1' or '5.1'}
+        event_obj.write(cursor, user, attendee.event.id, vals, context=context)
+
+        return res_id
+
+EventAttendee()
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..cdd6ef6
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,79 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,    * ,    * ,0
+error,calendar.event,0,:,:,0
+error,calendar.event,0,Cancelled Event: %s @ %s,Abgesagter Termin: %s @ %s,0
+error,calendar.event,0,Invitation: %s @ %s,Einladung: %s @ %s,0
+error,calendar.event,0,(No Subject),(Kein Betreff),0
+error,calendar.event,0,"This event has been canceled.
+
+","Dieser Termin wurde abgesagt.
+
+",0
+error,calendar.event,0,"This event has been changed.
+
+","Dieser Termin wurde geändert.
+
+",0
+error,calendar.event,0,Updated Invitation: %s @ %s,Aktualisierte Einladung: %s @ %s,0
+error,calendar.event,0,When,Wann,0
+error,calendar.event,0,"You have been invited to the following event.
+
+","Sie wurden zu dem folgendem Termin eingeladen:
+
+",0
+error,calendar.event.attendee,0,    * ,    * ,0
+error,calendar.event.attendee,0,:,:,0
+error,calendar.event.attendee,0,(No Subject),(Kein Betreff),0
+error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
+
+","%s (%s) hat den Teilnahmestatus geändert auf: %s
+
+",0
+error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
+
+","%s (%s) hat folgende Einladung angenommen:
+
+",0
+error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
+
+","%s (%s) hat folgende Einladung abgesagt:
+
+",0
+error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
+error,calendar.event.attendee,0,When,Wann,0
+field,"calendar.attendee,schedule_agent",0,Schedule Agent,Terminplaner Agent,0
+field,"calendar.attendee,schedule_status",0,Schedule Status,Terminplaner Status,0
+field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Terminplaner Agent,0
+field,"calendar.event,organizer_schedule_status",0,Schedule Status,Terminplaner Status,0
+field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Absagen von Einladungen,0
+field,"res.user,calendar_email_notification_new",0,New invitations,Neue Einladungen,0
+field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Antworten auf Einladungen,0
+field,"res.user,calendar_email_notification_update",0,Changed invitations,Änderungen von Einladungen,0
+selection,"calendar.attendee,schedule_agent",0,,,0
+selection,"calendar.attendee,schedule_agent",0,Client,Client,0
+selection,"calendar.attendee,schedule_agent",0,None,Keiner,0
+selection,"calendar.attendee,schedule_agent",0,Server,Server,0
+selection,"calendar.attendee,schedule_status",0,,,0
+selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
+selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
+selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
+selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
+selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
+selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
+selection,"calendar.attendee,schedule_status",0,5.2,5.2,0
+selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
+selection,"calendar.event,organizer_schedule_agent",0,,,0
+selection,"calendar.event,organizer_schedule_agent",0,Client,Client,0
+selection,"calendar.event,organizer_schedule_agent",0,None,Keiner,0
+selection,"calendar.event,organizer_schedule_agent",0,Server,Server,0
+selection,"calendar.event,organizer_schedule_status",0,,,0
+selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
+selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
+selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
+selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
+selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
+selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
+selection,"calendar.event,organizer_schedule_status",0,5.2,5.2,0
+selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
+view,res.user,0,Calendar Email Notifications,Kalender E-Mail Benachrichtigungen,0
+view,res.user,0,Notifications,Benachrichtigungen,0
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..a0159ae
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,67 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,    * ,    * ,0
+error,calendar.event,0,(No Subject),(Sin Asunto),0
+error,calendar.event,0,:,:,0
+error,calendar.event,0,Cancelled Event: %s @ %s,Evento Cancelado: %s @ %s,0
+error,calendar.event,0,Invitation: %s @ %s,Invitación: %s @ %s,0
+error,calendar.event,0,"This event has been canceled.
+
+",Este evento se canceló.,0
+error,calendar.event,0,"This event has been changed.
+
+",Este evento cambió.,0
+error,calendar.event,0,Updated Invitation: %s @ %s,Invitación actualizada: %s @ %s,0
+error,calendar.event,0,When,Cuando,0
+error,calendar.event,0,"You have been invited to the following event.
+
+",Usted fue invitado al siguiente evento.,0
+error,calendar.event.attendee,0,    * ,    * ,0
+error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
+
+",%s (%s) cambió su estado de participación,0
+error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
+
+",%s (%s) ha aceptado esta invitación:,0
+error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
+
+",%s (%s) rechazó esta invitación:,0
+error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
+error,calendar.event.attendee,0,(No Subject),(Sin Asunto),0
+error,calendar.event.attendee,0,:,:,0
+error,calendar.event.attendee,0,When,Cuando,0
+field,"calendar.attendee,schedule_agent",0,Schedule Agent,Agente de programación,0
+field,"calendar.attendee,schedule_status",0,Schedule Status,Estado de Programación,0
+field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Agente de Programación,0
+field,"calendar.event,organizer_schedule_status",0,Schedule Status,Estado de programación,0
+field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Invitaciones canceladas,0
+field,"res.user,calendar_email_notification_new",0,New invitations,Nuevas invitaciones,0
+field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Invitaciones Contestadas,0
+field,"res.user,calendar_email_notification_update",0,Changed invitations,Invitaciones Cambiadas,0
+selection,"calendar.attendee,schedule_agent",0,,,0
+selection,"calendar.attendee,schedule_agent",0,Client,Cliente,0
+selection,"calendar.attendee,schedule_agent",0,None,Ninguno,0
+selection,"calendar.attendee,schedule_agent",0,Server,Servidor,0
+selection,"calendar.attendee,schedule_status",0,,,0
+selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
+selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
+selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
+selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
+selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
+selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
+selection,"calendar.attendee,schedule_status",0,5.2,5.2,0
+selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
+selection,"calendar.event,organizer_schedule_agent",0,,,0
+selection,"calendar.event,organizer_schedule_agent",0,Client,Cliente,0
+selection,"calendar.event,organizer_schedule_agent",0,None,Ninguna,0
+selection,"calendar.event,organizer_schedule_agent",0,Server,Servidor,0
+selection,"calendar.event,organizer_schedule_status",0,,,0
+selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
+selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
+selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
+selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
+selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
+selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
+selection,"calendar.event,organizer_schedule_status",0,5.2,5.2,0
+selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
+view,res.user,0,Calendar Email Notifications,Notificaciones de Calendario por Email,0
+view,res.user,0,Notifications,Notificaciones,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..3961d72
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,69 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,    * ,    * ,0
+error,calendar.event,0,:,:,0
+error,calendar.event,0,Cancelled Event: %s @ %s,Evento cancelado: %s @ %s,0
+error,calendar.event,0,Invitation: %s @ %s,Invitación: %s @ %s,0
+error,calendar.event,0,(No Subject),(Sin asunto),0
+error,calendar.event,0,"This event has been canceled.
+
+",Este evento ha sido cancelado.,0
+error,calendar.event,0,"This event has been changed.
+
+",Este evento ha cambiado.,0
+error,calendar.event,0,Updated Invitation: %s @ %s,Invitación actualizada: %s @ %s,0
+error,calendar.event,0,When,Cuando,0
+error,calendar.event,0,"You have been invited to the following event.
+
+",Ha sido invitado al siguiente evento.,0
+error,calendar.event.attendee,0,    * ,    * ,0
+error,calendar.event.attendee,0,:,:,0
+error,calendar.event.attendee,0,(No Subject),(Sin asunto),0
+error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
+
+","%s (%s) cambió el estado de su participación a: %s
+
+",0
+error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
+
+",%s (%s) ha aceptado esta invitación:,0
+error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
+
+",%s (%s) ha declinado esta invitación:,0
+error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
+error,calendar.event.attendee,0,When,Cuando,0
+field,"calendar.attendee,schedule_agent",0,Schedule Agent,Agente del planificador,0
+field,"calendar.attendee,schedule_status",0,Schedule Status,Estado de la planificación,0
+field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Agente del planificador,0
+field,"calendar.event,organizer_schedule_status",0,Schedule Status,Estado de la planificación,0
+field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Invitaciones canceladas,0
+field,"res.user,calendar_email_notification_new",0,New invitations,Nuevas invitaciones,0
+field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Respuestas a las invitaciones,0
+field,"res.user,calendar_email_notification_update",0,Changed invitations,Invitaciones cambiadas,0
+selection,"calendar.attendee,schedule_agent",0,,,0
+selection,"calendar.attendee,schedule_agent",0,Client,Cliente,0
+selection,"calendar.attendee,schedule_agent",0,None,Ninguno,0
+selection,"calendar.attendee,schedule_agent",0,Server,Servidor,0
+selection,"calendar.attendee,schedule_status",0,,,0
+selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
+selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
+selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
+selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
+selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
+selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
+selection,"calendar.attendee,schedule_status",0,5.2,5.2,0
+selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
+selection,"calendar.event,organizer_schedule_agent",0,,,0
+selection,"calendar.event,organizer_schedule_agent",0,Client,Cliente,0
+selection,"calendar.event,organizer_schedule_agent",0,None,Ninguno,0
+selection,"calendar.event,organizer_schedule_agent",0,Server,Servidor,0
+selection,"calendar.event,organizer_schedule_status",0,,,0
+selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
+selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
+selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
+selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
+selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
+selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
+selection,"calendar.event,organizer_schedule_status",0,5.2,5.2,0
+selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
+view,res.user,0,Calendar Email Notifications,Notificaciones por correo electrónico del calendario,0
+view,res.user,0,Notifications,Notificaciones,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..ec94c87
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,76 @@
+type,name,res_id,src,value,fuzzy
+error,calendar.event,0,    * ,    *,0
+error,calendar.event,0,:,:,0
+error,calendar.event,0,Cancelled Event: %s @ %s,Événement annulé : %s @ %s,0
+error,calendar.event,0,Invitation: %s @ %s,Invitation: %s @ %s,0
+error,calendar.event,0,(No Subject),(Pas de sujet),0
+error,calendar.event,0,"This event has been canceled.
+
+","Cet événement a été annulé.
+
+",0
+error,calendar.event,0,"This event has been changed.
+
+","Cet événement a été modifié.
+
+",0
+error,calendar.event,0,Updated Invitation: %s @ %s,Invitation mise à jour : %s @ %s,0
+error,calendar.event,0,When,Quand,0
+error,calendar.event,0,"You have been invited to the following event.
+
+","Vous avez été invité à l'événement suivant.
+
+",0
+error,calendar.event.attendee,0,    * ,    *,0
+error,calendar.event.attendee,0,:,:,0
+error,calendar.event.attendee,0,(No Subject),(Pas de sujet),0
+error,calendar.event.attendee,0,"%s (%s) changed his/her participation status to: %s
+
+","%s (%s) a un nouveau statut de participation : %s
+",0
+error,calendar.event.attendee,0,"%s (%s) has accepted this invitation:
+
+","%s (%s) a accepté l'invitation suivante :
+",0
+error,calendar.event.attendee,0,"%s (%s) has declined this invitattion:
+
+","%s (%s) a décliné l'invitation suivante :
+",0
+error,calendar.event.attendee,0,%s: %s @ %s,%s: %s @ %s,0
+error,calendar.event.attendee,0,When,Quand,0
+field,"calendar.attendee,schedule_agent",0,Schedule Agent,Agent de planification,0
+field,"calendar.attendee,schedule_status",0,Schedule Status,Statut de planification,0
+field,"calendar.event,organizer_schedule_agent",0,Schedule Agent,Agent de planification,0
+field,"calendar.event,organizer_schedule_status",0,Schedule Status,Statut de planification,0
+field,"res.user,calendar_email_notification_cancel",0,Cancelled invitations,Invitations annulées,0
+field,"res.user,calendar_email_notification_new",0,New invitations,Nouvelles invitations,0
+field,"res.user,calendar_email_notification_partstat",0,Invitation Replies,Réponses aux invitations,0
+field,"res.user,calendar_email_notification_update",0,Changed invitations,Modification des invitations,0
+selection,"calendar.attendee,schedule_agent",0,,,0
+selection,"calendar.attendee,schedule_agent",0,Client,Client,0
+selection,"calendar.attendee,schedule_agent",0,None,Aucun,0
+selection,"calendar.attendee,schedule_agent",0,Server,Serveur,0
+selection,"calendar.attendee,schedule_status",0,,,0
+selection,"calendar.attendee,schedule_status",0,1.0,1.0,0
+selection,"calendar.attendee,schedule_status",0,1.1,1.1,0
+selection,"calendar.attendee,schedule_status",0,1.2,1.2,0
+selection,"calendar.attendee,schedule_status",0,3.7,3.7,0
+selection,"calendar.attendee,schedule_status",0,3.8,3.8,0
+selection,"calendar.attendee,schedule_status",0,5.1,5.1,0
+selection,"calendar.attendee,schedule_status",0,5.2,5.1,0
+selection,"calendar.attendee,schedule_status",0,5.3,5.3,0
+selection,"calendar.event,organizer_schedule_agent",0,,,0
+selection,"calendar.event,organizer_schedule_agent",0,Client,Client,0
+selection,"calendar.event,organizer_schedule_agent",0,None,Aucun,0
+selection,"calendar.event,organizer_schedule_agent",0,Server,Serveur,0
+selection,"calendar.event,organizer_schedule_status",0,,,0
+selection,"calendar.event,organizer_schedule_status",0,1.0,1.0,0
+selection,"calendar.event,organizer_schedule_status",0,1.1,1.1,0
+selection,"calendar.event,organizer_schedule_status",0,1.2,1.2,0
+selection,"calendar.event,organizer_schedule_status",0,3.7,3.7,0
+selection,"calendar.event,organizer_schedule_status",0,3.8,3.8,0
+selection,"calendar.event,organizer_schedule_status",0,5.1,5.1,0
+selection,"calendar.event,organizer_schedule_status",0,5.2,5.1,0
+selection,"calendar.event,organizer_schedule_status",0,5.3,5.3,0
+view,res.user,0,Calendar Email Notifications,Notifications calendrier par Email,0
+view,res.user,0,Notifications,Avertissements,0
diff --git a/res.py b/res.py
new file mode 100644
index 0000000..d15f88e
--- /dev/null
+++ b/res.py
@@ -0,0 +1,43 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelSQL, ModelView, fields
+
+
+class User(ModelSQL, ModelView):
+    _name = 'res.user'
+
+    calendar_email_notification_new = fields.Boolean(
+            'New invitations')
+    calendar_email_notification_update = fields.Boolean(
+            'Changed invitations')
+    calendar_email_notification_cancel = fields.Boolean(
+            'Cancelled invitations')
+    calendar_email_notification_partstat = fields.Boolean(
+            'Invitation Replies')
+
+    def default_calendar_email_notification_new(self, cursor, user,
+            context=None):
+        return True
+
+    def default_calendar_email_notification_update(self, cursor, user,
+            context=None):
+        return True
+
+    def default_calendar_email_notification_cancel(self, cursor, user,
+            context=None):
+        return True
+
+    def default_calendar_email_notification_partstat(self, cursor, user,
+            context=None):
+        return True
+
+    def __init__(self):
+        super(User, self).__init__()
+        self._preferences_fields += [
+            'calendar_email_notification_new',
+            'calendar_email_notification_update',
+            'calendar_email_notification_cancel',
+            'calendar_email_notification_partstat',
+        ]
+
+User()
diff --git a/res.xml b/res.xml
new file mode 100644
index 0000000..a704d27
--- /dev/null
+++ b/res.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data>
+
+        <record model="ir.ui.view" id="user_view_form">
+            <field name="model">res.user</field>
+            <field name="type">form</field>
+            <field name="inherit" ref="res.user_view_form"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <data>
+                    <xpath expr="/form/notebook" position="inside">
+                        <page string="Notifications"
+                            id="notification" col="2">
+                            <separator string="Calendar Email Notifications"
+                                id="calendar_email_notification" colspan="2"/>
+                            <label name="calendar_email_notification_new"/>
+                            <field name="calendar_email_notification_new"/>
+                            <label name="calendar_email_notification_update"/>
+                            <field name="calendar_email_notification_update"/>
+                            <label name="calendar_email_notification_cancel"/>
+                            <field name="calendar_email_notification_cancel"/>
+                            <label name="calendar_email_notification_partstat"/>
+                            <field name="calendar_email_notification_partstat"/>
+                        </page>
+                    </xpath>
+                </data>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="user_view_form_preferences">
+            <field name="model">res.user</field>
+            <field name="type">form</field>
+            <field name="inherit" ref="res.user_view_form_preferences"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <data>
+                    <xpath expr="/form/notebook" position="inside">
+                        <page string="Notifications"
+                            id="notification" col="2">
+                            <separator string="Calendar Email Notifications"
+                                id="calendar_email_notification" colspan="2"/>
+                            <label name="calendar_email_notification_new"/>
+                            <field name="calendar_email_notification_new"/>
+                            <label name="calendar_email_notification_update"/>
+                            <field name="calendar_email_notification_update"/>
+                            <label name="calendar_email_notification_cancel"/>
+                            <field name="calendar_email_notification_cancel"/>
+                            <label name="calendar_email_notification_partstat"/>
+                            <field name="calendar_email_notification_partstat"/>
+                        </page>
+                    </xpath>
+                </data>
+                ]]>
+            </field>
+        </record>
+
+    </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..552455e
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = ['PyWebDAV >= 0.9.3']
+for dep in info.get('depends', []):
+    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+        requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+
+setup(name='trytond_calendar_scheduling',
+    version=info.get('version', '0.0.1'),
+    description=info.get('description', ''),
+    author=info.get('author', ''),
+    author_email=info.get('email', ''),
+    url=info.get('website', ''),
+    download_url="http://downloads.tryton.org/" + \
+            info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+    package_dir={'trytond.modules.calendar_scheduling': '.'},
+    packages=[
+        'trytond.modules.calendar_scheduling',
+    ],
+    package_data={
+        'trytond.modules.calendar_scheduling': info.get('xml', []) \
+                + info.get('translation', []),
+    },
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Financial and Insurance Industry',
+        'Intended Audience :: Legal Industry',
+        'Intended Audience :: Manufacturing',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: English',
+        'Natural Language :: French',
+        'Natural Language :: German',
+        'Natural Language :: Spanish',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Office/Business',
+    ],
+    license='GPL-3',
+    install_requires=requires,
+    zip_safe=False,
+    entry_points="""
+    [trytond.modules]
+    calendar_scheduling = trytond.modules.calendar_scheduling
+    """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..3b67355
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_calendar_scheduling import *
diff --git a/tests/test_calendar_scheduling.py b/tests/test_calendar_scheduling.py
new file mode 100644
index 0000000..6fa0fba
--- /dev/null
+++ b/tests/test_calendar_scheduling.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+    '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+    sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class CalendarSchedulingTestCase(unittest.TestCase):
+    '''
+    Test CalendarScheduling module.
+    '''
+
+    def setUp(self):
+        trytond.tests.test_tryton.install_module('calendar_scheduling')
+
+    def test0005views(self):
+        '''
+        Test views.
+        '''
+        self.assertRaises(Exception, test_view('calendar_scheduling'))
+
+def suite():
+    return unittest.TestLoader().loadTestsFromTestCase(
+            CalendarSchedulingTestCase)
+
+if __name__ == '__main__':
+    suiteTrytond = trytond.tests.test_tryton.suite()
+    suiteCalendarScheduling = suite()
+    alltests = unittest.TestSuite([suiteTrytond, suiteCalendarScheduling])
+    unittest.TextTestRunner(verbosity=2).run(alltests)
+    SOCK.disconnect()
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
new file mode 100644
index 0000000..05ecd4f
--- /dev/null
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-calendar-scheduling
+Version: 1.4.0
+Summary: Add Scheduling support on CalDAV
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_calendar_scheduling.egg-info/SOURCES.txt b/trytond_calendar_scheduling.egg-info/SOURCES.txt
new file mode 100644
index 0000000..99ac396
--- /dev/null
+++ b/trytond_calendar_scheduling.egg-info/SOURCES.txt
@@ -0,0 +1,26 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+res.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./caldav.py
+./calendar.py
+./res.py
+tests/__init__.py
+tests/test_calendar_scheduling.py
+trytond_calendar_scheduling.egg-info/PKG-INFO
+trytond_calendar_scheduling.egg-info/SOURCES.txt
+trytond_calendar_scheduling.egg-info/dependency_links.txt
+trytond_calendar_scheduling.egg-info/entry_points.txt
+trytond_calendar_scheduling.egg-info/not-zip-safe
+trytond_calendar_scheduling.egg-info/requires.txt
+trytond_calendar_scheduling.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_calendar_scheduling.egg-info/dependency_links.txt b/trytond_calendar_scheduling.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_calendar_scheduling.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_calendar_scheduling.egg-info/entry_points.txt b/trytond_calendar_scheduling.egg-info/entry_points.txt
new file mode 100644
index 0000000..19a0bd8
--- /dev/null
+++ b/trytond_calendar_scheduling.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+    [trytond.modules]
+    calendar_scheduling = trytond.modules.calendar_scheduling
+    
\ No newline at end of file
diff --git a/trytond_calendar_scheduling.egg-info/not-zip-safe b/trytond_calendar_scheduling.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_calendar_scheduling.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
new file mode 100644
index 0000000..4287e5f
--- /dev/null
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -0,0 +1,4 @@
+PyWebDAV >= 0.9.3
+trytond_calendar
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_calendar_scheduling.egg-info/top_level.txt b/trytond_calendar_scheduling.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_calendar_scheduling.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
-- 
tryton-modules-calendar-scheduling



More information about the tryton-debian-vcs mailing list