[tryton-debian-vcs] tryton-modules-calendar-todo branch upstream updated. upstream/2.8.0-1-g27fb2e4
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:33:41 UTC 2013
The following commit has been merged in the upstream branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar-todo.git;a=commitdiff;h=upstream/2.8.0-1-g27fb2e4
commit 27fb2e48a92b1e0f2ce6c4b5466b9c80cb705c84
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:48 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 9735814..ad7e2ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index bbf874a..e0e91e4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,6 +10,7 @@ Prerequisites
* pywebdav 0.9.8 or later (http://sourceforge.net/projects/pywebdav/)
* python-dateutil (http://labix.org/python-dateutil)
* pytz (http://pytz.sourceforge.net/)
+ * python-sql (http://code.google.com/p/python-sql/)
* trytond_calendar (http://www.tryton.org/)
Installation
diff --git a/PKG-INFO b/PKG-INFO
index d954667..fca3e1f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_calendar_todo
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add TODO on CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_calendar_todo
=====================
@@ -61,6 +61,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index b35f41f..9ce1266 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -666,7 +666,7 @@ msgstr "Públic"
msgctxt "selection:calendar.todo,status:"
msgid ""
-msgstr " "
+msgstr ""
msgctxt "selection:calendar.todo,status:"
msgid "Cancelled"
@@ -686,7 +686,7 @@ msgstr "Necessitat-Acció"
msgctxt "selection:calendar.todo.attendee,status:"
msgid ""
-msgstr " "
+msgstr ""
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Accepted"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 806d017..5c5b929 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -658,10 +658,9 @@ msgctxt "selection:calendar.todo,classification:"
msgid "Public"
msgstr "Público"
-#, fuzzy
msgctxt "selection:calendar.todo,status:"
msgid ""
-msgstr "Punto de Orden"
+msgstr ""
msgctxt "selection:calendar.todo,status:"
msgid "Cancelled"
@@ -679,10 +678,9 @@ msgctxt "selection:calendar.todo,status:"
msgid "Needs-Action"
msgstr "Necesita una Acción"
-#, fuzzy
msgctxt "selection:calendar.todo.attendee,status:"
msgid ""
-msgstr "Punto de Orden"
+msgstr ""
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Accepted"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index eed9e6b..4b70f1f 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Day\" in recurrence rule \"%s\""
-msgstr "El campo \"por dia\" de la regla de recurrencia \"%s\" no es correcto."
+msgstr "El campo \"por día\" de la regla de recurrencia \"%s\" no es correcto."
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Hour\" in recurrence rule \"%s\""
@@ -46,7 +46,7 @@ msgstr ""
msgctxt "error:calendar.todo.exrule:"
msgid "Only one of \"until\" and \"count\" can be set."
-msgstr "Define un \"hasta\" y un \"contador\"."
+msgstr "Puede establecer \"hasta\" o bien \"nº de veces\", no ambos."
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Day\" in recurrence rule \"%s\""
@@ -92,7 +92,7 @@ msgstr ""
msgctxt "error:calendar.todo.rrule:"
msgid "Only one of \"until\" and \"count\" can be set."
-msgstr "Define un \"hasta\" y un \"contador\"."
+msgstr "Puede establecer \"hasta\" o bien \"nº de veces\", no ambos."
msgctxt "error:calendar.todo:"
msgid "Todo \"%s\" can not be recurrent."
@@ -292,7 +292,7 @@ msgstr "Tarea"
msgctxt "field:calendar.todo.alarm,valarm:"
msgid "valarm"
-msgstr "valarm"
+msgstr "Alarma"
msgctxt "field:calendar.todo.alarm,write_date:"
msgid "Write Date"
@@ -416,7 +416,7 @@ msgstr "Por día del año"
msgctxt "field:calendar.todo.exrule,count:"
msgid "Count"
-msgstr "Contador"
+msgstr "Nº de veces"
msgctxt "field:calendar.todo.exrule,create_date:"
msgid "Create Date"
@@ -540,7 +540,7 @@ msgstr "Por día del año"
msgctxt "field:calendar.todo.rrule,count:"
msgid "Count"
-msgstr "Contador"
+msgstr "Nº de veces"
msgctxt "field:calendar.todo.rrule,create_date:"
msgid "Create Date"
@@ -596,19 +596,19 @@ msgstr "Identificador universal único."
msgctxt "help:calendar.todo.exdate,date:"
msgid "Ignore time of field \"Date\", but handle as date only."
-msgstr "Ingnora la hora del campo \"Fecha\", pero usar como única fecha."
+msgstr "Ingnorar la hora del campo \"Fecha\" y usar sólo el día."
msgctxt "help:calendar.todo.exrule,until_date:"
msgid "Ignore time of field \"Until Date\", but handle as date only."
-msgstr "Ingnora la hora del campo \"Hasta la fecha\", pero usar como única fecha."
+msgstr "Ingnorar la hora del campo \"Hasta la fecha\" y usar sólo el día."
msgctxt "help:calendar.todo.rdate,date:"
msgid "Ignore time of field \"Date\", but handle as date only."
-msgstr "Ingnora la hora del campo \"Fecha\", pero usar como única fecha."
+msgstr "Ingnorar la hora del campo \"Fecha\" y usar sólo el día."
msgctxt "help:calendar.todo.rrule,until_date:"
msgid "Ignore time of field \"Until Date\", but handle as date only."
-msgstr "Ingnora la hora del campo \"Hasta la fecha\", pero usar como única fecha."
+msgstr "Ingnora la hora del campo \"Hasta la fecha\" y usar sólo el día."
msgctxt "model:calendar.todo,name:"
msgid "Todo"
@@ -684,7 +684,7 @@ msgstr "En proceso"
msgctxt "selection:calendar.todo,status:"
msgid "Needs-Action"
-msgstr "Necesidad-Acción"
+msgstr "Requiere acción"
msgctxt "selection:calendar.todo.attendee,status:"
msgid ""
@@ -696,15 +696,15 @@ msgstr "Acceptado"
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Declined"
-msgstr "Rechazar"
+msgstr "Rechazado"
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Delegated"
-msgstr "Delegar"
+msgstr "Delegado"
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Needs Action"
-msgstr "Necesidad Acción"
+msgstr "Requiere acción"
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Tentative"
@@ -844,7 +844,7 @@ msgstr "Regla de excepción"
msgctxt "view:calendar.todo.exrule:"
msgid "Exception Rules"
-msgstr "Reglas de excepciones"
+msgstr "Reglas de excepción"
msgctxt "view:calendar.todo.rdate:"
msgid "Recurrence Date"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index efb455f..2f604a4 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -604,7 +604,7 @@ msgstr "Tâche"
msgctxt "model:calendar.todo-calendar.category,name:"
msgid "Todo - Category"
-msgstr "Todo - Catégorie"
+msgstr "Tâche - Catégorie"
msgctxt "model:calendar.todo.alarm,name:"
msgid "Alarm"
@@ -624,7 +624,7 @@ msgstr "Règle d'exception"
msgctxt "model:calendar.todo.rdate,name:"
msgid "Todo Recurrence Date"
-msgstr "Date de récurrence"
+msgstr "Date de récurrence de tâche"
msgctxt "model:calendar.todo.rrule,name:"
msgid "Recurrence Rule"
@@ -647,22 +647,10 @@ msgid "Confidential"
msgstr "Confidentiel"
msgctxt "selection:calendar.todo,classification:"
-msgid "Confidential"
-msgstr "Confidentiel"
-
-msgctxt "selection:calendar.todo,classification:"
msgid "Private"
msgstr "Privé"
msgctxt "selection:calendar.todo,classification:"
-msgid "Private"
-msgstr "Privé"
-
-msgctxt "selection:calendar.todo,classification:"
-msgid "Public"
-msgstr "Publique"
-
-msgctxt "selection:calendar.todo,classification:"
msgid "Public"
msgstr "Publique"
@@ -671,14 +659,6 @@ msgid ""
msgstr ""
msgctxt "selection:calendar.todo,status:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:calendar.todo,status:"
-msgid "Cancelled"
-msgstr "Annulé"
-
-msgctxt "selection:calendar.todo,status:"
msgid "Cancelled"
msgstr "Annulé"
@@ -687,22 +667,10 @@ msgid "Completed"
msgstr "Complété"
msgctxt "selection:calendar.todo,status:"
-msgid "Completed"
-msgstr "Complété"
-
-msgctxt "selection:calendar.todo,status:"
msgid "In-Process"
msgstr "En court"
msgctxt "selection:calendar.todo,status:"
-msgid "In-Process"
-msgstr "En court"
-
-msgctxt "selection:calendar.todo,status:"
-msgid "Needs-Action"
-msgstr "Nécessite une action"
-
-msgctxt "selection:calendar.todo,status:"
msgid "Needs-Action"
msgstr "Nécessite une action"
@@ -847,21 +815,9 @@ msgid "Attendee"
msgstr "Participant"
msgctxt "view:calendar.todo.attendee:"
-msgid "Attendee"
-msgstr "Participant"
-
-msgctxt "view:calendar.todo.attendee:"
msgid "Attendees"
msgstr "Participants"
-msgctxt "view:calendar.todo.attendee:"
-msgid "Attendees"
-msgstr "Participants"
-
-msgctxt "view:calendar.todo.exdate:"
-msgid "Exception Date"
-msgstr "Date d'exception"
-
msgctxt "view:calendar.todo.exdate:"
msgid "Exception Date"
msgstr "Date d'exception"
@@ -870,23 +826,11 @@ msgctxt "view:calendar.todo.exdate:"
msgid "Exception Dates"
msgstr "Dates d'exception"
-msgctxt "view:calendar.todo.exdate:"
-msgid "Exception Dates"
-msgstr "Dates d'exception"
-
msgctxt "view:calendar.todo.exrule:"
msgid "Exception Rule"
msgstr "Règle d'exception"
msgctxt "view:calendar.todo.exrule:"
-msgid "Exception Rule"
-msgstr "Règle d'exception"
-
-msgctxt "view:calendar.todo.exrule:"
-msgid "Exception Rules"
-msgstr "Règles d'exception"
-
-msgctxt "view:calendar.todo.exrule:"
msgid "Exception Rules"
msgstr "Règles d'exception"
@@ -895,21 +839,9 @@ msgid "Recurrence Date"
msgstr "Date de récurrence"
msgctxt "view:calendar.todo.rdate:"
-msgid "Recurrence Date"
-msgstr "Date de récurrence"
-
-msgctxt "view:calendar.todo.rdate:"
msgid "Recurrence Dates"
msgstr "Dates de récurrence"
-msgctxt "view:calendar.todo.rdate:"
-msgid "Recurrence Dates"
-msgstr "Dates de récurrence"
-
-msgctxt "view:calendar.todo.rrule:"
-msgid "Recurrence Rule"
-msgstr "Règle de récurrence"
-
msgctxt "view:calendar.todo.rrule:"
msgid "Recurrence Rule"
msgstr "Règle de récurrence"
@@ -918,23 +850,11 @@ msgctxt "view:calendar.todo.rrule:"
msgid "Recurrence Rules"
msgstr "Règles de récurrence"
-msgctxt "view:calendar.todo.rrule:"
-msgid "Recurrence Rules"
-msgstr "Règles de récurrence"
-
msgctxt "view:calendar.todo:"
msgid "Attendees"
msgstr "Participants"
msgctxt "view:calendar.todo:"
-msgid "Attendees"
-msgstr "Participants"
-
-msgctxt "view:calendar.todo:"
-msgid "Categories"
-msgstr "Catégories"
-
-msgctxt "view:calendar.todo:"
msgid "Categories"
msgstr "Catégories"
@@ -943,29 +863,13 @@ msgid "General"
msgstr "Général"
msgctxt "view:calendar.todo:"
-msgid "General"
-msgstr "Général"
-
-msgctxt "view:calendar.todo:"
msgid "Occurences"
msgstr "Occurrences"
msgctxt "view:calendar.todo:"
-msgid "Occurences"
-msgstr "Occurrences"
-
-msgctxt "view:calendar.todo:"
-msgid "Todo"
-msgstr "Tâche"
-
-msgctxt "view:calendar.todo:"
msgid "Todo"
msgstr "Tâche"
msgctxt "view:calendar.todo:"
msgid "Todos"
msgstr "Tâches"
-
-msgctxt "view:calendar.todo:"
-msgid "Todos"
-msgstr "Tâches"
diff --git a/locale/es_CO.po b/locale/sl_SI.po
similarity index 71%
copy from locale/es_CO.po
copy to locale/sl_SI.po
index 806d017..5e59a73 100644
--- a/locale/es_CO.po
+++ b/locale/sl_SI.po
@@ -4,155 +4,155 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Day\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Día\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na dan\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Hour\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Hora\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na uro\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Minute\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Minuto\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na minuto\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Month Day\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Día del Mes\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na dan v mesecu\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Month\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Mes\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na mesec\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Position\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Position\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na pozicijo\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Second\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Segundo\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na sekundo\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Week Number\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Número de la Semana\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na teden v letu\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Invalid \"By Year Day\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Día del Año\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na dan v letu\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.exrule:"
msgid "Only one of \"until\" and \"count\" can be set."
-msgstr "Solo un \"hasta\" y \"contar\" pude ser establecido!"
+msgstr "Nastavi se lahko samo \"do\" ali \"število\"."
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Day\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Día\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na dan\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Hour\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Hora\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na uro\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Minute\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Minuto\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na minuto\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Month Day\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Día del Mes\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na dan v mesecu\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Month\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Mes\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na mesec\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Position\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Position\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na pozicijo\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Second\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Segundo\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na sekundo\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Week Number\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Número de la Semana\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na teden v letu\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Invalid \"By Year Day\" in recurrence rule \"%s\""
-msgstr "Inválido \"Por Día del Año\" en regla recurrente \"%s\""
+msgstr "Neveljavna izbira \"Na dan v letu\" v ponovitvenem pravilu \"%s\""
msgctxt "error:calendar.todo.rrule:"
msgid "Only one of \"until\" and \"count\" can be set."
-msgstr "Solo un \"hasta\" y \"contar\" pude ser establecido!"
+msgstr "Nastavi se lahko samo \"do\" ali \"število\"."
msgctxt "error:calendar.todo:"
msgid "Todo \"%s\" can not be recurrent."
-msgstr "Tareas por Hacer \"%s\" no puede ser recurrente."
+msgstr "Todo \"%s\" se ne more ponavljati."
msgctxt "error:calendar.todo:"
msgid "UUID and recurrence must be unique in a calendar."
-msgstr "UUID y recurrencia debe ser única en un calendario."
+msgstr "UUID in ponovitev morata biti v koledarju edinstvena."
msgctxt "field:calendar.todo,alarms:"
msgid "Alarms"
-msgstr "Alarmas"
+msgstr "Alarmi"
msgctxt "field:calendar.todo,attendees:"
msgid "Attendees"
-msgstr "Asistentes"
+msgstr "Navzoči"
msgctxt "field:calendar.todo,calendar:"
msgid "Calendar"
-msgstr "Calendario"
+msgstr "Koledar"
msgctxt "field:calendar.todo,calendar_owner:"
msgid "Owner"
-msgstr "Propietario"
+msgstr "Imetnik"
msgctxt "field:calendar.todo,calendar_read_users:"
msgid "Read Users"
-msgstr "Leer Usuarios"
+msgstr "Bralci"
msgctxt "field:calendar.todo,calendar_write_users:"
msgid "Write Users"
-msgstr "Modificado por Usuario"
+msgstr "Zapisovalci"
msgctxt "field:calendar.todo,categories:"
msgid "Categories"
-msgstr "Categorías"
+msgstr "Kategorije"
msgctxt "field:calendar.todo,classification:"
msgid "Classification"
-msgstr "Clasificación"
+msgstr "Klasifikacija"
msgctxt "field:calendar.todo,completed:"
msgid "Completed"
-msgstr "Completado"
+msgstr "Zaključeno"
msgctxt "field:calendar.todo,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:calendar.todo,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:calendar.todo,description:"
msgid "Description"
-msgstr "Descripción"
+msgstr "Opis"
msgctxt "field:calendar.todo,dtstart:"
msgid "Start Date"
-msgstr "Fecha Inicio"
+msgstr "Začetni datum"
msgctxt "field:calendar.todo,due:"
msgid "Due Date"
-msgstr "Fecha Debida"
+msgstr "Zapadlost"
msgctxt "field:calendar.todo,exdates:"
msgid "Exception Dates"
-msgstr "Fechas de Excepción"
+msgstr "Izjemni datumi"
msgctxt "field:calendar.todo,exrules:"
msgid "Exception Rules"
-msgstr "Reglas de Excepción"
+msgstr "Izjemna pravila"
msgctxt "field:calendar.todo,id:"
msgid "ID"
@@ -160,55 +160,55 @@ msgstr "ID"
msgctxt "field:calendar.todo,location:"
msgid "Location"
-msgstr "Lugar"
+msgstr "Lokacija"
msgctxt "field:calendar.todo,occurences:"
msgid "Occurences"
-msgstr "Ocurrencias"
+msgstr "Pojavljanje"
msgctxt "field:calendar.todo,organizer:"
msgid "Organizer"
-msgstr "Organizador"
+msgstr "Organizator"
msgctxt "field:calendar.todo,parent:"
msgid "Parent"
-msgstr "Padre"
+msgstr "Prednik"
msgctxt "field:calendar.todo,percent_complete:"
msgid "Percent complete"
-msgstr "Porcentaje completo"
+msgstr "Odstotek zaključenega"
msgctxt "field:calendar.todo,rdates:"
msgid "Recurrence Dates"
-msgstr "Fechas de Repetición"
+msgstr "Datumi ponovitev"
msgctxt "field:calendar.todo,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:calendar.todo,recurrence:"
msgid "Recurrence"
-msgstr "Repetición"
+msgstr "Ponovitev"
msgctxt "field:calendar.todo,rrules:"
msgid "Recurrence Rules"
-msgstr "Reglas de Repetición"
+msgstr "Pravila ponovitev"
msgctxt "field:calendar.todo,sequence:"
msgid "Sequence"
-msgstr "Secuencia"
+msgstr "Zap.št."
msgctxt "field:calendar.todo,status:"
msgid "Status"
-msgstr "Estado"
+msgstr "Status"
msgctxt "field:calendar.todo,summary:"
msgid "Summary"
-msgstr "Resumen"
+msgstr "Povzetek"
msgctxt "field:calendar.todo,timezone:"
msgid "Timezone"
-msgstr "Zona horaria"
+msgstr "Časovni pas"
msgctxt "field:calendar.todo,uuid:"
msgid "UUID"
@@ -216,27 +216,27 @@ msgstr "UUID"
msgctxt "field:calendar.todo,vtodo:"
msgid "vtodo"
-msgstr "v- por hacer"
+msgstr "vtodo"
msgctxt "field:calendar.todo,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:calendar.todo,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:calendar.todo-calendar.category,category:"
msgid "Category"
-msgstr "Categoría"
+msgstr "Kategorija"
msgctxt "field:calendar.todo-calendar.category,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:calendar.todo-calendar.category,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:calendar.todo-calendar.category,id:"
msgid "ID"
@@ -244,27 +244,27 @@ msgstr "ID"
msgctxt "field:calendar.todo-calendar.category,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:calendar.todo-calendar.category,todo:"
msgid "To-Do"
-msgstr "Por Hacer"
+msgstr "To-Do"
msgctxt "field:calendar.todo-calendar.category,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:calendar.todo-calendar.category,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:calendar.todo.alarm,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:calendar.todo.alarm,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:calendar.todo.alarm,id:"
msgid "ID"
@@ -272,39 +272,39 @@ msgstr "ID"
msgctxt "field:calendar.todo.alarm,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:calendar.todo.alarm,todo:"
msgid "Todo"
-msgstr "Por Hacer"
+msgstr "Todo"
msgctxt "field:calendar.todo.alarm,valarm:"
msgid "valarm"
-msgstr "valarma"
+msgstr "valarm"
msgctxt "field:calendar.todo.alarm,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:calendar.todo.alarm,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:calendar.todo.attendee,attendee:"
msgid "attendee"
-msgstr "Asistente"
+msgstr "Navzoči"
msgctxt "field:calendar.todo.attendee,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:calendar.todo.attendee,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:calendar.todo.attendee,email:"
msgid "Email"
-msgstr "Correo Electrónico"
+msgstr "E-pošta"
msgctxt "field:calendar.todo.attendee,id:"
msgid "ID"
@@ -312,39 +312,39 @@ msgstr "ID"
msgctxt "field:calendar.todo.attendee,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:calendar.todo.attendee,status:"
msgid "Participation Status"
-msgstr "Estado de Participación"
+msgstr "Status udeleženca"
msgctxt "field:calendar.todo.attendee,todo:"
msgid "Todo"
-msgstr "Por Hacer"
+msgstr "Todo"
msgctxt "field:calendar.todo.attendee,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:calendar.todo.attendee,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:calendar.todo.exdate,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:calendar.todo.exdate,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:calendar.todo.exdate,date:"
msgid "Is Date"
-msgstr "Esta Fecha"
+msgstr "Je datum"
msgctxt "field:calendar.todo.exdate,datetime:"
msgid "Date"
-msgstr "Fecha"
+msgstr "Datum"
msgctxt "field:calendar.todo.exdate,id:"
msgid "ID"
@@ -352,71 +352,71 @@ msgstr "ID"
msgctxt "field:calendar.todo.exdate,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:calendar.todo.exdate,todo:"
msgid "Todo"
-msgstr "Por Hacer"
+msgstr "Todo"
msgctxt "field:calendar.todo.exdate,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:calendar.todo.exdate,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:calendar.todo.exrule,byday:"
msgid "By Day"
-msgstr "Por Día"
+msgstr "Na dan"
msgctxt "field:calendar.todo.exrule,byhour:"
msgid "By Hour"
-msgstr "Por Hora"
+msgstr "Na uro"
msgctxt "field:calendar.todo.exrule,byminute:"
msgid "By Minute"
-msgstr "Por Minuto"
+msgstr "Na minuto"
msgctxt "field:calendar.todo.exrule,bymonth:"
msgid "By Month"
-msgstr "Por Mes"
+msgstr "Na mesec"
msgctxt "field:calendar.todo.exrule,bymonthday:"
msgid "By Month Day"
-msgstr "Por Día del Mes"
+msgstr "Na dan v mesecu"
msgctxt "field:calendar.todo.exrule,bysecond:"
msgid "By Second"
-msgstr "Por Segundo"
+msgstr "Na sekundo"
msgctxt "field:calendar.todo.exrule,bysetpos:"
msgid "By Position"
-msgstr "Por Posición"
+msgstr "Na pozicijo"
msgctxt "field:calendar.todo.exrule,byweekno:"
msgid "By Week Number"
-msgstr "Por Número de la Semana"
+msgstr "Na teden v letu"
msgctxt "field:calendar.todo.exrule,byyearday:"
msgid "By Year Day"
-msgstr "Por Día del Año"
+msgstr "Na dan v letu"
msgctxt "field:calendar.todo.exrule,count:"
msgid "Count"
-msgstr "Contar"
+msgstr "Število"
msgctxt "field:calendar.todo.exrule,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:calendar.todo.exrule,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:calendar.todo.exrule,freq:"
msgid "Frequency"
-msgstr "Frecuencia"
+msgstr "Frekvenca"
msgctxt "field:calendar.todo.exrule,id:"
msgid "ID"
@@ -424,51 +424,51 @@ msgstr "ID"
msgctxt "field:calendar.todo.exrule,interval:"
msgid "Interval"
-msgstr "Intervalo"
+msgstr "Interval"
msgctxt "field:calendar.todo.exrule,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:calendar.todo.exrule,todo:"
msgid "Todo"
-msgstr "Por Hacer"
+msgstr "Todo"
msgctxt "field:calendar.todo.exrule,until:"
msgid "Until Date"
-msgstr "Hasta la Fecha"
+msgstr "Do dne"
msgctxt "field:calendar.todo.exrule,until_date:"
msgid "Is Date"
-msgstr "Esta Fecha"
+msgstr "Je datum"
msgctxt "field:calendar.todo.exrule,wkst:"
msgid "Week Day"
-msgstr "Día de la Semana"
+msgstr "Dan v tednu"
msgctxt "field:calendar.todo.exrule,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:calendar.todo.exrule,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:calendar.todo.rdate,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:calendar.todo.rdate,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:calendar.todo.rdate,date:"
msgid "Is Date"
-msgstr "Esta Fecha"
+msgstr "Je datum"
msgctxt "field:calendar.todo.rdate,datetime:"
msgid "Date"
-msgstr "Fecha"
+msgstr "Datum"
msgctxt "field:calendar.todo.rdate,id:"
msgid "ID"
@@ -476,71 +476,71 @@ msgstr "ID"
msgctxt "field:calendar.todo.rdate,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:calendar.todo.rdate,todo:"
msgid "Todo"
-msgstr "Por Hacer"
+msgstr "Todo"
msgctxt "field:calendar.todo.rdate,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:calendar.todo.rdate,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:calendar.todo.rrule,byday:"
msgid "By Day"
-msgstr "Por Día"
+msgstr "Na dan"
msgctxt "field:calendar.todo.rrule,byhour:"
msgid "By Hour"
-msgstr "Por Hora"
+msgstr "Na uro"
msgctxt "field:calendar.todo.rrule,byminute:"
msgid "By Minute"
-msgstr "Por Minuto"
+msgstr "Na minuto"
msgctxt "field:calendar.todo.rrule,bymonth:"
msgid "By Month"
-msgstr "Por Mes"
+msgstr "Na mesec"
msgctxt "field:calendar.todo.rrule,bymonthday:"
msgid "By Month Day"
-msgstr "Por Día del Mes"
+msgstr "Na dan v mesecu"
msgctxt "field:calendar.todo.rrule,bysecond:"
msgid "By Second"
-msgstr "Por Segundo"
+msgstr "Na sekundo"
msgctxt "field:calendar.todo.rrule,bysetpos:"
msgid "By Position"
-msgstr "Por Posición"
+msgstr "Na pozicijo"
msgctxt "field:calendar.todo.rrule,byweekno:"
msgid "By Week Number"
-msgstr "Por Número de la Semana"
+msgstr "Na teden v letu"
msgctxt "field:calendar.todo.rrule,byyearday:"
msgid "By Year Day"
-msgstr "Por Día del Año"
+msgstr "Na dan v letu"
msgctxt "field:calendar.todo.rrule,count:"
msgid "Count"
-msgstr "Contar"
+msgstr "Število"
msgctxt "field:calendar.todo.rrule,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:calendar.todo.rrule,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:calendar.todo.rrule,freq:"
msgid "Frequency"
-msgstr "Frecuencia"
+msgstr "Frekvenca"
msgctxt "field:calendar.todo.rrule,id:"
msgid "ID"
@@ -548,334 +548,328 @@ msgstr "ID"
msgctxt "field:calendar.todo.rrule,interval:"
msgid "Interval"
-msgstr "Intervalo"
+msgstr "Interval"
msgctxt "field:calendar.todo.rrule,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:calendar.todo.rrule,todo:"
msgid "Todo"
-msgstr "Por Hacer"
+msgstr "Todo"
msgctxt "field:calendar.todo.rrule,until:"
msgid "Until Date"
-msgstr "Hasta la Fecha"
+msgstr "Do dne"
msgctxt "field:calendar.todo.rrule,until_date:"
msgid "Is Date"
-msgstr "Esta Fecha"
+msgstr "Je datum"
msgctxt "field:calendar.todo.rrule,wkst:"
msgid "Week Day"
-msgstr "Día de la Semana"
+msgstr "Dan v tednu"
msgctxt "field:calendar.todo.rrule,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:calendar.todo.rrule,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "help:calendar.todo,uuid:"
msgid "Universally Unique Identifier"
-msgstr "Identificador Único Universal"
+msgstr "Vsesplošno edinstven identifikator"
msgctxt "help:calendar.todo.exdate,date:"
msgid "Ignore time of field \"Date\", but handle as date only."
-msgstr "Ignore tiempo del campo \"Fecha\", pero manejelo como fecha solamente."
+msgstr "Prezri čas v polju \"Datum\" in ga samo obravnavaj kot datum."
msgctxt "help:calendar.todo.exrule,until_date:"
msgid "Ignore time of field \"Until Date\", but handle as date only."
-msgstr ""
-"Ignore tiempo del campo \"Hasta la Fecha\", pero manejelo como fecha "
-"solamente."
+msgstr "Prezri čas v polju \"Do dne\" in ga samo obravnavaj kot datum."
msgctxt "help:calendar.todo.rdate,date:"
msgid "Ignore time of field \"Date\", but handle as date only."
-msgstr "Ignore tiempo del campo \"Fecha\", pero manejelo como fecha solamente."
+msgstr "Prezri čas v polju \"Datum\" in ga samo obravnavaj kot datum."
msgctxt "help:calendar.todo.rrule,until_date:"
msgid "Ignore time of field \"Until Date\", but handle as date only."
-msgstr ""
-"Ignore tiempo del campo \"Hasta la Fecha\", pero manejelo como fecha "
-"solamente."
+msgstr "Prezri čas v polju \"Do dne\" in ga samo obravnavaj kot datum."
msgctxt "model:calendar.todo,name:"
msgid "Todo"
-msgstr "Por Hacer"
+msgstr "Todo"
msgctxt "model:calendar.todo-calendar.category,name:"
msgid "Todo - Category"
-msgstr "Por Hacer - Categoria"
+msgstr "Todo - Kategorija"
msgctxt "model:calendar.todo.alarm,name:"
msgid "Alarm"
-msgstr "Alarma"
+msgstr "Alarm"
msgctxt "model:calendar.todo.attendee,name:"
msgid "Attendee"
-msgstr "Asistente"
+msgstr "Navzoči"
msgctxt "model:calendar.todo.exdate,name:"
msgid "Exception Date"
-msgstr "Fecha de Excepción"
+msgstr "Izjemni datum"
msgctxt "model:calendar.todo.exrule,name:"
msgid "Exception Rule"
-msgstr "Regla de Excepción"
+msgstr "Izjemno pravilo"
msgctxt "model:calendar.todo.rdate,name:"
msgid "Todo Recurrence Date"
-msgstr "Fecha de Repetición"
+msgstr "Todo datum ponovitve"
msgctxt "model:calendar.todo.rrule,name:"
msgid "Recurrence Rule"
-msgstr "Regla de Repetición"
+msgstr "Pravilo ponovitve"
msgctxt "model:ir.action,name:act_todo_form"
msgid "Todos"
-msgstr "Por hacer"
+msgstr "Todoji"
msgctxt "model:ir.action,name:act_todo_form3"
msgid "Todos"
-msgstr "Por hacer"
+msgstr "Todoji"
msgctxt "model:ir.ui.menu,name:menu_todo_form"
msgid "Todos"
-msgstr "Por hacer"
+msgstr "Todoji"
msgctxt "selection:calendar.todo,classification:"
msgid "Confidential"
-msgstr "Confidencial"
+msgstr "Zaupno"
msgctxt "selection:calendar.todo,classification:"
msgid "Private"
-msgstr "Privado"
+msgstr "Zasebno"
msgctxt "selection:calendar.todo,classification:"
msgid "Public"
-msgstr "Público"
+msgstr "Javno"
-#, fuzzy
msgctxt "selection:calendar.todo,status:"
msgid ""
-msgstr "Punto de Orden"
+msgstr ""
msgctxt "selection:calendar.todo,status:"
msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Preklicano"
msgctxt "selection:calendar.todo,status:"
msgid "Completed"
-msgstr "Completado"
+msgstr "Zaključeno"
msgctxt "selection:calendar.todo,status:"
msgid "In-Process"
-msgstr "En-Proceso"
+msgstr "V teku"
msgctxt "selection:calendar.todo,status:"
msgid "Needs-Action"
-msgstr "Necesita una Acción"
+msgstr "Potreben ukrep"
-#, fuzzy
msgctxt "selection:calendar.todo.attendee,status:"
msgid ""
-msgstr "Punto de Orden"
+msgstr ""
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Accepted"
-msgstr "Aceptado"
+msgstr "Sprejeto"
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Declined"
-msgstr "Declinado"
+msgstr "Zavrnjeno"
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Delegated"
-msgstr "Delegado"
+msgstr "Delegirano"
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Needs Action"
-msgstr "Necesita una Acción"
+msgstr "Potreben ukrep"
msgctxt "selection:calendar.todo.attendee,status:"
msgid "Tentative"
-msgstr "Tentativa"
+msgstr "Negotovo"
msgctxt "selection:calendar.todo.exrule,freq:"
msgid "Daily"
-msgstr "Diario"
+msgstr "Dnevno"
msgctxt "selection:calendar.todo.exrule,freq:"
msgid "Hourly"
-msgstr "Cada Hora"
+msgstr "Na uro"
msgctxt "selection:calendar.todo.exrule,freq:"
msgid "Minutely"
-msgstr "Cada Minuto"
+msgstr "Na minuto"
msgctxt "selection:calendar.todo.exrule,freq:"
msgid "Monthly"
-msgstr "Mensualmente"
+msgstr "Mesečno"
msgctxt "selection:calendar.todo.exrule,freq:"
msgid "Secondly"
-msgstr "En segundo lugar"
+msgstr "Na sekundo"
msgctxt "selection:calendar.todo.exrule,freq:"
msgid "Weekly"
-msgstr "Semanalmente"
+msgstr "Tedensko"
msgctxt "selection:calendar.todo.exrule,freq:"
msgid "Yearly"
-msgstr "Anualmente"
+msgstr "Letno"
msgctxt "selection:calendar.todo.exrule,wkst:"
msgid "Friday"
-msgstr "Viernes"
+msgstr "Petek"
msgctxt "selection:calendar.todo.exrule,wkst:"
msgid "Monday"
-msgstr "Lunes"
+msgstr "Ponedeljek"
msgctxt "selection:calendar.todo.exrule,wkst:"
msgid "Saturday"
-msgstr "Sábado"
+msgstr "Sobota"
msgctxt "selection:calendar.todo.exrule,wkst:"
msgid "Sunday"
-msgstr "Domingo"
+msgstr "Nedelja"
msgctxt "selection:calendar.todo.exrule,wkst:"
msgid "Thursday"
-msgstr "Jueves"
+msgstr "Četrtek"
msgctxt "selection:calendar.todo.exrule,wkst:"
msgid "Tuesday"
-msgstr "Martes"
+msgstr "Torek"
msgctxt "selection:calendar.todo.exrule,wkst:"
msgid "Wednesday"
-msgstr "Miércoles"
+msgstr "Sreda"
msgctxt "selection:calendar.todo.rrule,freq:"
msgid "Daily"
-msgstr "Diario"
+msgstr "Dnevno"
msgctxt "selection:calendar.todo.rrule,freq:"
msgid "Hourly"
-msgstr "Cada Hora"
+msgstr "Na uro"
msgctxt "selection:calendar.todo.rrule,freq:"
msgid "Minutely"
-msgstr "Cada Minuto"
+msgstr "Na minuto"
msgctxt "selection:calendar.todo.rrule,freq:"
msgid "Monthly"
-msgstr "Mensualmente"
+msgstr "Mesečno"
msgctxt "selection:calendar.todo.rrule,freq:"
msgid "Secondly"
-msgstr "En segundo lugar"
+msgstr "Na sekundo"
msgctxt "selection:calendar.todo.rrule,freq:"
msgid "Weekly"
-msgstr "Semanalmente"
+msgstr "Tedensko"
msgctxt "selection:calendar.todo.rrule,freq:"
msgid "Yearly"
-msgstr "Anualmente"
+msgstr "Letno"
msgctxt "selection:calendar.todo.rrule,wkst:"
msgid "Friday"
-msgstr "Viernes"
+msgstr "Petek"
msgctxt "selection:calendar.todo.rrule,wkst:"
msgid "Monday"
-msgstr "Lunes"
+msgstr "Ponedeljek"
msgctxt "selection:calendar.todo.rrule,wkst:"
msgid "Saturday"
-msgstr "Sábado"
+msgstr "Sobota"
msgctxt "selection:calendar.todo.rrule,wkst:"
msgid "Sunday"
-msgstr "Domingo"
+msgstr "Nedelja"
msgctxt "selection:calendar.todo.rrule,wkst:"
msgid "Thursday"
-msgstr "Jueves"
+msgstr "Četrtek"
msgctxt "selection:calendar.todo.rrule,wkst:"
msgid "Tuesday"
-msgstr "Martes"
+msgstr "Torek"
msgctxt "selection:calendar.todo.rrule,wkst:"
msgid "Wednesday"
-msgstr "Miércoles"
+msgstr "Sreda"
msgctxt "view:calendar.todo.attendee:"
msgid "Attendee"
-msgstr "Asistente"
+msgstr "Navzoči"
msgctxt "view:calendar.todo.attendee:"
msgid "Attendees"
-msgstr "Asistentes"
+msgstr "Navzoči"
msgctxt "view:calendar.todo.exdate:"
msgid "Exception Date"
-msgstr "Fecha de Excepción"
+msgstr "Izjemni datum"
msgctxt "view:calendar.todo.exdate:"
msgid "Exception Dates"
-msgstr "Fechas de Excepción"
+msgstr "Izjemni datumi"
msgctxt "view:calendar.todo.exrule:"
msgid "Exception Rule"
-msgstr "Regla de Excepción"
+msgstr "Izjemno pravilo"
msgctxt "view:calendar.todo.exrule:"
msgid "Exception Rules"
-msgstr "Reglas de Excepción"
+msgstr "Izjemna pravila"
msgctxt "view:calendar.todo.rdate:"
msgid "Recurrence Date"
-msgstr "Fecha de Repetición"
+msgstr "Datum ponovitve"
msgctxt "view:calendar.todo.rdate:"
msgid "Recurrence Dates"
-msgstr "Fechas de Repetición"
+msgstr "Datumi ponovitev"
msgctxt "view:calendar.todo.rrule:"
msgid "Recurrence Rule"
-msgstr "Regla de Repetición"
+msgstr "Pravilo ponovitve"
msgctxt "view:calendar.todo.rrule:"
msgid "Recurrence Rules"
-msgstr "Reglas de Repetición"
+msgstr "Pravila ponovitev"
msgctxt "view:calendar.todo:"
msgid "Attendees"
-msgstr "Asistentes"
+msgstr "Navzoči"
msgctxt "view:calendar.todo:"
msgid "Categories"
-msgstr "Categorías"
+msgstr "Kategorije"
msgctxt "view:calendar.todo:"
msgid "General"
-msgstr "General"
+msgstr "Splošno"
msgctxt "view:calendar.todo:"
msgid "Occurences"
-msgstr "Ocurrencias"
+msgstr "Pojavljanje"
msgctxt "view:calendar.todo:"
msgid "Todo"
-msgstr "Por Hacer"
+msgstr "Todo"
msgctxt "view:calendar.todo:"
msgid "Todos"
-msgstr "Por hacer"
+msgstr "Todoji"
diff --git a/setup.py b/setup.py
index c64c9d6..60eaaa3 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,8 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = ['vobject >= 0.8.0', 'PyWebDAV >= 0.9.8', 'python-dateutil', 'pytz']
+requires = ['vobject >= 0.8.0', 'PyWebDAV >= 0.9.8', 'python-dateutil', 'pytz',
+ 'python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -64,6 +65,7 @@ setup(name='trytond_calendar_todo',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 62e4f36..7593e9a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_calendar_todo import suite
+
+__all__ = ['suite']
diff --git a/todo.py b/todo.py
index 1a81bbc..fd41a04 100644
--- a/todo.py
+++ b/todo.py
@@ -6,9 +6,11 @@ import dateutil.tz
import pytz
import datetime
import xml.dom.minidom
+from sql import Table, Column
+
from trytond.model import ModelSQL, ModelView, fields
from trytond.tools import reduce_ids
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.pyson import Eval, If, Bool
from trytond.transaction import Transaction
from trytond.pool import Pool
@@ -191,7 +193,7 @@ class Todo(ModelSQL, ModelView):
@classmethod
def validate(cls, todos):
- super(todos, cls).validate(todos)
+ super(Todo, cls).validate(todos)
for todo in todos:
todo.check_recurrence()
@@ -298,6 +300,7 @@ class Todo(ModelSQL, ModelView):
pool = Pool()
Calendar = pool.get('calendar.calendar')
Collection = pool.get('webdav.collection')
+ table = cls.__table__()
cursor = Transaction().cursor
@@ -310,10 +313,11 @@ class Todo(ModelSQL, ModelView):
ids = [t.id for t in todos]
for i in range(0, len(ids), cursor.IN_MAX):
sub_ids = ids[i:i + cursor.IN_MAX]
- red_sql, red_ids = reduce_ids('id', sub_ids)
- cursor.execute('UPDATE "' + cls._table + '" '
- 'SET sequence = sequence + 1 '
- 'WHERE ' + red_sql, red_ids)
+ red_sql = reduce_ids(table.id, sub_ids)
+ cursor.execute(*table.update(
+ columns=[table.sequence],
+ values=[table.sequence + 1],
+ where=red_sql))
for todo in todos:
if (todo.calendar.owner
@@ -879,7 +883,9 @@ class TodoRDate(DateMixin, ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
+ sql_table = cls.__table__()
# Migration from 1.4: calendar_rdate renamed to calendar_date
table = TableHandler(cursor, cls, module_name)
old_column = 'calendar_rdate'
@@ -892,13 +898,13 @@ class TodoRDate(DateMixin, ModelSQL, ModelView):
# Migration from 2.6: Remove inherits calendar.date
if table.column_exist('calendar_date'):
- cursor.execute('UPDATE "' + cls._table + '" AS e '
- 'SET date = (SELECT a.date '
- 'FROM calendar_date AS a '
- 'WHERE a.id = e.calendar_date), '
- 'datetime = (SELECT a.datetime '
- 'FROM calendar_date AS a '
- 'WHERE a.id = e.calendar_date)')
+ date = Table('calendar_date')
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.date, sql_table.datetime],
+ values=[date.select(date.date,
+ where=date.id == sql_table.calendar_date),
+ date.select(date.datetime,
+ where=date.id == sql_table.calendar_date)]))
table.drop_column('calendar_date', True)
@classmethod
@@ -944,7 +950,9 @@ class TodoRRule(RRuleMixin, ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
+ sql_table = cls.__table__()
super(TodoRRule, cls).__register__(module_name)
@@ -952,13 +960,13 @@ class TodoRRule(RRuleMixin, ModelSQL, ModelView):
# Migration from 2.6: Remove inherits calendar.rrule
if table.column_exist('calendar_rrule'):
+ rrule = Table('calendar_rrule')
for field in (f for f in dir(RRuleMixin)
if isinstance(f, fields.Field)):
- cursor.execute(('UPDATE "' + cls._table + '" AS e '
- 'SET "%(field)s" = (SELECT a."%(field)s" '
- 'FROM calendar_rrule AS r '
- 'WHERE r.id = e.calendar_rrule)')
- % {'field': field})
+ cursor.execute(*sql_table.update(
+ columns=[Column(sql_table, field)],
+ values=[rrule.select(Column(rrule, field),
+ where=rrule.id == sql_table.calendar_rrule)]))
table.drop_column('calendar_rrule', True)
@classmethod
@@ -1015,7 +1023,9 @@ class TodoAttendee(AttendeeMixin, ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
+ sql_table = cls.__table__()
super(TodoAttendee, cls).__register__(module_name)
@@ -1023,13 +1033,14 @@ class TodoAttendee(AttendeeMixin, ModelSQL, ModelView):
# Migration from 2.6: Remove inherits calendar.attendee
if table.column_exist('calendar_attendee'):
- cursor.execute('UPDATE "' + cls._table + '" AS e '
- 'SET email = (SELECT a.email '
- 'FROM calendar_attendee AS a '
- 'WHERE a.id = e.calendar_attendee), '
- 'status = (SELECT a.status '
- 'FROM calendar_attendee AS a '
- 'WHERE a.id = e.calendar_attendee)')
+ attendee = Table('calendar_attendee')
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.email, sql_table.status],
+ values=[attendee.select(attendee.email,
+ where=attendee.id == sql_table.calendar_attendee),
+ attendee.select(attendee.status,
+ where=
+ attendee.id == sql_table.calendar_attendee)]))
table.drop_column('calendar_attendee', True)
@classmethod
@@ -1177,7 +1188,9 @@ class TodoAlarm(AlarmMixin, ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
+ sql_table = cls.__table__()
super(TodoAlarm, cls).__register__(module_name)
@@ -1185,10 +1198,11 @@ class TodoAlarm(AlarmMixin, ModelSQL, ModelView):
# Migration from 2.6: Remove inherits calendar.alarm
if table.column_exist('calendar_alarm'):
- cursor.execute('UPDATE "' + cls._table + '" AS t '
- 'SET valarm = (SELECT a.valarm '
- 'FROM calendar_alarm AS a '
- 'WHERE a.id = t.calendar_alarm)')
+ alarm = Table('calendar_alarm')
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.valarm],
+ values=[alarm.select(alarm.valarm,
+ where=alarm.id == sql_table.calendar_alarm)]))
table.drop_column('calendar_alarm', True)
@classmethod
diff --git a/todo.xml b/todo.xml
index 23e37d0..b0d1bfa 100644
--- a/todo.xml
+++ b/todo.xml
@@ -27,7 +27,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_todo_form">
<field name="name">Todos</field>
<field name="res_model">calendar.todo</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_todo_form_view1">
<field name="sequence" eval="10"/>
@@ -45,7 +45,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_todo_form3">
<field name="name">Todos</field>
<field name="res_model">calendar.todo</field>
- <field name="domain">[('parent', '=', False), ('calendar', '=', Eval('active_id'))]</field>
+ <field name="domain">[('parent', '=', None), ('calendar', '=', Eval('active_id'))]</field>
</record>
<record model="ir.action.act_window.view" id="act_todo_form3_view1">
<field name="sequence" eval="10"/>
diff --git a/tryton.cfg b/tryton.cfg
index aae9557..3141578 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
calendar
ir
diff --git a/trytond_calendar_todo.egg-info/PKG-INFO b/trytond_calendar_todo.egg-info/PKG-INFO
index fa2a896..3a42499 100644
--- a/trytond_calendar_todo.egg-info/PKG-INFO
+++ b/trytond_calendar_todo.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-calendar-todo
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add TODO on CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_calendar_todo
=====================
@@ -61,6 +61,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_calendar_todo.egg-info/SOURCES.txt b/trytond_calendar_todo.egg-info/SOURCES.txt
index 35807aa..7eab3a2 100644
--- a/trytond_calendar_todo.egg-info/SOURCES.txt
+++ b/trytond_calendar_todo.egg-info/SOURCES.txt
@@ -23,6 +23,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_calendar_todo.egg-info/PKG-INFO
trytond_calendar_todo.egg-info/SOURCES.txt
trytond_calendar_todo.egg-info/dependency_links.txt
diff --git a/trytond_calendar_todo.egg-info/requires.txt b/trytond_calendar_todo.egg-info/requires.txt
index d08f9d2..4636bab 100644
--- a/trytond_calendar_todo.egg-info/requires.txt
+++ b/trytond_calendar_todo.egg-info/requires.txt
@@ -2,5 +2,6 @@ vobject >= 0.8.0
PyWebDAV >= 0.9.8
python-dateutil
pytz
-trytond_calendar >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond_calendar >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index 4fab749..5093fe3 100644
--- a/webdav.py
+++ b/webdav.py
@@ -3,6 +3,10 @@
import vobject
import urllib
from pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
+from sql.functions import Extract
+from sql.conditionals import Coalesce
+from sql.aggregate import Max
+
from trytond.tools import reduce_ids
from trytond.transaction import Transaction
from trytond.cache import Cache
@@ -149,6 +153,7 @@ class Collection:
@classmethod
def get_creationdate(cls, uri, cache=None):
Todo = Pool().get('calendar.todo')
+ todo = Todo.__table__()
cursor = Transaction().cursor
@@ -174,11 +179,10 @@ class Collection:
res = None
for i in range(0, len(ids), cursor.IN_MAX):
sub_ids = ids[i:i + cursor.IN_MAX]
- red_sql, red_ids = reduce_ids('id', sub_ids)
- cursor.execute('SELECT id, '
- 'EXTRACT(epoch FROM create_date) '
- 'FROM "' + Todo.__table__ + '" '
- 'WHERE ' + red_sql, red_ids)
+ red_sql = reduce_ids(todo.id, sub_ids)
+ cursor.execute(*todo.select(todo.id,
+ Extract('EPOCH', todo.create_date),
+ where=red_sql))
for todo_id2, date in cursor.fetchall():
if todo_id2 == todo_id:
res = date
@@ -195,6 +199,7 @@ class Collection:
@classmethod
def get_lastmodified(cls, uri, cache=None):
Todo = Pool().get('calendar.todo')
+ todo = Todo.__table__()
cursor = Transaction().cursor
@@ -217,16 +222,13 @@ class Collection:
res = None
for i in range(0, len(ids), cursor.IN_MAX / 2):
sub_ids = ids[i:i + cursor.IN_MAX / 2]
- red_id_sql, red_id_ids = reduce_ids('id', sub_ids)
- red_parent_sql, red_parent_ids = reduce_ids('parent',
- sub_ids)
- cursor.execute('SELECT COALESCE(parent, id), '
- 'MAX(EXTRACT(epoch FROM '
- 'COALESCE(write_date, create_date))) '
- 'FROM "' + Todo.__table__ + '" '
- 'WHERE ' + red_id_sql + ' '
- 'OR ' + red_parent_sql + ' '
- 'GROUP BY parent, id', red_id_ids + red_parent_ids)
+ red_id_sql = reduce_ids(todo.id, sub_ids)
+ red_parent_sql = reduce_ids(todo.parent, sub_ids)
+ cursor.execute(*todo.select(Coalesce(todo.parent, todo.id),
+ Max(Extract('EPOCH', Coalesce(todo.write_date,
+ todo.create_date))),
+ where=red_id_sql | red_parent_sql,
+ group_by=(todo.parent, todo.id)))
for todo_id2, date in cursor.fetchall():
if todo_id2 == todo_id:
res = date
--
tryton-modules-calendar-todo
More information about the tryton-debian-vcs
mailing list