From 7ea19609cc823891ebe0332cc93212c921ad1880 Mon Sep 17 00:00:00 2001
From: acracia <acracia0.2@gmail.com>
Date: Fri, 23 Oct 2009 20:08:16 +0000
Subject:  last changes

---
diff --git a/locale/ca/LC_MESSAGES/django.po b/locale/ca/LC_MESSAGES/django.po
index 4a0ab30..79eb233 100755
--- a/locale/ca/LC_MESSAGES/django.po
+++ b/locale/ca/LC_MESSAGES/django.po
@@ -9,40 +9,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Infopoint 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 00:58+0200\n"
+"POT-Creation-Date: 2009-04-14 12:47+0200\n"
 "PO-Revision-Date: 2008-08-31 22:42+0200\n"
 "Last-Translator: root <(null)>\n"
 "Language-Team: English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: agenda/models.py:38
+msgid "how many people fits here?"
+msgstr ""
+
+#: agenda/models.py:80
+msgid "event start"
+msgstr ""
+
+#: agenda/models.py:81
+msgid "event end"
+msgstr ""
+
+#: agenda/models.py:124
+msgid "Is this todo public?"
+msgstr ""
+
+#: agenda/models.py:126
+msgid "When do we need it"
+msgstr ""
+
+#: agenda/models.py:163
+msgid "Confirm your assistance to the event"
+msgstr ""
+
+#: agenda/models.py:164
+msgid "Last update"
+msgstr ""
+
+#: agenda/models.py:165
+msgid "Let others know why you can't come to the event (optional)"
+msgstr ""
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/comments/base.html:17 templates/flatpages/base.html:24
-#: templates/polls/base.html:17 templates/sites/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
+#: templates/sites/base.html:17
 msgid "Welcome,"
 msgstr "Benvingut,"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/admin_doc/bookmarklets.html:3 templates/agenda/base.html:17
-#: templates/blog/base.html:17 templates/comments/base.html:17
-#: templates/flatpages/base.html:24 templates/polls/base.html:17
-#: templates/sites/base.html:17
+#: templates/admin_doc/bookmarklets.html:3 templates/agenda/base.html:22
+#: templates/blog/base.html:17 templates/flatpages/base.html:24
+#: templates/polls/base.html:18 templates/sites/base.html:17
 msgid "Documentation"
 msgstr "Documentació"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/comments/base.html:17 templates/flatpages/base.html:24
-#: templates/polls/base.html:17 templates/sites/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
+#: templates/sites/base.html:17
 msgid "Change password"
 msgstr "Cambiar el password"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/comments/base.html:17 templates/flatpages/base.html:24
-#: templates/polls/base.html:17 templates/sites/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
+#: templates/sites/base.html:17
 msgid "Log out"
 msgstr "Surt"
 
@@ -61,11 +92,11 @@ msgstr "·Models disponibles a l'aplicacio  %(name)s·"
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: templates/admin/index.html:29
+#: templates/admin/index.html:29 templates/agenda/one_event.html:103
 msgid "Add"
 msgstr "Afegir"
 
-#: templates/admin/index.html:35 templates/agenda/location_events.html:22
+#: templates/admin/index.html:35 templates/agenda/location_events.html:43
 msgid "Change"
 msgstr "Cambia"
 
@@ -113,7 +144,8 @@ msgstr "Documentacio per aquesta pagina"
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
-msgstr "ves a la pagina de la documentacio per la vista que ha generat la pagina"
+msgstr ""
+"ves a la pagina de la documentacio per la vista que ha generat la pagina"
 
 #: templates/admin_doc/bookmarklets.html:21
 msgid "Show object ID"
@@ -123,7 +155,9 @@ msgstr "Mostrar la ID de l'objecte"
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
-msgstr "Mostra els tipus de continguts i les ID uniques per les pagines que representen un unic objecte"
+msgstr ""
+"Mostra els tipus de continguts i les ID uniques per les pagines que "
+"representen un unic objecte"
 
 #: templates/admin_doc/bookmarklets.html:24
 msgid "Edit this object (current window)"
@@ -141,15 +175,61 @@ msgstr "Edita l'ojecte (nova finestra)"
 msgid "As above, but opens the admin page in a new window."
 msgstr "Com abans, pero obrint la pagina d'administracio en una nova finestra."
 
+#: templates/agenda/add_event_to_group.html:3
+msgid "Add event to group"
+msgstr ""
+
+#: templates/agenda/add_event_to_group.html:4 templates/agenda/add_todo.html:5
+msgid "Add another task"
+msgstr ""
+
+#: templates/agenda/add_new_event.html:8 templates/agenda/add_new_event.html:9
+#: templates/agenda/add_new_event.html:10
+#: templates/agenda/add_new_event.html:14
+msgid "Add new event"
+msgstr ""
+
 #: templates/agenda/add_todo.html:3 templates/agenda/add_todo.html.py:4
 #: templates/agenda/success.html:4 templates/agenda/success.html.py:5
 msgid "Add ToDo"
 msgstr "Afegir feina."
 
-#: templates/agenda/add_todo.html:5 templates/agenda/success.html:6
-msgid "Add another task to the pool"
+#: templates/agenda/add_todo_to_event.html:5
+msgid "Add another task to this event"
+msgstr ""
+
+#: templates/agenda/base.html:33 templates/sites/base.html:28
+msgid "Links"
 msgstr ""
 
+#: templates/agenda/base.html:35
+msgid "My page"
+msgstr ""
+
+#: templates/agenda/base.html:36
+msgid "Calendar"
+msgstr ""
+
+#: templates/agenda/base.html:37 templates/agenda/base.html.py:43
+#: templates/agenda/wishlist.html:3 templates/agenda/wishlist.html.py:7
+msgid "Wishlist"
+msgstr ""
+
+#: templates/agenda/base.html:38
+msgid "Admin"
+msgstr ""
+
+#: templates/agenda/billboard.html:68 templates/agenda/billboard_still.html:79
+#: templates/agenda/location_events.html:42 templates/agenda/map_view.html:79
+msgid "When"
+msgstr ""
+
+#: templates/agenda/billboard.html:71 templates/agenda/billboard_still.html:82
+#: templates/agenda/location_events.html:35 templates/agenda/map_view.html:82
+#: templates/agenda/one_event.html:26
+msgid "Description"
+msgstr "Descripcio"
+
 #: templates/agenda/confirm.html:28 templates/agenda/one_event.html:33
 msgid "Person"
 msgstr "Persona"
