[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q

14 files changed, 2511 insertions, 449 deletions

diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index 2394c95d272..146b8f83476 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-
+    
         <record model="document.directory" id="document.dir_calendars">
             <field name="name">Calendars</field>
             <field name="calendar_collection">True</field>
-        </record>
-
+        </record>    
+    
         <!--        Event attributes-->
-
         <record model="basic.calendar.attributes" id="field_event_comment">
             <field name="name">comment</field>
             <field name="type">vevent</field>
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index d60b7f90e91..bb2f19334d8 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -38,8 +38,7 @@ from tools.safe_eval import safe_eval as eval
 try:
     import vobject
 except ImportError:
-    raise osv.except_osv('vobject Import Error!','Please install python-vobject \
-                     from http://vobject.skyhouseconsulting.com/')
+    raise osv.except_osv(_('vobject Import Error!'), _('Please install python-vobject from http://vobject.skyhouseconsulting.com/'))
 
 # O-1  Optional and can come only once
 # O-n  Optional and can come more than once
diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot
index 1364aeeb400..3e512317214 100644
--- a/addons/caldav/i18n/caldav.pot
+++ b/addons/caldav/i18n/caldav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11:50+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:50+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43:21+0000\n"
+"PO-Revision-Date: 2010-12-03 15:43:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,6 @@ msgid "Provide path for Remote Calendar"
 msgstr ""
 
 #. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
 msgid "Import .ics File"
 msgstr ""
@@ -53,6 +52,11 @@ msgid "Attendee"
 msgstr ""
 
 #. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
 #: selection:basic.calendar,type:0
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
@@ -94,6 +98,7 @@ msgstr ""
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/wizard/calendar_event_import.py:0
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -161,11 +166,6 @@ msgid "Error! You can not create recursive Directories."
 msgstr ""
 
 #. module: caldav
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: caldav
 #: field:basic.calendar,type:0
 #: field:basic.calendar.attributes,type:0
 #: field:basic.calendar.fields,type_id:0
@@ -179,11 +179,6 @@ msgid "description"
 msgstr ""
 
 #. module: caldav
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: caldav
 #: help:calendar.event.export,name:0
 msgid "Save in .ics format"
 msgstr ""
@@ -200,11 +195,6 @@ msgid "Calendar attributes"
 msgstr ""
 
 #. module: caldav
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: caldav
 #: field:basic.calendar,create_date:0
 msgid "Created Date"
 msgstr ""
@@ -243,8 +233,15 @@ msgid "Calendar"
 msgstr ""
 
 #. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:0
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
 msgstr ""
 
 #. module: caldav
@@ -263,21 +260,6 @@ msgid "Message..."
 msgstr ""
 
 #. module: caldav
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: caldav
 #: view:basic.calendar:0
 #: field:basic.calendar,has_webcal:0
 msgid "WebCal"
@@ -292,6 +274,7 @@ msgstr ""
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
+#: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
 msgstr ""
@@ -357,13 +340,8 @@ msgid "Fields Mapping"
 msgstr ""
 
 #. module: caldav
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: caldav
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
 msgstr ""
 
 #. module: caldav
@@ -456,12 +434,22 @@ msgid "Attendee must have an Email Id"
 msgstr ""
 
 #. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
 msgid "Export .ics File"
 msgstr ""
 
 #. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
 #: field:calendar.event.export,file_path:0
 msgid "Save ICS file"
 msgstr ""
@@ -483,7 +471,7 @@ msgstr ""
 
 #. module: caldav
 #: view:basic.calendar:0
-msgid "MY"
+msgid "Todo"
 msgstr ""
 
 #. module: caldav
diff --git a/addons/caldav/i18n/de.po b/addons/caldav/i18n/de.po
index a1dd4350fd2..cde98d56c0e 100644
--- a/addons/caldav/i18n/de.po
+++ b/addons/caldav/i18n/de.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-16 09:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-11-18 16:11+0000\n"
+"PO-Revision-Date: 2010-11-30 17:53+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-17 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -23,42 +24,77 @@ msgid "Value Mapping"
 msgstr "Mapping Felder"
 
 #. module: caldav
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-"beinhalten !"
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr "Dateiname"
 
 #. module: caldav
-#: field:document.directory,calendar_collection:0
-msgid "Calendar Collection"
-msgstr "Gemeinsame Kalender"
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr "Exportiere Terminiere"
 
 #. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr "Erfassen Sie den Pfad für Remote Kalender"
 
 #. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Weitere Info"
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr "Importiere .ics Datei"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportiere Terminiere"
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "Beenden"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "Teilnehmer"
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr "Offen"
 
 #. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr "Ausdruck als Konstante"
+
+#. module: caldav
+#: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Nachricht..."
+msgid "Ok"
+msgstr "OK"
 
 #. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Dateiname"
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+"Bitte erstellen Sie eine korrekte Konfiguration für \"%s\" in den Terminen."
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr "Datei Name"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr "Fehler!"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
@@ -67,46 +103,71 @@ msgid "Warning !"
 msgstr "Warnung !"
 
 #. module: caldav
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr "Exportiere .ics"
 
 #. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "Abonnieren"
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "Benutze dieses Feld"
 
 #. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Verzeichnis"
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr "Kann die Position \"%s\" nicht mehr als einmal erzeugen"
 
 #. module: caldav
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr "Kalenderzeilen"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr "Einschreiben Event"
 
 #. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr "Import .ics"
 
 #. module: caldav
+#: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
-msgid "Provide path for Remote Calendar"
-msgstr "Erfassen Sie den Pfad für Remote Kalender"
+msgid "_Cancel"
+msgstr "Abbrechen"
 
 #. module: caldav
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr "Termin"
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+msgid "Calendar Collection"
+msgstr "Gemeinsame Kalender"
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
+
+#. module: caldav
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "Die Modulbezeichnung sollte eindeutig sein !"
 
 #. module: caldav
 #: field:basic.calendar,type:0
@@ -117,20 +178,14 @@ msgid "Type"
 msgstr "Typ"
 
 #. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importiere .ics Datei"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "OpenObject Feld"
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr "Beschreibung"
 
 #. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funktion"
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
 
 #. module: caldav
 #: help:calendar.event.export,name:0
@@ -138,62 +193,68 @@ msgid "Save in .ics format"
 msgstr "Speichern in .ics Format"
 
 #. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Teilnehmer"
-
-#. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Error !"
 msgstr "Fehler !"
 
 #. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr "Kalender Merkmale"
+
+#. module: caldav
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML Quellcode für Ansicht!"
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr "Datum erstellt"
+
+#. module: caldav
 #: view:basic.calendar:0
-msgid "Description"
-msgstr "Beschreibung"
+msgid "Attributes Mapping"
+msgstr "Merkmale Zuordnung"
 
 #. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Abonnieren"
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr "Verzeichnis"
 
 #. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "Offen"
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr "Gebe Pfad an zum Remote Kalender"
 
 #. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Der Kalender / Eintrag zu dem die Zuordnung gehört"
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr "Domain"
 
 #. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objekt"
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr "Besitzer"
 
 #. module: caldav
 #: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
 msgstr "Kalender"
 
 #. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Zuordnung"
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr "Zu erledigen"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Kalender Merkmale"
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr "OpenObject Feld"
 
 #. module: caldav
 #: field:basic.calendar.alias,res_id:0
@@ -201,203 +262,171 @@ msgid "Res. ID"
 msgstr "Ressource"
 
 #. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "Import"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Modifided Date"
-msgstr "Geändertes Datum"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "Beenden"
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr "Nachricht..."
 
 #. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportiere .ics"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importiere Termin"
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
 
 #. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Ausdruck als Konstante"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
 #. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Datei Name"
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr "WebCal"
 
 #. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Abonniere Remote Kalender"
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr "Gemeinsame Kalender"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
-msgid "Can not create \\nline \"%s\" more than once' % (vals.get('name"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
+msgid "The same filename cannot apply to two records!"
 msgstr ""
-"Für Clients die dieses unterstützen, die Anzeige der Farbe für Termine im "
-"Kalender"
+"Der gleiche Dateiname kann kann nicht für zwei Einträge gleichzeitig gelten"
 
 #. module: caldav
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für Ansicht!"
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "Das Verzeichnis kann nicht sich selbst übergeordnet werden"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr "Kalender"
 
 #. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "OK"
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr "Verzeichnis"
 
 #. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Name"
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "Das Verzeichnis muss eindeutig sein"
 
 #. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Benutze dieses Feld"
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr "Bitte definieren Sie eine existierende URL"
 
 #. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Benachrichtigung"
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
 
 #. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "_Cancel"
-msgstr "Abbrechen"
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr "Ausdruck"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid ""
-"Please provide proper configuration of \"%s\" in Calendar Lines' % (name)))\n"
-"        return True\n"
-"\n"
-"    def create(self, cr, uid, vals, context=None):\n"
-"        \"\"\" Create Calendar's fields\n"
-"            @param self: The object pointer\n"
-"            @param cr: the current row, from the database cursor,\n"
-"            @param uid: the current user’s ID for security checks,\n"
-"            @param vals: Get Values\n"
-"            @param context: A standard dictionary for contextual values\n"
-"        \"\"\"\n"
-"\n"
-"        cr.execute('SELECT name FROM basic_calendar_attributes \\n           "
-"                 WHERE id=%s', (vals.get('name"
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Teilnehmer muss EMail Addresse haben"
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
 
 #. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Datum erstellt"
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr "Wähle .ics Datei"
 
 #. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
-#, python-format
-msgid "Error!"
-msgstr "Fehler!"
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr "Mapping Felder"
 
 #. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportiere .ics Datei"
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
+"beinhalten !"
 
 #. module: caldav
 #: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Merkmale Zuordnung"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Verzeichnis"
+msgid "Other Info"
+msgstr "Weitere Info"
 
 #. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Gebe Pfad an zum Remote Kalender"
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr "Abonnieren"
 
 #. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Ausdruck"
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+"Exportiere zusätzlich einen <Name>.ics Eintrag mit WebCal Inhalt in das "
+"Kalender Verzeichnis."
 
 #. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Auftrag"
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr "Funktion"
 
 #. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Gemeinsame Kalender"
+#: view:basic.calendar:0
+msgid "Description"
+msgstr "Beschreibung"
 
 #. module: caldav
-#: field:basic.calendar,description:0
-msgid "description"
-msgstr "Beschreibung"
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr "Der Kalender / Eintrag zu dem die Zuordnung gehört"
 
 #. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Bitte definieren Sie eine existierende URL"
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr "Zuordnung"
 
 #. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domain"
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr "Import"
 
 #. module: caldav
-#: model:ir.module.module,shortdesc:caldav.module_meta_information
-msgid "Share Calendar using CalDAV"
-msgstr "Gemeinsame Kalender mit WebDav"
+#: field:basic.calendar,write_date:0
+msgid "Modifided Date"
+msgstr "Geändertes Datum"
 
 #. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Farbe"
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr "Importiere Termin"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
@@ -405,54 +434,46 @@ msgid "Interval in hours"
 msgstr "Intervalle in Stunden"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Kalender Dateien"
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr "Abonniere Remote Kalender"
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
 msgstr ""
-"Der gleiche Dateiname kann kann nicht für zwei Einträge gleichzeitig gelten"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importiere Nachricht"
+"Für Clients die dieses unterstützen, die Anzeige der Farbe für Termine im "
+"Kalender"
 
 #. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Kalenderzeilen"
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr "Name"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Einschreiben Event"
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr "Benachrichtigung"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
 msgstr ""
 
 #. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS file"
-msgstr "Wähle .ics Datei"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Import .ics"
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr "Teilnehmer muss EMail Addresse haben"
 
 #. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr "Exportiere .ics Datei"
 
 #. module: caldav
 #: field:calendar.event.export,file_path:0
@@ -460,22 +481,47 @@ msgid "Save ICS file"
 msgstr "Speichern .ics Datei"
 
 #. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapping Felder"
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr "Auftrag"
 
 #. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Besitzer"
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr "Gemeinsame Kalender mit WebDav"
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr "Farbe"
 
 #. module: caldav
 #: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-msgid "Calendar"
-msgstr "Kalender"
+msgid "MY"
+msgstr "MJ"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr "Kalender Dateien"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr "Importiere Nachricht"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr "Abonnieren"
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+"Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
+"haben"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_todo
@@ -487,15 +533,3 @@ msgstr ""
 msgid "For supporting clients, the order of this folder among the calendars"
 msgstr ""
 "Für Kalender die dieses unterstützen, die Reihenfolge bei der Ansicht"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Termin"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
diff --git a/addons/caldav/i18n/es.po b/addons/caldav/i18n/es.po
new file mode 100644
index 00000000000..9ab08f6c387
--- /dev/null
+++ b/addons/caldav/i18n/es.po
@@ -0,0 +1,511 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-04 23:00+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr "Nombre de archivo"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr "Exportar evento"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr "Indicar ruta del calendario remoto"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr "Importar archivo .ics"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "Asistente"
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr "Expresión como constante"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/wizard/calendar_event_import.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:0
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Modifided Date"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/caldav/i18n/fr.po b/addons/caldav/i18n/fr.po
new file mode 100644
index 00000000000..4bd94448d89
--- /dev/null
+++ b/addons/caldav/i18n/fr.po
@@ -0,0 +1,514 @@
+# French translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-04 09:19+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "Participant"
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+"Veuillez fournir une configuration correcte pour \"%s\" dans les lignes de "
+"calendrier"
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/wizard/calendar_event_import.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr "Lignes de calendrier"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr "Sauvegarder au format .ics"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:0
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr "Veuillez fournir un lien correct !"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Modifided Date"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/caldav/i18n/it.po b/addons/caldav/i18n/it.po
index a2319e1eef1..5f82f0b6b0f 100644
--- a/addons/caldav/i18n/it.po
+++ b/addons/caldav/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-21 07:56+0000\n"
+"PO-Revision-Date: 2010-11-30 18:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-22 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Value Mapping"
-msgstr ""
+msgstr "Mappatura Valore"
 
 #. module: caldav
 #: field:basic.calendar.alias,name:0
@@ -35,7 +35,7 @@ msgstr "Esportazione evento"
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Provide path for Remote Calendar"
-msgstr "Fornire percorso per Calendario Remoto"
+msgstr "Fornire il percorso per il Calendario Remoto"
 
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_import
@@ -128,7 +128,7 @@ msgstr "Linee calendario"
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_subscribe
 msgid "Event subscribe"
-msgstr ""
+msgstr "Iscrizione Evento"
 
 #. module: caldav
 #: view:calendar.event.import:0
@@ -157,12 +157,12 @@ msgstr "Evento"
 #. module: caldav
 #: field:document.directory,calendar_collection:0
 msgid "Calendar Collection"
-msgstr ""
+msgstr "Collezione Calendario"
 
 #. module: caldav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr "Errore! Non è possibile creare directory ricorsive."
+msgstr "Errore! Non è possibile creare Cartelle ricorsive."
 
 #. module: caldav
 #: sql_constraint:ir.module.module:0
@@ -206,7 +206,7 @@ msgstr "Attributi calendario"
 #. module: caldav
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per la struttura della vista!"
+msgstr "XML non valido per l'Architettura di Visualizzazione!"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
@@ -216,17 +216,17 @@ msgstr "Data di Creazione"
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Attributes Mapping"
-msgstr ""
+msgstr "Mappatura Attributi"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_document_directory
 msgid "Directory"
-msgstr "Directory"
+msgstr "Cartella"
 
 #. module: caldav
 #: field:calendar.event.subscribe,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Fornire il percorso del calendario remoto"
 
 #. module: caldav
 #: field:basic.calendar.lines,domain:0
@@ -254,7 +254,7 @@ msgstr "Da fare"
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
 msgid "OpenObject Field"
-msgstr "Campo Open Object"
+msgstr "Campo OpenObject"
 
 #. module: caldav
 #: field:basic.calendar.alias,res_id:0
@@ -269,7 +269,7 @@ msgstr "Messaggio..."
 #. module: caldav
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo."
+msgstr "Errore! Non è possibile creare un Menù ricorsivo."
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar
@@ -303,7 +303,7 @@ msgstr "Lo stesso nome file non può essere applicato a due record!"
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr "Una directory non può essere padre di sè stessa!"
+msgstr "La cartella non può essere padre di sè stessa!"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -321,7 +321,7 @@ msgstr "Collezione"
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr "Il nome directory deve essere unico!"
+msgstr "Il nome della cartella deve essere unico!"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:0
@@ -353,7 +353,7 @@ msgstr "basic.calendar.alias"
 #: view:calendar.event.import:0
 #: field:calendar.event.import,file_path:0
 msgid "Select ICS file"
-msgstr "Seleziona file ICS"
+msgstr "Selezionare il file ICS"
 
 #. module: caldav
 #: field:basic.calendar.lines,mapping_ids:0
@@ -376,12 +376,12 @@ msgstr ""
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Other Info"
-msgstr "Altre informazioni"
+msgstr "Altre Informazioni"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Sottoscrivi"
 
 #. module: caldav
 #: help:basic.calendar,has_webcal:0
@@ -389,6 +389,8 @@ msgid ""
 "Also export a <name>.ics entry next to the calendar folder, with WebCal "
 "content."
 msgstr ""
+"Esportare una <name>.ics vicino alla cartella calendario, con contenuto "
+"WebCal."
 
 #. module: caldav
 #: field:basic.calendar.fields,fn:0
@@ -403,12 +405,12 @@ msgstr "Descrizione"
 #. module: caldav
 #: help:basic.calendar.alias,cal_line_id:0
 msgid "The calendar/line this mapping applies to"
-msgstr ""
+msgstr "Applicare la mappatura calendario/linea a"
 
 #. module: caldav
 #: field:basic.calendar.fields,mapping:0
 msgid "Mapping"
-msgstr ""
+msgstr "Mappatura"
 
 #. module: caldav
 #: view:calendar.event.import:0
@@ -423,7 +425,7 @@ msgstr "Data modificata"
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_import
 msgid "Event Import"
-msgstr ""
+msgstr "Importa evento"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
@@ -433,7 +435,7 @@ msgstr "Intervallo in ore"
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Subscribe to Remote Calendar"
-msgstr ""
+msgstr "Sottoscriversi ad un Calendario remoto"
 
 #. module: caldav
 #: help:basic.calendar,calendar_color:0
@@ -483,7 +485,7 @@ msgstr "Ordine"
 #. module: caldav
 #: model:ir.module.module,shortdesc:caldav.module_meta_information
 msgid "Share Calendar using CalDAV"
-msgstr "Condividi calendario usando CalDav"
+msgstr "Condividere il calendario usando CalDav"
 
 #. module: caldav
 #: field:basic.calendar,calendar_color:0
@@ -509,17 +511,17 @@ msgstr "Importa messaggio"
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
 msgid "Subscribe"
-msgstr "Abbonati"
+msgstr "Sottoscrivi"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "La Cartella deve avere un padre o uno storage"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_todo
 msgid "basic.calendar.todo"
-msgstr ""
+msgstr "basic.calendar.todo"
 
 #. module: caldav
 #: help:basic.calendar,calendar_order:0
diff --git a/addons/caldav/i18n/nl.po b/addons/caldav/i18n/nl.po
index 872f6ee4f88..7f68fd523b3 100644
--- a/addons/caldav/i18n/nl.po
+++ b/addons/caldav/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-17 08:27+0000\n"
+"PO-Revision-Date: 2010-11-30 16:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-19 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -81,7 +81,7 @@ msgstr "Ok"
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
+msgstr "Vul aub juiste configuratie van \"%s\" in bij agendaregels"
 
 #. module: caldav
 #: field:calendar.event.export,name:0
@@ -114,7 +114,7 @@ msgstr "Het veld gebruiken"
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Can not create line \"%s\" more than once"
-msgstr ""
+msgstr "Kan regel \"%s\" niet meer dan eens maken"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -165,7 +165,7 @@ msgstr "Fout ! U kunt geen recursieve mappen maken."
 #. module: caldav
 #: sql_constraint:ir.module.module:0
 msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "De modulenaam moet uniek zijn !"
 
 #. module: caldav
 #: field:basic.calendar,type:0
@@ -183,7 +183,7 @@ msgstr "omschrijving"
 #. module: caldav
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
 
 #. module: caldav
 #: help:calendar.event.export,name:0
@@ -247,7 +247,7 @@ msgstr "Agenda"
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Todo"
-msgstr ""
+msgstr "Te doen"
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
@@ -301,7 +301,7 @@ msgstr "Dezelfde bestandsnaam kan niet gebruikt worden voor twee records!"
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Map kan niet bovenliggend aan zichzelf zijn!"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -319,7 +319,7 @@ msgstr "Agendamap"
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "De mapnaam moet uniek zijn!"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:0
@@ -361,7 +361,7 @@ msgstr "Velden verdeling"
 #. module: caldav
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
 
 #. module: caldav
 #: constraint:ir.model:0
@@ -491,7 +491,7 @@ msgstr "Kleur"
 #. module: caldav
 #: view:basic.calendar:0
 msgid "MY"
-msgstr ""
+msgstr "MIJN"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_fields
@@ -512,7 +512,7 @@ msgstr "Inschrijven"
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Map moet een bovenliggende map hebben of opslag zijn"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_todo
diff --git a/addons/caldav/i18n/pl.po b/addons/caldav/i18n/pl.po
index b124187b119..414cad4fccc 100644
--- a/addons/caldav/i18n/pl.po
+++ b/addons/caldav/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-22 07:13+0000\n"
+"PO-Revision-Date: 2010-11-29 07:45+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-11-30 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -131,7 +131,7 @@ msgstr "Subskrypcja zdarzeń"
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Importuj ICS"
 
 #. module: caldav
 #: view:calendar.event.import:0
@@ -188,53 +188,53 @@ msgstr "ID certyfikatu modułu musi być unikalne !"
 #. module: caldav
 #: help:calendar.event.export,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Zapisz w formacie .ics"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attributes
 msgid "Calendar attributes"
-msgstr ""
+msgstr "Atrybuty kalendarza"
 
 #. module: caldav
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Niewłaściwy XML dla architektury widoku!"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Attributes Mapping"
-msgstr ""
+msgstr "Mapowanie atrybutów"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Katalog"
 
 #. module: caldav
 #: field:calendar.event.subscribe,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Wporwadź ścieżkę dla drugiego kalendarza."
 
 #. module: caldav
 #: field:basic.calendar.lines,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Domena"
 
 #. module: caldav
 #: field:basic.calendar,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Właściciel"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -242,17 +242,17 @@ msgstr ""
 #: field:basic.calendar.lines,calendar_id:0
 #: model:ir.ui.menu,name:caldav.menu_calendar
 msgid "Calendar"
-msgstr ""
+msgstr "Kalendarz"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Todo"
-msgstr ""
+msgstr "Do zrobienia"
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
 msgid "OpenObject Field"
-msgstr ""
+msgstr "Pole OpenObject"
 
 #. module: caldav
 #: field:basic.calendar.alias,res_id:0
@@ -262,12 +262,12 @@ msgstr ""
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Message..."
-msgstr ""
+msgstr "Wiadomość..."
 
 #. module: caldav
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar
@@ -277,7 +277,7 @@ msgstr ""
 #. module: caldav
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -290,18 +290,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
 #: model:ir.ui.menu,name:caldav.menu_calendar_collection
 msgid "Calendar Collections"
-msgstr ""
+msgstr "Kolekcje kalendarzy"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
-msgstr ""
+msgstr "Ten sam plik nie może dotyczyć dwóch rekordów !"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Katalog nie może być nadrzędny dla samego siebie !"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -309,23 +309,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:caldav.action_caldav_form
 #: model:ir.ui.menu,name:caldav.menu_caldav_directories
 msgid "Calendars"
-msgstr ""
+msgstr "Kalendarze"
 
 #. module: caldav
 #: field:basic.calendar,collection_id:0
 msgid "Collection"
-msgstr ""
+msgstr "Kolekcja"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Nazwa katalogu musi być unikalna !"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:0
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "Wprowadź poprawny URL !"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_timezone
@@ -335,7 +335,7 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Wyrażenie"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attendee
@@ -351,17 +351,17 @@ msgstr ""
 #: view:calendar.event.import:0
 #: field:calendar.event.import,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Wybierz plik ICS"
 
 #. module: caldav
 #: field:basic.calendar.lines,mapping_ids:0
 msgid "Fields Mapping"
-msgstr ""
+msgstr "Mapowanie pól"
 
 #. module: caldav
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "Rozmiar pola nie może być mniejszy od 1 !"
 
 #. module: caldav
 #: constraint:ir.model:0
@@ -374,12 +374,12 @@ msgstr ""
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Subskrybuj"
 
 #. module: caldav
 #: help:basic.calendar,has_webcal:0
@@ -387,69 +387,71 @@ msgid ""
 "Also export a <name>.ics entry next to the calendar folder, with WebCal "
 "content."
 msgstr ""
+"Również eksportuj zapis <nazwa>.ics następny za katalogiem kalendarza z "
+"zawartością WebCal."
 
 #. module: caldav
 #: field:basic.calendar.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "Funkcja"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: caldav
 #: help:basic.calendar.alias,cal_line_id:0
 msgid "The calendar/line this mapping applies to"
-msgstr ""
+msgstr "Kalendarz/Pozycja, której dotyczy mapowanie"
 
 #. module: caldav
 #: field:basic.calendar.fields,mapping:0
 msgid "Mapping"
-msgstr ""
+msgstr "Mapowanie"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importuj"
 
 #. module: caldav
 #: field:basic.calendar,write_date:0
 msgid "Modifided Date"
-msgstr ""
+msgstr "Data modyfikacji"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_import
 msgid "Event Import"
-msgstr ""
+msgstr "Import zdarzeń"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "Interwał w godzinach"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Subscribe to Remote Calendar"
-msgstr ""
+msgstr "Subskrybuj inny kalendarz"
 
 #. module: caldav
 #: help:basic.calendar,calendar_color:0
 msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
+msgstr "Kolor zapisów kalendarza (dla programów akceptujących kolory)"
 
 #. module: caldav
 #: field:basic.calendar,name:0
 #: field:basic.calendar.attributes,name:0
 #: field:basic.calendar.fields,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 #. module: caldav
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alarm
@@ -460,33 +462,33 @@ msgstr ""
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Attendee must have an Email Id"
-msgstr ""
+msgstr "Uczestnik musi mieć id email"
 
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_export
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
 msgid "Export .ics File"
-msgstr ""
+msgstr "Eksportuj plik .ics"
 
 #. module: caldav
 #: field:calendar.event.export,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "Zapisz plik ICS"
 
 #. module: caldav
 #: field:basic.calendar,calendar_order:0
 msgid "Order"
-msgstr ""
+msgstr "Kolejność"
 
 #. module: caldav
 #: model:ir.module.module,shortdesc:caldav.module_meta_information
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "Współdziel kalendarz stosująć CalDAV"
 
 #. module: caldav
 #: field:basic.calendar,calendar_color:0
 msgid "Color"
-msgstr ""
+msgstr "Kolor"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -496,23 +498,23 @@ msgstr ""
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_fields
 msgid "Calendar fields"
-msgstr ""
+msgstr "Pola kalendarza"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import Message"
-msgstr ""
+msgstr "Importuj wiadomość"
 
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
 msgid "Subscribe"
-msgstr ""
+msgstr "Subskrybuj"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Katalog musi mieć katalog nadrzędny lub nazwę napędu."
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_todo
@@ -523,3 +525,4 @@ msgstr ""
 #: help:basic.calendar,calendar_order:0
 msgid "For supporting clients, the order of this folder among the calendars"
 msgstr ""
+"Kolejność katalogu w kalendarzach (dla klientów obsługujących kolejność)"
diff --git a/addons/caldav/i18n/sr@latin.po b/addons/caldav/i18n/sr@latin.po
new file mode 100644
index 00000000000..8c450f96350
--- /dev/null
+++ b/addons/caldav/i18n/sr@latin.po
@@ -0,0 +1,499 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr "Mapiranje Vrednosti"
+
+#. module: caldav
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+msgid "Calendar Collection"
+msgstr "Kolekcija Kalendara"
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Greska ! Ne mozes kreirati rekursivne direktorijume."
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr "Ostale informacije"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr "Exportuj Dogadjaj"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr "Poruka ..."
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr "IMe Fajla"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Upozorenje !"
+
+#. module: caldav
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr "WebPoziv"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr "_Subscribe"
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr "Kolekcija"
+
+#. module: caldav
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr "basic.calendar.attendee"
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+"Takodje iznesi i sadrzaj <ime>na iz polja odmah do foldera kalendara, "
+"zajedno sa WebCal sadrzajem."
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr "Daje put za udaljeni Kalendar"
+
+#. module: caldav
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime modela u definiciji akcije"
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr "Uvezi .ics Fajl"
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr "OpenObject polje"
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr "Funkcija"
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr "sacuvaj u .ics formatu"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "Ucesnik"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Error !"
+msgstr "Greska !"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr "Pretplati se"
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr "ZaUraditi"
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr "Kalendar/Linija ovo se mapiranje odnosi na"
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "Objekat"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr "Kalendari"
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr "Mapiranje"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr "Atributi Kalendara"
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr "_Import"
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Modifided Date"
+msgstr "Datuma modifikovano"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "_Close"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr "Izvezi ICS"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr "Uvezi Dogadjaj"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr "Ekspresija kao konstanta"
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr "Ime Fajla"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr "Pretplati se na Udaljeni Kalendar"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Can not create \\nline \"%s\" more than once' % (vals.get('name"
+msgstr ""
+"Ne mogu da kreira, \\nliniju \"%s\" vise nego jednom' % (vals.get('name"
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr "Zbog podrske klijentima. boja sadrzaja Kalendara"
+
+#. module: caldav
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neispravan XML za pregled Arhitekture"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr "basic.calendar.alarm"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "Koristite polje"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr "Alarm"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid ""
+"Please provide proper configuration of \"%s\" in Calendar Lines' % (name)))\n"
+"        return True\n"
+"\n"
+"    def create(self, cr, uid, vals, context=None):\n"
+"        \"\"\" Create Calendar's fields\n"
+"            @param self: The object pointer\n"
+"            @param cr: the current row, from the database cursor,\n"
+"            @param uid: the current user’s ID for security checks,\n"
+"            @param vals: Get Values\n"
+"            @param context: A standard dictionary for contextual values\n"
+"        \"\"\"\n"
+"\n"
+"        cr.execute('SELECT name FROM basic_calendar_attributes \\n           "
+"                 WHERE id=%s', (vals.get('name"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr "Ucesnik mora imati Licni Email"
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr "Kreirano Datuma"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr "Greska !"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr "Izvezi .ics Fajl"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr "basic.calendar.timezone"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr "Atributi Mapiranja"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr "Direktorijum"
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr "daje putanju do udaljenog Kalendara"
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr "Ekspresija"
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr "Redosled"
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr "Kolekcija Kalendara"
+
+#. module: caldav
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr "Opis"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr "Molim dajte ispravnu URL adresu !"
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr "Domain"
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr "Deli kalendar koriscenjem CalDAV-a"
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr "Boja"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr "Intervali u satima"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr "Polja Kalendara"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr "Isto ime fajla ne moze odgovarati za dva zapisa"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr "Uvezi Poruku"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr "Linije Kalendara"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr "Prijavi Dogadjaj"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr "basic.calendar.alias"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr "Izaberi ICS Fajl"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr "Uvezi ICS"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr "basic.calendar.event"
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr "Sacuvaj ICS Fajl"
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr "Mapiranje polja"
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr "Vlasnik"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
+msgstr "Kalendar"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr "basic.calendar.todo"
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr "Za podrsku klijentima, redosled foldera izmedju kalendara"
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr "Dogadjaj"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr "basic.calendar"
diff --git a/addons/caldav/i18n/sv.po b/addons/caldav/i18n/sv.po
new file mode 100644
index 00000000000..8e649a7a864
--- /dev/null
+++ b/addons/caldav/i18n/sv.po
@@ -0,0 +1,526 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-03 07:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-04 05:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr "Filnamn"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr "Importera  .ics fil"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "_Stäng"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "Deltagare"
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/wizard/calendar_event_import.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Varning!"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr "Exportera ICS"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "Använd fältet"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr "Kan inte skapa raden \"%s\" mer än en gång"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr "Importera ICS"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Fel! Ni kan inte skapa rekursiva kataloger."
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr "beskrivning"
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr "Spara i .ics format"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fel !"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr "Skapad datum"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr "Domän"
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr "Ägare"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
+msgstr "Kalender"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:0
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr "Meddelande"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Modifided Date"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr "Att göra"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unikt!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 3161bb7d45e..8b74e29a98e 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -19,20 +19,11 @@
                </form>
             </field>
         </record>
-        
-        <record id="action_calendar_event_export" model="ir.actions.act_window">
-            <field name="name">Export .ics File</field>
-            <field name="res_model">calendar.event.export</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_calendar_event_export"/> 
-           <field name="target">new</field>
-        </record>
-
 
         <act_window id="action_calendar_event_export_values"
             key2="client_action_multi" name="Export .ics File"
             res_model="calendar.event.export" src_model="basic.calendar"
+            view_id="view_calendar_event_export"
             view_mode="form" target="new" view_type="form" />
 
     </data>
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
index 11f9f9b4afb..51d7e007fcf 100644
--- a/addons/caldav/wizard/calendar_event_import.py
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -56,7 +56,11 @@ class calendar_event_import(osv.osv_memory):
             id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_import_display')
             if id2:
                  id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            vals = model_obj.import_cal(cr, uid, base64.decodestring(data['file_path']), context['active_id'], context)
+            vals = None
+            try:
+                vals = model_obj.import_cal(cr, uid, base64.decodestring(data['file_path']), context['active_id'], context)
+            except:
+                raise osv.except_osv(_('Warning !'),_('Invalid format of the ics, file can not be imported'))
             global cnt
             if vals:
                 cnt = len(vals)
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 41afcc7fcfd..e580e6b2733 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -37,18 +37,10 @@
             </field>
         </record>
         
-        <record id="action_calendar_event_import" model="ir.actions.act_window">
-            <field name="name">Import .ics File</field>
-            <field name="res_model">calendar.event.import</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_calendar_event_import"/> 
-           <field name="target">new</field>
-        </record>
-              
        <act_window id="action_calendar_event_import_values"
             key2="client_action_multi" name="Import .ics File"
             res_model="calendar.event.import" src_model="basic.calendar"
+            view_id="view_calendar_event_import"
             view_mode="form" target="new" view_type="form" />
         
     </data>