@@ -166,84 +246,217 @@ msgstr "No hi vaig."
 msgid "I dont know"
 msgstr "No ho se."
 
-#: templates/agenda/event_list.html:14 templates/comments/posted.html:15
+#: templates/agenda/event_list.html:13
 msgid "Interested"
 msgstr "Interesat."
 
-#: templates/agenda/event_list.html:15
-#: templates/agenda/location_events.html:32 templates/agenda/one_group.html:46
-#: templates/comments/posted.html:16 templates/sites/site_list.html:17
-#: templates/sites/site_list.html.py:35
+#: templates/agenda/event_list.html:14 templates/agenda/one_event.html:49
+#: templates/agenda/one_event.html:129 templates/agenda/one_group.html:20
+#: templates/agenda/user_page.html:79 templates/agenda/wishlist.html:21
+#: templates/sites/site_list.html:17 templates/sites/site_list.html.py:35
 msgid "Comments"
 msgstr "Comentaris."
 
-#: templates/agenda/event_list.html:18 templates/comments/posted.html:19
+#: templates/agenda/event_list.html:15 templates/agenda/one_event.html:12
+#: templates/agenda/wishlist.html:14 templates/sites/site_list.html:18
+msgid "Location"
+msgstr ""
+
+#: templates/agenda/event_list.html:17 templates/agenda/wishlist.html:22
 #: templates/sites/site_list.html:20
 msgid "Modify"
 msgstr "Modificar"
 
-#: templates/agenda/location_events.html:23
+#: templates/agenda/location_events.html:13
+msgid "Comments about this location"
+msgstr ""
+
+#: templates/agenda/location_events.html:18
+#: templates/agenda/one_comment.html:18 templates/agenda/one_event.html:57
+#: templates/agenda/one_event.html:132 templates/agenda/one_group.html:29
+msgid "Posted by"
+msgstr ""
+
+#: templates/agenda/location_events.html:19
+#: templates/agenda/one_comment.html:21 templates/agenda/one_event.html:58
+#: templates/agenda/one_group.html:30 templates/agenda/wishlist.html:22
+msgid "Delete"
+msgstr ""
+
+#: templates/agenda/location_events.html:38
+msgid "Events for this location"
+msgstr ""
+
+#: templates/agenda/location_events.html:45 templates/agenda/one_event.html:96
+msgid "Groups"
+msgstr "Grups"
+
+#: templates/agenda/location_events.html:51
+msgid "Leave a comment on this location"
+msgstr ""
+
+#: templates/agenda/one_comment.html:16
+msgid "Is coment public?"
+msgstr ""
+
+#: templates/agenda/one_comment.html:18 templates/agenda/one_event.html:132
+#: templates/agenda/user_page.html:65
+msgid "on"
+msgstr ""
+
+#: templates/agenda/one_comment.html:20
+msgid "Flag"
+msgstr ""
+
+#: templates/agenda/one_comment.html:27
+msgid "Posted on"
+msgstr ""
+
+#: templates/agenda/one_comment.html:35 templates/agenda/one_comment.html:39
+#: templates/agenda/one_group.html:46
+msgid "To do"
+msgstr ""
+
+#: templates/agenda/one_comment.html:37
+#, fuzzy
+msgid "New ToDo"
+msgstr "Afegir feina."
+
+#: templates/agenda/one_event.html:13
 msgid "Starts"
 msgstr "Comencar"
 
-#: templates/agenda/location_events.html:24
+#: templates/agenda/one_event.html:14
 msgid "Ends"
 msgstr "Fi"
 
-#: templates/agenda/location_events.html:25
-msgid "Groups"
-msgstr "Grups"
+#: templates/agenda/one_event.html:17
+#, fuzzy
+msgid "New Event"
+msgstr "Actes"
 
-#: templates/agenda/one_event.html:26
-msgid "Description"
-msgstr "Descripcio"
+#: templates/agenda/one_event.html:18
+#, fuzzy
+msgid "See location"
+msgstr "Accions recents"
+
+#: templates/agenda/one_event.html:19
+msgid "Edit"
+msgstr ""
 
 #: templates/agenda/one_event.html:31
 msgid "Attending"
 msgstr "Anant"
 
+#: templates/agenda/one_event.html:63 templates/agenda/one_group.html:34
+msgid "Leave comment"
+msgstr " comantar"
+
+#: templates/agenda/one_event.html:82
+msgid "Adopt this event"
+msgstr ""
+
+#: templates/agenda/one_event.html:83
+msgid "This event still has no mentor. Do you want to help coordinate it?"
+msgstr ""
+
+#: templates/agenda/one_event.html:87
+msgid "Contact coordinator"
+msgstr ""
+
+#: templates/agenda/one_event.html:100
+msgid "Add event to a group"
+msgstr ""
+
+#: templates/agenda/one_event.html:110
+msgid "Todo"
+msgstr ""
+
+#: templates/agenda/one_event.html:116
+#, fuzzy
+msgid "Add Todo"
+msgstr "Afegir feina."
+
+#: templates/agenda/one_event.html:133
+msgid "delete"
+msgstr ""
+
 #: templates/agenda/one_group.html:12
 msgid "Events"
 msgstr "Actes"
 
-#: templates/agenda/one_group.html:21
-msgid "Leave comment"
-msgstr " comantar"
+#: templates/agenda/one_group.html:24 templates/agenda/one_group.html.py:67
+#, fuzzy
+msgid "Comments for this group"
+msgstr "Documentacio per aquesta pagina"
 
-#: templates/agenda/one_group.html:31 templates/agenda/one_group.html.py:35
-msgid "To do"
+#: templates/agenda/one_group.html:57
+msgid "Todo List"
+msgstr ""
+
+#: templates/agenda/success.html:6
+msgid "Add another task to the pool"
+msgstr ""
+
+#: templates/agenda/user_page.html:9
+msgid "Events that need a pixie"
 msgstr ""
 
-#: templates/agenda/one_group.html:33
-msgid "New ToDo for this group"
+#: templates/agenda/user_page.html:16
+msgid "I will do it"
 msgstr ""
 
-#: templates/comments/form.html:6
-msgid "Ratings"
+#: templates/agenda/user_page.html:26
+msgid "Pending ToDos on your groups"
 msgstr ""
 
-#: templates/comments/form.html:6 templates/comments/form.html.py:17
-msgid "Required"
+#: templates/agenda/user_page.html:37
+msgid "Your groups"
 msgstr ""
 
-#: templates/comments/form.html:6 templates/comments/form.html.py:17
-msgid "Optional"
+#: templates/agenda/user_page.html:44
+msgid "Your events"
 msgstr ""
 
-#: templates/comments/form.html:17
-msgid "Post a photo"
+#: templates/agenda/user_page.html:54
+msgid "User flags"
 msgstr ""
 
-#: templates/comments/form.html:22
-msgid "Headline:"
+#: templates/agenda/user_page.html:62
+msgid "Log entries"
 msgstr ""
 
-#: templates/comments/form.html:25
-msgid "Comment:"
+#: templates/agenda/user_page.html:65
+msgid "on the"
 msgstr ""
 
-#: templates/comments/form.html:34
-msgid "Preview comment"
+#: templates/agenda/user_page.html:71
+msgid "Messages"
+msgstr ""
+
+#: templates/comments/approve.html:3
+#, fuzzy
+msgid "Approve a comment"
+msgstr " comantar"
+
+#: templates/comments/approve.html:6
+msgid "Really make this comment public?"
+msgstr ""
+
+#: templates/comments/approve.html:11
+msgid "Approve"
+msgstr ""
+
+#: templates/comments/approve.html:11
+msgid "cancel"
+msgstr ""
+
+#: templates/comments/posted.html:3
+msgid "Thanks for commenting"
+msgstr ""
+
+#: templates/comments/posted.html:6
+msgid "Thank you for your comment"
 msgstr ""
 
 #: templates/registration/login.html:19
@@ -270,11 +483,6 @@ msgstr ""
 msgid "Asistencia confirmada"
 msgstr ""
 
-#: templates/sites/site_list.html:18
-msgid "Location"
-msgstr ""
-
 #: templates/sites/site_list.html:25
 msgid "Article"
 msgstr "Article"
-
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 74a9f15..b793e0d 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -9,40 +9,85 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Infopoint 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 09:26+0200\n"
+"POT-Creation-Date: 2009-04-16 22:07+0200\n"
 "PO-Revision-Date: 2008-08-25 09:32+0200\n"
 "Last-Translator:  <acracia>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: agenda/models.py:38
+msgid "how many people fits here?"
+msgstr ""
+
+#: agenda/models.py:81
+msgid "event start"
+msgstr ""
+
+#: agenda/models.py:82
+msgid "event end"
+msgstr ""
+
+#: agenda/models.py:88
+#, fuzzy
+msgid "mentor"
+msgstr "Comentarios"
+
+#: agenda/models.py:125
+#, fuzzy
+msgid "Is this todo public?"
+msgstr "¿Es público?"
+
+#: agenda/models.py:127
+msgid "When do we need it"
+msgstr ""
+
+#: agenda/models.py:145
+msgid "Limit date"
+msgstr ""
+
+#: agenda/models.py:164
+msgid "Confirm your assistance to the event"
+msgstr ""
+
+#: agenda/models.py:165
+msgid "Last update"
+msgstr ""
+
+#: agenda/models.py:166
+msgid "Let others know why you can't come to the event (optional)"
+msgstr ""
+
+#: agenda/models.py:228
+msgid "In seconds"
+msgstr ""
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/comments/base.html:17 templates/flatpages/base.html:24
-#: templates/polls/base.html:17 templates/sites/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
+#: templates/sites/base.html:17
 msgid "Welcome,"
 msgstr "Bienvenida,"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/admin_doc/bookmarklets.html:3 templates/agenda/base.html:17
-#: templates/blog/base.html:17 templates/comments/base.html:17
-#: templates/flatpages/base.html:24 templates/polls/base.html:17
-#: templates/sites/base.html:17
+#: templates/admin_doc/bookmarklets.html:3 templates/agenda/base.html:22
+#: templates/blog/base.html:17 templates/flatpages/base.html:24
+#: templates/polls/base.html:18 templates/sites/base.html:17
 msgid "Documentation"
 msgstr "Documentación"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/comments/base.html:17 templates/flatpages/base.html:24
-#: templates/polls/base.html:17 templates/sites/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
+#: templates/sites/base.html:17
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/comments/base.html:17 templates/flatpages/base.html:24
-#: templates/polls/base.html:17 templates/sites/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
+#: templates/sites/base.html:17
 msgid "Log out"
 msgstr "Salir"
 
@@ -61,11 +106,11 @@ msgstr "Modelos disponibles en la aplicación %(name)s"
 msgid "%(name)s"
 msgstr ""
 
-#: templates/admin/index.html:29
+#: templates/admin/index.html:29 templates/agenda/one_event.html:106
 msgid "Add"
 msgstr "Añadir"
 
-#: templates/admin/index.html:35 templates/agenda/location_events.html:40
+#: templates/admin/index.html:35 templates/agenda/location_events.html:43
 msgid "Change"
 msgstr "Cambiar"
 
@@ -145,16 +190,65 @@ msgstr "Edita este objeto (nueva ventana)"
 msgid "As above, but opens the admin page in a new window."
 msgstr "Como el anterior, pero abre la página de admin en una nueva ventana."
 
+#: templates/agenda/add_event_to_group.html:3
+msgid "Add event to group"
+msgstr "Agregar evento a un grupo"
+
+#: templates/agenda/add_event_to_group.html:4 templates/agenda/add_todo.html:5
+#, fuzzy
+msgid "Add another task"
+msgstr "Añade otra tarea a la lista"
+
+#: templates/agenda/add_new_event.html:8 templates/agenda/add_new_event.html:9
+#: templates/agenda/add_new_event.html:10
+#: templates/agenda/add_new_event.html:14
+#, fuzzy
+msgid "Add new event"
+msgstr "Evento"
+
 #: templates/agenda/add_todo.html:3 templates/agenda/add_todo.html.py:4
 #: templates/agenda/success.html:4 templates/agenda/success.html.py:5
 msgid "Add ToDo"
 msgstr "Añade tarea"
 
-#: templates/agenda/add_todo.html:5 templates/agenda/success.html:6
-msgid "Add another task to the pool"
+#: templates/agenda/add_todo_to_event.html:5
+#, fuzzy
+msgid "Add another task to this event"
 msgstr "Añade otra tarea a la lista"
 
-#: templates/agenda/confirm.html:28 templates/agenda/one_event.html:33
+#: templates/agenda/base.html:33 templates/sites/base.html:28
+msgid "Links"
+msgstr "Enlaces"
+
+#: templates/agenda/base.html:35
+msgid "My page"
+msgstr "Mi página"
+
+#: templates/agenda/base.html:36
+msgid "Calendar"
+msgstr "Agenda"
+
+#: templates/agenda/base.html:37 templates/agenda/base.html.py:43
+#: templates/agenda/wishlist.html:3 templates/agenda/wishlist.html.py:6
+msgid "Wishlist"
+msgstr ""
+
+#: templates/agenda/base.html:38
+msgid "Admin"
+msgstr "Administrar"
+
+#: templates/agenda/billboard.html:68 templates/agenda/billboard_still.html:79
+#: templates/agenda/location_events.html:42 templates/agenda/map_view.html:79
+msgid "When"
+msgstr "Cuando"
+
+#: templates/agenda/billboard.html:71 templates/agenda/billboard_still.html:82
+#: templates/agenda/location_events.html:35 templates/agenda/map_view.html:82
+#: templates/agenda/one_event.html:27
+msgid "Description"
+msgstr "Descripción"
+
+#: templates/agenda/confirm.html:28 templates/agenda/one_event.html:34
 msgid "Person"
 msgstr "Persona"
 
@@ -170,133 +264,253 @@ msgstr "Yo no voy"
 msgid "I dont know"
 msgstr "No sé"
 
-#: templates/agenda/event_list.html:13 templates/comments/posted.html:15
+#: templates/agenda/event_list.html:13
 msgid "Interested"
 msgstr "Interesados"
 
-#: templates/agenda/event_list.html:14
-#: templates/agenda/location_events.html:13 templates/agenda/one_event.html:53
-#: templates/agenda/one_group.html:21 templates/comments/posted.html:16
+#: templates/agenda/event_list.html:14 templates/agenda/one_event.html:50
+#: templates/agenda/one_event.html:132 templates/agenda/one_group.html:20
+#: templates/agenda/user_page.html:85 templates/agenda/wishlist.html:21
 #: templates/sites/site_list.html:17 templates/sites/site_list.html.py:35
 msgid "Comments"
 msgstr "Comentarios"
 
-#: templates/agenda/event_list.html:17 templates/comments/posted.html:19
+#: templates/agenda/event_list.html:15 templates/agenda/one_event.html:12
+#: templates/agenda/wishlist.html:14 templates/sites/site_list.html:18
+msgid "Location"
+msgstr "Lugar"
+
+#: templates/agenda/event_list.html:17 templates/agenda/wishlist.html:22
 #: templates/sites/site_list.html:20
 msgid "Modify"
 msgstr "Modificar"
 
-#: templates/agenda/location_events.html:18 templates/agenda/one_event.html:58
-#: templates/comments/preview.html:15
+#: templates/agenda/location_events.html:13
+#, fuzzy
+msgid "Comments about this location"
+msgstr "Eventos para este lugar"
+
+#: templates/agenda/location_events.html:18
+#: templates/agenda/one_comment.html:18 templates/agenda/one_event.html:58
+#: templates/agenda/one_event.html:135 templates/agenda/one_group.html:29
 msgid "Posted by"
 msgstr "Publicado por"
 
-#: templates/agenda/location_events.html:32 templates/agenda/one_event.html:26
-msgid "Description"
-msgstr "Descripción"
+#: templates/agenda/location_events.html:19
+#: templates/agenda/one_comment.html:21 templates/agenda/one_event.html:59
+#: templates/agenda/one_group.html:30 templates/agenda/wishlist.html:22
+msgid "Delete"
+msgstr "Borrar"
 
-#: templates/agenda/location_events.html:36
+#: templates/agenda/location_events.html:38
 msgid "Events for this location"
 msgstr "Eventos para este lugar"
 
-#: templates/agenda/location_events.html:41 templates/agenda/one_event.html:13
+#: templates/agenda/location_events.html:45
+#, fuzzy
+msgid "groups"
+msgstr "Grupos"
+
+#: templates/agenda/location_events.html:51
+msgid "Leave a comment on this location"
+msgstr "Comenta sobre este lugar"
+
+#: templates/agenda/one_comment.html:16
+msgid "Is coment public?"
+msgstr "¿Es público?"
+
+#: templates/agenda/one_comment.html:18 templates/agenda/one_event.html:135
+msgid "on"
+msgstr "en"
+
+#: templates/agenda/one_comment.html:20
+msgid "Flag"
+msgstr "Marcar"
+
+#: templates/agenda/one_comment.html:27
+#, fuzzy
+msgid "Posted on"
+msgstr "Publicado por"
+
+#: templates/agenda/one_comment.html:35 templates/agenda/one_comment.html:39
+#: templates/agenda/one_group.html:46
+msgid "To do"
+msgstr "Tarea"
+
+#: templates/agenda/one_comment.html:37
+#, fuzzy
+msgid "New ToDo"
+msgstr "Añade tarea"
+
+#: templates/agenda/one_event.html:13
 msgid "Starts"
 msgstr "Comienza"
 
-#: templates/agenda/location_events.html:42 templates/agenda/one_event.html:14
+#: templates/agenda/one_event.html:14
 msgid "Ends"
 msgstr "Termina"
 
-#: templates/agenda/location_events.html:43 templates/agenda/one_event.html:44
-msgid "Groups"
-msgstr "Grupos"
-
-#: templates/agenda/location_events.html:48
-msgid "Leave a comment on this location"
-msgstr "Comenta sobre este lugar"
+#: templates/agenda/one_event.html:17
+#, fuzzy
+msgid "New Event"
+msgstr "Evento"
 
-#: templates/agenda/one_event.html:12 templates/sites/site_list.html:18
-msgid "Location"
+#: templates/agenda/one_event.html:18
+#, fuzzy
+msgid "See location"
 msgstr "Lugar"
 
-#: templates/agenda/one_event.html:31
+#: templates/agenda/one_event.html:19
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/agenda/one_event.html:25
+msgid "Public"
+msgstr "Público"
+
+#: templates/agenda/one_event.html:26
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#: templates/agenda/one_event.html:32
 #, fuzzy
 msgid "Attending"
 msgstr "Yo voy"
 
-#: templates/agenda/one_event.html:46
-msgid "Added"
-msgstr "Añadido"
-
-#: templates/agenda/one_event.html:58
-msgid "on"
-msgstr "en"
-
-#: templates/agenda/one_event.html:63 templates/agenda/one_group.html:23
+#: templates/agenda/one_event.html:64 templates/agenda/one_group.html:34
 msgid "Leave comment"
 msgstr "Deja un comentario"
 
-#: templates/agenda/one_group.html:12
+#: templates/agenda/one_event.html:83
+msgid "Adopt this event"
+msgstr "Adoptar este evento"
+
+#: templates/agenda/one_event.html:84
+msgid "This event still has no mentor. Do you want to help coordinate it?"
+msgstr ""
+"Este evento todavía no tiene mentor. ¿Te gustaría ayudar a coordinarlo?"
+
+#: templates/agenda/one_event.html:93
 #, fuzzy
-msgid "Events"
-msgstr "Evento"
+msgid "Event coordinator"
+msgstr "Contacta al coordinador"
 
-#: templates/agenda/one_group.html:33 templates/agenda/one_group.html.py:37
-msgid "To do"
+#: templates/agenda/one_event.html:99 templates/agenda/user_page.html:14
+msgid "Groups"
+msgstr "Grupos"
+
+#: templates/agenda/one_event.html:103
+msgid "Add event to a group"
+msgstr "Añadir evento a un grupo"
+
+#: templates/agenda/one_event.html:113
+#, fuzzy
+msgid "Todo"
 msgstr "Tarea"
 
-#: templates/agenda/one_group.html:35
-msgid "New ToDo for this group"
-msgstr "Nueva Tarea para este grupo"
+#: templates/agenda/one_event.html:119
+#, fuzzy
+msgid "Add Todo"
+msgstr "Añade tarea"
+
+#: templates/agenda/one_event.html:136
+msgid "delete"
+msgstr "borrar"
+
+#: templates/agenda/one_group.html:12
+#, fuzzy
+msgid "Events"
+msgstr "Evento"
 
-#: templates/agenda/one_group.html:47
+#: templates/agenda/one_group.html:24 templates/agenda/one_group.html.py:65
 msgid "Comments for this group"
 msgstr "Añadir comentario a este grupo"
 
-#: templates/comments/form.html:6
-msgid "Ratings"
-msgstr "Ratings"
+#: templates/agenda/one_group.html:55
+msgid "Todo List"
+msgstr "Lista de tareas"
 
-#: templates/comments/form.html:6 templates/comments/form.html.py:17
-msgid "Required"
-msgstr "Requerido"
+#: templates/agenda/success.html:6
+msgid "Add another task to the pool"
+msgstr "Añade otra tarea a la lista"
+
+#: templates/agenda/user_events.html:35
+#, fuzzy
+msgid "confirmed events"
+msgstr "Tus eventos"
+
+#: templates/agenda/user_page.html:9
+msgid "Events that need a pixie"
+msgstr "Eventos que necesitan mentor"
+
+#: templates/agenda/user_page.html:16
+msgid "I will do it"
+msgstr "Yo puedo hacerlo"
+
+#: templates/agenda/user_page.html:26
+msgid "Pending ToDos on your groups"
+msgstr "Tareas pendientes en tus grupos"
+
+#: templates/agenda/user_page.html:37
+msgid "Your groups"
+msgstr "Tus grupos"
+
+#: templates/agenda/user_page.html:49
+msgid "Your events"
+msgstr "Tus eventos"
 
-#: templates/comments/form.html:6 templates/comments/form.html.py:17
-msgid "Optional"
-msgstr "Opcional"
+#: templates/agenda/user_page.html:51
+#, fuzzy
+msgid "Events you coordinate"
+msgstr "Contacta al coordinador"
 
-#: templates/comments/form.html:17
-msgid "Post a photo"
-msgstr "Publica una foto"
+#: templates/agenda/user_page.html:59
+#, fuzzy
+msgid "Events you are attending"
+msgstr "Yo voy"
 
-#: templates/comments/form.html:22
-msgid "Headline:"
-msgstr "Titular:"
+#: templates/agenda/user_page.html:69
+msgid "User flags"
+msgstr "Marcas de usuario"
 
-#: templates/comments/form.html:25
-msgid "Comment:"
-msgstr "Comentario:"
+#: templates/agenda/user_page.html:77
+msgid "Messages"
+msgstr "Mensajes"
+
+#: templates/agenda/wishlist.html:29
+msgid "There are no items on the wishlist! Do you want to add one?"
+msgstr ""
 
-#: templates/comments/form.html:36
-msgid "Preview comment"
+#: templates/agenda/wishlist.html:29
+msgid " Click here."
+msgstr ""
+
+#: templates/comments/approve.html:3
+#, fuzzy
+msgid "Approve a comment"
 msgstr "Previsualizar comentario"
 
-#: templates/comments/preview.html:6
-msgid "Preview your comment"
-msgstr "Previsualiza tu comentario"
+#: templates/comments/approve.html:6
+#, fuzzy
+msgid "Really make this comment public?"
+msgstr "¿Es público?"
+
+#: templates/comments/approve.html:11
+msgid "Approve"
+msgstr "Aprueba"
 
-#: templates/comments/preview.html:10
-msgid "Please correct the following errors."
-msgstr "Por favor, corrige los siguientes errores"
+#: templates/comments/approve.html:11
+msgid "cancel"
+msgstr "cancela"
 
-#: templates/comments/preview.html:41
-msgid "Headline"
-msgstr "Titulo"
+#: templates/comments/posted.html:3
+msgid "Thanks for commenting"
+msgstr "Gracias por tu comentario"
 
-#: templates/comments/preview.html:47
+#: templates/comments/posted.html:6
 #, fuzzy
-msgid "Comment"
-msgstr "Comentarios"
+msgid "Thank you for your comment"
+msgstr "Previsualiza tu comentario"
 
 #: templates/registration/login.html:19
 msgid "Username:"
@@ -326,6 +540,46 @@ msgstr "Asistencia·confirmada"
 msgid "Article"
 msgstr "Artículo"
 
+#~ msgid "Log entries"
+#~ msgstr "Entradas de log"
+
+#~ msgid "on the"
+#~ msgstr "en el"
+
+#, fuzzy
+#~ msgid "Add todo"
+#~ msgstr "Añade tarea"
+
+#~ msgid "Added"
+#~ msgstr "Añadido"
+
+#~ msgid "New ToDo for this group"
+#~ msgstr "Nueva Tarea para este grupo"
+
+#~ msgid "Ratings"
+#~ msgstr "Ratings"
+
+#~ msgid "Required"
+#~ msgstr "Requerido"
+
+#~ msgid "Optional"
+#~ msgstr "Opcional"
+
+#~ msgid "Post a photo"
+#~ msgstr "Publica una foto"
+
+#~ msgid "Headline:"
+#~ msgstr "Titular:"
+
+#~ msgid "Comment:"
+#~ msgstr "Comentario:"
+
+#~ msgid "Please correct the following errors."
+#~ msgstr "Por favor, corrige los siguientes errores"
+
+#~ msgid "Headline"
+#~ msgstr "Titulo"
+
 #~ msgid "Forgotten your password?"
 #~ msgstr "¿Has olvidado tu contraseña?"
 
diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po
index ee894f1..9195c5f 100644
--- a/locale/it/LC_MESSAGES/django.po
+++ b/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-31 18:07+0200\n"
+"POT-Creation-Date: 2009-04-14 02:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,52 +16,84 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: agenda/models.py:38
+msgid "how many people fits here?"
+msgstr "Quante persone ci stanno?"
+
+#: agenda/models.py:80
+msgid "event start"
+msgstr "l'evento inizia"
+
+#: agenda/models.py:81
+msgid "event end"
+msgstr "l'evento finisce"
+
+#: agenda/models.py:124
+msgid "Is this todo(all?) public?"
+msgstr "questo è tutto pubblico"
+
+#: agenda/models.py:126
+msgid "When do we need it"
+msgstr "Quando lo abbiamo bisogno"
+
+#: agenda/models.py:163
+msgid "Confirm your assistance to the event"
+msgstr "Conferma il tuo aiuto all'evento"
+
+#: agenda/models.py:164
+msgid "Last update"
+msgstr "Ultimi aggiornamenti"
+
+#: agenda/models.py:165
+msgid "Let others know why you can't come to the event (optional)"
+msgstr "Nel caso facci sapere perchè non puoi venire"
+
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/flatpages/base.html:24 templates/polls/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
 #: templates/sites/base.html:17
 msgid "Welcome,"
-msgstr ""
+msgstr "Benvenuto,"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/admin_doc/bookmarklets.html:3 templates/agenda/base.html:17
+#: templates/admin_doc/bookmarklets.html:3 templates/agenda/base.html:22
 #: templates/blog/base.html:17 templates/flatpages/base.html:24
-#: templates/polls/base.html:17 templates/sites/base.html:17
+#: templates/polls/base.html:18 templates/sites/base.html:17
 msgid "Documentation"
-msgstr ""
+msgstr "Documentazione"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/flatpages/base.html:24 templates/polls/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
 #: templates/sites/base.html:17
 msgid "Change password"
-msgstr ""
+msgstr "Cambio Password"
 
 #: templates/base.html:17 templates/admin/base.html:25
-#: templates/agenda/base.html:17 templates/blog/base.html:17
-#: templates/flatpages/base.html:24 templates/polls/base.html:17
+#: templates/agenda/base.html:22 templates/blog/base.html:17
+#: templates/flatpages/base.html:24 templates/polls/base.html:18
 #: templates/sites/base.html:17
 msgid "Log out"
-msgstr ""
+msgstr "Chiudi Sessione"
 
 #: templates/admin/base.html:30 templates/admin_doc/bookmarklets.html:3
 #: templates/flatpages/base.html:29
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: templates/admin/index.html:18
 #, python-format
 msgid "Models available in the %(name)s application."
-msgstr ""
+msgstr "Modelli disponibili in the %(name)s application."
 
 #: templates/admin/index.html:19
 #, python-format
 msgid "%(name)s"
-msgstr ""
+msgstr "%(name)s"
 
-#: templates/admin/index.html:29
+#: templates/admin/index.html:29 templates/agenda/one_event.html:103
 msgid "Add"
-msgstr ""
+msgstr "Aggiungi"
 
 #: templates/admin/index.html:35 templates/agenda/location_events.html:43
 msgid "Change"
@@ -139,24 +171,57 @@ msgstr ""
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 
+#: templates/agenda/add_event_to_group.html:3
+msgid "Add event to group"
+msgstr ""
+
+#: templates/agenda/add_event_to_group.html:4 templates/agenda/add_todo.html:5
+msgid "Add another task"
+msgstr ""
+
+#: templates/agenda/add_new_event.html:8 templates/agenda/add_new_event.html:9
+#: templates/agenda/add_new_event.html:10
+#: templates/agenda/add_new_event.html:14
+msgid "Add new event"
+msgstr ""
+
 #: templates/agenda/add_todo.html:3 templates/agenda/add_todo.html.py:4
 #: templates/agenda/success.html:4 templates/agenda/success.html.py:5
 msgid "Add ToDo"
 msgstr ""
 
-#: templates/agenda/add_todo.html:5 templates/agenda/success.html:6
-msgid "Add another task to the pool"
+#: templates/agenda/add_todo_to_event.html:5
+msgid "Add another task to this event"
 msgstr ""
 
-#: templates/agenda/base.html:28 templates/sites/base.html:28
+#: templates/agenda/base.html:33 templates/sites/base.html:28
 msgid "Links"
 msgstr ""
 
-#: templates/agenda/billboard.html:75 templates/agenda/location_events.html:42
+#: templates/agenda/base.html:35
+msgid "My page"
+msgstr ""
+
+#: templates/agenda/base.html:36
+msgid "Calendar"
+msgstr ""
+
+#: templates/agenda/base.html:37 templates/agenda/base.html.py:43
+#: templates/agenda/wishlist.html:3 templates/agenda/wishlist.html.py:7
+msgid "Wishlist"
+msgstr ""
+
+#: templates/agenda/base.html:38
+msgid "Admin"
+msgstr ""
+
+#: templates/agenda/billboard.html:68 templates/agenda/billboard_still.html:79
+#: templates/agenda/location_events.html:42 templates/agenda/map_view.html:79
 msgid "When"
 msgstr ""
 
-#: templates/agenda/billboard.html:78 templates/agenda/location_events.html:35
+#: templates/agenda/billboard.html:71 templates/agenda/billboard_still.html:82
+#: templates/agenda/location_events.html:35 templates/agenda/map_view.html:82
 #: templates/agenda/one_event.html:26
 msgid "Description"
 msgstr ""
@@ -181,13 +246,20 @@ msgstr ""
 msgid "Interested"
 msgstr ""
 
-#: templates/agenda/event_list.html:14 templates/agenda/one_event.html:79
-#: templates/agenda/one_group.html:20 templates/sites/site_list.html:17
-#: templates/sites/site_list.html.py:35
+#: templates/agenda/event_list.html:14 templates/agenda/one_event.html:49
+#: templates/agenda/one_event.html:129 templates/agenda/one_group.html:20
+#: templates/agenda/user_page.html:79 templates/agenda/wishlist.html:21
+#: templates/sites/site_list.html:17 templates/sites/site_list.html.py:35
 msgid "Comments"
 msgstr ""
 
-#: templates/agenda/event_list.html:17 templates/sites/site_list.html:20
+#: templates/agenda/event_list.html:15 templates/agenda/one_event.html:12
+#: templates/agenda/wishlist.html:14 templates/sites/site_list.html:18
+msgid "Location"
+msgstr ""
+
+#: templates/agenda/event_list.html:17 templates/agenda/wishlist.html:22
+#: templates/sites/site_list.html:20
 msgid "Modify"
 msgstr ""
 
@@ -196,12 +268,14 @@ msgid "Comments about this location"
 msgstr ""
 
 #: templates/agenda/location_events.html:18
-#: templates/agenda/one_comment.html:18 templates/agenda/one_event.html:82
+#: templates/agenda/one_comment.html:18 templates/agenda/one_event.html:57
+#: templates/agenda/one_event.html:132 templates/agenda/one_group.html:29
 msgid "Posted by"
 msgstr ""
 
 #: templates/agenda/location_events.html:19
-#: templates/agenda/one_comment.html:21
+#: templates/agenda/one_comment.html:21 templates/agenda/one_event.html:58
+#: templates/agenda/one_group.html:30 templates/agenda/wishlist.html:22
 msgid "Delete"
 msgstr ""
 
@@ -209,7 +283,7 @@ msgstr ""
 msgid "Events for this location"
 msgstr ""
 
-#: templates/agenda/location_events.html:45 templates/agenda/one_event.html:61
+#: templates/agenda/location_events.html:45 templates/agenda/one_event.html:96
 msgid "Groups"
 msgstr ""
 
@@ -221,7 +295,8 @@ msgstr ""
 msgid "Is coment public?"
 msgstr ""
 
-#: templates/agenda/one_comment.html:18 templates/agenda/one_event.html:82
+#: templates/agenda/one_comment.html:18 templates/agenda/one_event.html:132
+#: templates/agenda/user_page.html:65
 msgid "on"
 msgstr ""
 
@@ -234,18 +309,14 @@ msgid "Posted on"
 msgstr ""
 
 #: templates/agenda/one_comment.html:35 templates/agenda/one_comment.html:39
-#: templates/agenda/one_group.html:31
+#: templates/agenda/one_group.html:46
 msgid "To do"
 msgstr ""
 
-#: templates/agenda/one_comment.html:37 templates/agenda/one_group.html:33
+#: templates/agenda/one_comment.html:37
 msgid "New ToDo"
 msgstr ""
 
-#: templates/agenda/one_event.html:12 templates/sites/site_list.html:18
-msgid "Location"
-msgstr ""
-
 #: templates/agenda/one_event.html:13
 msgid "Starts"
 msgstr ""
@@ -270,15 +341,35 @@ msgstr ""
 msgid "Attending"
 msgstr ""
 
-#: templates/agenda/one_event.html:49 templates/agenda/one_group.html:21
+#: templates/agenda/one_event.html:63 templates/agenda/one_group.html:34
 msgid "Leave comment"
 msgstr ""
 
-#: templates/agenda/one_event.html:70
-msgid "Todo"
+#: templates/agenda/one_event.html:82
+msgid "Adopt this event"
 msgstr ""
 
 #: templates/agenda/one_event.html:83
+msgid "This event still has no mentor. Do you want to help coordinate it?"
+msgstr ""
+
+#: templates/agenda/one_event.html:87
+msgid "Contact coordinator"
+msgstr ""
+
+#: templates/agenda/one_event.html:100
+msgid "Add event to a group"
+msgstr ""
+
+#: templates/agenda/one_event.html:110
+msgid "Todo"
+msgstr ""
+
+#: templates/agenda/one_event.html:116
+msgid "Add Todo"
+msgstr ""
+
+#: templates/agenda/one_event.html:133
 msgid "delete"
 msgstr ""
 
@@ -286,12 +377,76 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: templates/agenda/one_group.html:35
+#: templates/agenda/one_group.html:24 templates/agenda/one_group.html.py:67
+msgid "Comments for this group"
+msgstr ""
+
+#: templates/agenda/one_group.html:57
 msgid "Todo List"
 msgstr ""
 
-#: templates/agenda/one_group.html:45
-msgid "Comments for this group"
+#: templates/agenda/success.html:6
+msgid "Add another task to the pool"
+msgstr ""
+
+#: templates/agenda/user_page.html:9
+msgid "Events that need a pixie"
+msgstr ""
+
+#: templates/agenda/user_page.html:16
+msgid "I will do it"
+msgstr ""
+
+#: templates/agenda/user_page.html:26
+msgid "Pending ToDos on your groups"
+msgstr ""
+
+#: templates/agenda/user_page.html:37
+msgid "Your groups"
+msgstr ""
+
+#: templates/agenda/user_page.html:44
+msgid "Your events"
+msgstr ""
+
+#: templates/agenda/user_page.html:54
+msgid "User flags"
+msgstr ""
+
+#: templates/agenda/user_page.html:62
+msgid "Log entries"
+msgstr ""
+
+#: templates/agenda/user_page.html:65
+msgid "on the"
+msgstr ""
+
+#: templates/agenda/user_page.html:71
+msgid "Messages"
+msgstr ""
+
+#: templates/comments/approve.html:3
+msgid "Approve a comment"
+msgstr ""
+
+#: templates/comments/approve.html:6
+msgid "Really make this comment public?"
+msgstr ""
+
+#: templates/comments/approve.html:11
+msgid "Approve"
+msgstr ""
+
+#: templates/comments/approve.html:11
+msgid "cancel"
+msgstr ""
+
+#: templates/comments/posted.html:3
+msgid "Thanks for commenting"
+msgstr ""
+
+#: templates/comments/posted.html:6
+msgid "Thank you for your comment"
 msgstr ""
 
 #: templates/registration/login.html:19
diff --git a/templates/agenda/add_new_event.html b/templates/agenda/add_new_event.html
index ab5479e..fc7a0d6 100755
--- a/templates/agenda/add_new_event.html
+++ b/templates/agenda/add_new_event.html
@@ -25,7 +25,7 @@
 </form>
 </div>
 <div class="module">
-{{ general_form.as_p }}
+{# general_form.as_p #}
 {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
 {% if messages %}<p><strong>{{ messages }}</strong></p>{% endif %}
 
diff --git a/templates/agenda/wishlist.html b/templates/agenda/wishlist.html
index bb4f176..26f6e50 100755
--- a/templates/agenda/wishlist.html
+++ b/templates/agenda/wishlist.html
@@ -1,5 +1,15 @@
 {% extends 'agenda/base.html' %}
+{% load adminmedia %}
 {% load i18n  %}
+{% load comments  %}
+{% block head %}
+        <script type="text/javascript">
+        function toggleDisplay(divId) {
+                var div = document.getElementById(divId);
+                div.style.display = (div.style.display=="none" ? "block": "none");
+        }
+        </script>
+{% endblock %}
 {% block content_title %}<h1>{% trans 'Wishlist' %}</h1>{% endblock %}
 {% block content %}
 		<div class="module">
@@ -7,19 +17,45 @@
 {% if wishlist %}
 		 <ul>
 	{% for object in wishlist %}
-               	<li>{{ object.title|title }}
+               	<li><h3>{{ object.title|title }}</h3>
 		<p>{{ object.description }}</p>
 		{% if object.due_date %}<p>Due date: {{ object.due_date|date }}</p>{% endif %}
 		{% if object.location.count %}{% trans 'Location' %}:
 			{% for location in object.location.all %}
 				 <a href="{% url agenda.views.location location.id %}" class="location">{{ location.title }}</a>
 
+
 				{% endfor %}
 			
 		{% endif %}
+		{% if user.is_staff %} - <a href="/admin/agenda/wish/{{ object.id }}" class="changelink">{% trans 'Modify' %}</a> - <a href="/admin/agenda/wish/{{ object.id }}/delete" class="deletelink">{% trans 'Delete' %}</a>
+		{% endif %}
 		{% if object.comment_set.all %}{% trans 'Comments' %}: {{ object.comment_set.count }}{% endif %}
-{% if user.is_staff %} - <a href="/admin/agenda/wish/{{ object.id }}" class="changelink">{% trans 'Modify' %}</a> - <a href="/admin/agenda/wish/{{ object.id }}/delete" class="deletelink">{% trans 'Delete' %}</a>
+	
+		{% get_comment_list for object as comment_list %}
+{% if comment_list %}
+<div class="module">
+<h4>{% trans 'Comments about this item' %}:</h4>
+{% for comment in comment_list %}
+{% if comment.is_public %}
+<h3>{{ comment.headline }}</h3>
+<p>{{ comment.comment|linebreaks }}
+<p>{% trans 'Posted by' %}  {{ comment.user }} on {{ comment.submit_date|date }}
+{% if user.is_authenticated %} <a href="/admin/comments/comment/{{ comment.id }}/delete" class="deletelink">{% trans 'Delete' %}</a>{% endif %}
 {% endif %}
+{% endfor %}
+        
+</div>
+{% endif %}  
+<a href="#" onClick="toggleDisplay('comment-{{ object.id }}');return false;">
+Add a comment</a>
+<div id="comment-{{ object.id }}" class="invisible">
+<form action="{% comment_form_target %}" method="POST">
+{% render_comment_form for object %}
+</div>
+		
+
+
 
     </li>
 	{% endfor %}
--
cgit v0.9.2-3-g52c9