diff --git a/CHANGELOG.md b/CHANGELOG.md
index a33668b..ed761e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+plugin eventHandler 2015-05-31
+==============================
+* Update translation. Thanks to @franck-tomek.
+* Fix issue with link on calendar widget. Thanks to Onurb Teva <dev@taktile.fr>.
+
 plugin eventHandler 2015-04-22 - 2015-04-22
 ===========================================
 Fixes #23 - Lost automatic address completion from GMaps when entering partial address.
diff --git a/_define.php b/_define.php
index e32bbbb..bef08b1 100644
--- a/_define.php
+++ b/_define.php
@@ -20,7 +20,7 @@
 	/* Name */			"EventHandler",
 	/* Description*/	"Manage events on your blog",
 	/* Author */		"JC Denis, Nicolas Roudaire",
-	/* Version */		'2015.04.22',
+	/* Version */		'2015.05.31',
 	/* Properties */
 	array(
 		'permissions' => 'usage,contentadmin',
diff --git a/inc/class.admin.eventhandler.php b/inc/class.admin.eventhandler.php
index 2f47c56..9c3ce4e 100644
--- a/inc/class.admin.eventhandler.php
+++ b/inc/class.admin.eventhandler.php
@@ -98,8 +98,8 @@ public static function doBindUnBind($core, dcPostsActionsPage $ap, $post){
 				}
 				dcPage::addSuccessNotice(sprintf(
 					__(
-						'%d entry has been successfully bound %s',
-						'%d entries have been successfully bound %s',
+						'%d entry has been bound %s',
+						'%d entries have been bound %s',
 						count($posts_ids)
 					),
 					count($posts_ids),__('to the selected event','to the selected events',$events->count()))
@@ -146,8 +146,8 @@ public static function doBindUnBind($core, dcPostsActionsPage $ap, $post){
 				}
 			dcPage::addSuccessNotice(sprintf(
 				__(
-					'%d post has been successfully unbound from its events',
-					'%d posts have been successfully unbound from their events',
+					'%d post has been unbound from its events',
+					'%d posts have been unbound from their events',
 					count($posts_ids)
 				),
 				count($posts_ids)));
@@ -168,8 +168,8 @@ public static function doBindUnBind($core, dcPostsActionsPage $ap, $post){
 					}
 					dcPage::addSuccessNotice(sprintf(
 					__(
-						'Event #%d (%s) successfully unbound from %d related post',
-						'Event #%d (%s) successfully unbound from %d related posts',
+						'Event #%d (%s) unbound from %d related post',
+						'Event #%d (%s) unbound from %d related posts',
 						$posts->count()
 					),
 					$v,$event->post_title,$posts->count()));
diff --git a/inc/index.events.php b/inc/index.events.php
index cb0be06..38fdd7a 100644
--- a/inc/index.events.php
+++ b/inc/index.events.php
@@ -83,8 +83,8 @@
 
         dcPage::addSuccessNotice(sprintf(
             __(
-                '%d entry has been successfully set to user "%s"',
-                '%d entries have been successfully set to user "%s"',
+                '%d entry has been set to user "%s"',
+                '%d entries have been set to user "%s"',
                 count($entries)
             ),
             count($entries),
@@ -125,8 +125,8 @@
         $title = $core->blog->getCategory($new_cat_id);
         dcPage::addSuccessNotice(sprintf(
             __(
-                '%d entry has been successfully moved to category "%s"',
-                '%d entries have been successfully moved to category "%s"',
+                '%d entry has been moved to category "%s"',
+                '%d entries have been moved to category "%s"',
                 count($entries)
             ),
             count($entries),
diff --git a/js/event-public-cal.js b/js/event-public-cal.js
index e1aa777..e1b8693 100644
--- a/js/event-public-cal.js
+++ b/js/event-public-cal.js
@@ -50,7 +50,7 @@
 			success:function(data){
 				data=$(data);
 				if(data.find('rsp').attr('status')=='ok'){
-					$(target).find('table').replaceWith($(data).find('calendar').text());
+					$(target).find('table').replaceWith($(data).find('calendar').text().find('table'));
 					$(target).eventHandlerCalendar();
 					return false;
 				}else{
diff --git a/locales/en/help/help.html b/locales/en/help/help.html
index bb45a67..762f4ed 100644
--- a/locales/en/help/help.html
+++ b/locales/en/help/help.html
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>eventHandler</title>
-</head>
-<body>
-
-<p>If you want some help or contribute to the plugin eventHandler, follow these links.</p>
-<ul>
-  <li><a href="http://dotclear.jcdenis.com/go/eventHandler-support" title="Forum">Post on Dotclear's forum</a></li>
-  <li><a href="http://lab.dotclear.org/wiki/plugin/eventHandler" title="Lab">Page on Dotclear's lab</a></li>
-  <li><a href="http://dotclear.jcdenis.com/go/eventHandler" title="Blog">Post on author's blog</a></li>
-</ul>
-
-</body>
-</html>
\ No newline at end of file
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>eventHandler</title>
+  </head>
+  <body>
+    <p>If you want some help or contribute to the plugin eventHandler, follow these links.</p>
+    <ul>
+      <li><a href="http://forum.dotclear.org/viewtopic.php?id=43296" title="Forum" hreflang="fr">Post on Dotclear's forum</a></li>
+      <li><a href="https://github.com/nikrou/eventHandler" title="Github">Github repository</a></li>
+      <li><a href="http://www.nikrou.net/post/2014/11/23/G%C3%A9rer-des-%C3%A9v%C3%A9nements" title="Blog" hreflang="fr">Post on author's blog</a></li>
+    </ul>
+  </body>
+</html>
diff --git a/locales/fr/help/help.html b/locales/fr/help/help.html
index adb0280..6fff695 100644
--- a/locales/fr/help/help.html
+++ b/locales/fr/help/help.html
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>eventHandler</title>
-</head>
-<body>
-
-<p>Si vous souhaitez plus d'aide ou apporter votre contribution à l'extension eventHandler, voici quelques liens utiles.</p>
-<ul>
-  <li><a href="http://dotclear.jcdenis.com/go/eventHandler-support" title="Forum">Sujet sur le forum Dotclear</a></li>
-  <li><a href="http://lab.dotclear.org/wiki/plugin/eventHandler" title="Lab">Page dédiée du lab Dotclear</a></li>
-  <li><a href="http://dotclear.jcdenis.com/go/eventHandler" title="Blog">Billet dédié sur le blog de l'auteur</a></li>
-</ul>
-
-</body>
-</html>
\ No newline at end of file
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>eventHandler</title>
+  </head>
+  <body>
+    <p>Si vous souhaitez plus d'aide ou apporter votre contribution à l'extension eventHandler, voici quelques liens utiles.</p>
+    <ul>
+      <li><a href="http://forum.dotclear.org/viewtopic.php?id=43296" title="Forum">Sujet sur le forum Dotclear</a></li>
+      <li><a href="https://github.com/nikrou/eventHandler" title="Github">Dépôt Github</a></li>
+      <li><a href="http://www.nikrou.net/post/2014/11/23/G%C3%A9rer-des-%C3%A9v%C3%A9nements" title="Blog">Billet dédié sur le blog de l'auteur</a></li>
+    </ul>
+  </body>
+</html>
diff --git a/locales/fr/main.po b/locales/fr/main.po
index d4c08a0..75fe87b 100644
--- a/locales/fr/main.po
+++ b/locales/fr/main.po
@@ -1,810 +1,636 @@
 # Language: Français
 # Module: eventHandler - 2015.03.22
 # Date: 2015-03-24 17:23:51
-# Translated with translater 2015.03.02
-
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: eventHandler 2015.03.22\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2015-03-24T17:23:51+00:00\n"
-"Last-Translator: brol\n"
-"Language-Team: \n"
+"Project-Id-Version: eventHandler 2015.05.31\n"
+"Report-Msgid-Bugs-To: nikrou77+l10n@gmail.com\n"
+"POT-Creation-Date: 2015-05-31 19:55+0200\n"
+"PO-Revision-Date: 2015-05-31 20:14+0200\n"
+"Last-Translator: Nicolas <nikrou77@gmail.com>\n"
+"Language-Team: Nicolas <nikrou77@gmail.com>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: _admin.php:27
-#: inc/class.admin.eventhandler.php:19
-#: index.php:49
-msgid "Event handler"
-msgstr "Gestionnaire d'événements"
+#, php-format
+msgid "%d entry has been bound %s"
+msgid_plural "%d entries have been bound %s"
+msgstr[0] "%d billet a été lié %s"
+msgstr[1] "%d billets ont été liés %s"
 
-#: _public.php:24
-msgid "ongoing"
-msgstr "en cours"
+#, php-format
+msgid "%d post has been unbound from its events"
+msgid_plural "%d posts have been unbound from their events"
+msgstr[0] "%d billet a été bien été détaché de ses événements"
+msgstr[1] "%d billets ont été bien été détachés de leurs événements"
 
-#: _public.php:25
-msgid "finished"
-msgstr "terminé"
+#, php-format
+msgid "%s days"
+msgstr "%s jours"
 
-#: _public.php:127
-msgid "Please wait"
-msgstr "Veuillez patienter"
+#, php-format
+msgid "%s events"
+msgstr "%s événements"
 
-#: _public.php:702
-#: _public.php:712
-#: _public.php:757
-#: inc/class.admin.eventhandler.php:49
-#: inc/class.admin.eventhandler.php:50
-#: inc/class.admin.eventhandler.php:55
-#: inc/class.admin.eventhandler.php:213
-msgid "Events"
-msgstr "Événements"
+#, php-format
+msgid "%s hours"
+msgstr "%s heures"
 
-#: _public.php:716
-msgid "Directory:"
-msgstr "Répertoire :"
+#, php-format
+msgid "%s minutes"
+msgstr "%s minutes"
 
-#: _public.php:735
-msgid "This page is powered by Dotclear and eventHandler"
-msgstr "Cette page est propulsée par Dotclear et eventHandler"
+msgid "Activation"
+msgstr "Activation"
 
-#: _public.php:795
-msgid "There's no event at this time."
-msgstr "Il n'y a pas d'événement pour l'instant."
+msgid "Add link to events page"
+msgstr "Ajouter le lien vers la page des événements"
+
+msgid "Add these events to your iCalendar"
+msgstr "Ajouter ces événements à votre iCalendar"
+
+msgid "Add this event to your iCalendar"
+msgstr "Ajouter cet événement à votre iCalendar"
+
+msgid "Add tooltips"
+msgstr "Ajouter les info-bulles"
+
+msgid "Additionnal style sheet:"
+msgstr "Feuille de style additionnelle : "
+
+msgid "Address:"
+msgstr "Adresse : "
 
-#: _public.php:862
-#: _public.php:1066
 msgid "All"
 msgstr "Tous"
 
-#: _public.php:863
-#: _public.php:1067
-#: _widgets.php:56
-#: _widgets.php:111
-#: _widgets.php:209
-#: inc/index.events.php:229
-msgid "Ongoing"
-msgstr "En cours"
+msgid "All events"
+msgstr "Tous les événements"
 
-#: _public.php:864
-#: _public.php:1068
-#: _widgets.php:57
-#: _widgets.php:112
-#: _widgets.php:210
-#: inc/index.events.php:230
-msgid "Outgoing"
-msgstr "Pas en cours"
+msgid "All pages"
+msgstr "Toutes les pages"
 
-#: _public.php:866
-#: _public.php:1070
-#: _widgets.php:53
-#: _widgets.php:108
-#: _widgets.php:206
-#: inc/index.events.php:226
-msgid "Started"
-msgstr "Débuté"
+msgid "All periods"
+msgstr "Toutes les périodes"
 
-#: _public.php:867
-#: _public.php:1071
-#: _widgets.php:55
-#: _widgets.php:110
-#: _widgets.php:208
-#: inc/index.events.php:228
-msgid "Not finished"
-msgstr "Non terminé"
+msgid "An error occured"
+msgstr "Erreur"
 
-#: _public.php:868
-#: _public.php:1072
-#: _widgets.php:54
-#: _widgets.php:109
-#: _widgets.php:207
-#: inc/index.events.php:227
-msgid "Finished"
-msgstr "Terminé"
+msgid "An error occured when trying de unbind event"
+msgstr "Il y a eu une erreur en essayant de détacher un événement"
 
-#: _public.php:948
-msgid "Published date"
-msgstr "Date de publication"
+#, php-format
+msgid "Attach events to \"%s\" post."
+msgstr "Lier des événement au billet \"%s\"."
 
-#: _public.php:949
-#: _widgets.php:43
-#: _widgets.php:98
-#: _widgets.php:196
-#: inc/class.admin.eventhandler.list.php:28
-#: inc/class.admin.eventhandler.minilist.php:31
-#: inc/index.events.php:212
-msgid "Start date"
-msgstr "Date de début"
+msgid "Attach selected events"
+msgstr "Lier les événements sélectionnés"
 
-#: _public.php:950
-#: _widgets.php:44
-#: _widgets.php:99
-#: _widgets.php:197
-#: inc/class.admin.eventhandler.list.php:29
-#: inc/class.admin.eventhandler.minilist.php:32
-#: inc/index.events.php:213
-msgid "End date"
-msgstr "Date de fin"
+msgid "Author"
+msgstr "Auteur"
 
-#: _public.php:1054
-#: _widgets.php:384
-#: _widgets.php:502
-#: _widgets.php:643
-#: _widgets.php:734
-#: _widgets.php:782
-msgid "All events"
-msgstr "Tous les événements"
+msgid "Author:"
+msgstr "Auteur : "
 
-#: _public.php:1055
-msgid "Current events"
-msgstr "Événements en cours"
+msgid "Available"
+msgstr "Disponible"
 
-#: _public.php:1056
-msgid "Event not being"
-msgstr "Événements pas en cours"
+msgid "Bind events"
+msgstr "Attacher des événements"
 
-#: _public.php:1057
-msgid "Scheduled events"
-msgstr "Événements programmés"
+msgid "By"
+msgstr "Par"
 
-#: _public.php:1058
-msgid "Started events"
-msgstr "Événements débutés"
+msgid "CSS class:"
+msgstr "Classe css : "
 
-#: _public.php:1059
-msgid "Unfinished events"
-msgstr "Événements non terminés"
+msgid "Calendar"
+msgstr "Calendrier"
+
+msgid "Cancel"
+msgstr "Annuler"
+
+msgid "Change"
+msgstr "Changer"
+
+msgid "Change author"
+msgstr "Changer l'auteur"
+
+msgid "Change category"
+msgstr "Changer la catégorie"
+
+msgid "Change entry into event"
+msgstr "Changer un billet en événement"
+
+msgid "Change into event"
+msgstr "Changer en événement"
+
+msgid "Change this entry into an event"
+msgstr "Changer ce billet en événement"
+
+msgid "Check to unbind"
+msgstr "Cocher pour détacher"
 
-#: _public.php:1060
 msgid "Completed events"
 msgstr "Événements terminés"
 
-#: _public.php:1108
-msgid "For the day of %s"
-msgstr "Pour la journée du %s"
+msgid "Configuration"
+msgstr "Configuration"
 
-#: _public.php:1113
-msgid "For the month of %s"
-msgstr "Pour le mois de %s"
+msgid "Configuration has been updated."
+msgstr "La configuration a été mise à jour."
 
-#: _public.php:1117
-msgid "For the year of %s"
-msgstr "Pour l'année %s"
+msgid "Configuration saved"
+msgstr "Configuration sauvegardée"
 
-#: _public.php:1127
-msgid "For the period between %s and %s"
-msgstr "Pour la période entre %s et %s"
+msgid "Current events"
+msgstr "Événements en cours"
 
-#: _public.php:1131
-msgid "For the period through %s and %s"
-msgstr "Pour la période passant entre %s et %s"
+msgid "Date"
+msgstr "Date"
 
-#: _services.php:34
-#: inc/class.eventhandler.php:260
-#: inc/class.eventhandler.php:294
-msgid "No such event ID"
-msgstr "Pas de tel événement"
+msgid "Date format of events:"
+msgstr "Format de date des événements : "
 
-#: _services.php:43
-msgid "An error occured when trying de unbind event"
-msgstr "Il y a eu une erreur en essayant de détacher un événement"
+msgid "Default type of map:"
+msgstr "Type par défaut de la carte : "
 
-#: _services.php:47
-msgid "Event removed from post"
-msgstr "Événements retirés du billet"
+msgid "Default zoom on map:"
+msgstr "Zoom par défaut de la carte : "
 
-#: _uninstall.php:20
-msgid "delete all settings"
-msgstr "supprimer tous les paramètres"
+msgid "Detail"
+msgstr "Détail"
 
-#: _uninstall.php:22
-msgid "delete table"
-msgstr "supprimer la table de la base de données"
+msgid "Directory:"
+msgstr "Répertoire : "
 
-#: _uninstall.php:24
-msgid "delete plugin files"
-msgstr "supprimer les fichiers du plugin"
+msgid "Display these events on a map"
+msgstr "Afficher ces événements sur une carte"
 
-#: _uninstall.php:26
-msgid "delete the version number"
-msgstr "supprimer le numéro de version"
+msgid "Display these events on hCalendar format"
+msgstr "Afficher ces événements au format hCalendar"
 
-#: _uninstall.php:29
-msgid "delete all %s settings"
-msgstr "supprimer tous les paramètres de %s"
+msgid "Display this event on hCalendar format"
+msgstr "Afficher cet événement au format hCalendar"
 
-#: _uninstall.php:32
-msgid "delete %s table"
-msgstr "supprimer la table %s"
+#, php-format
+msgid "Dotclear version %s minimum is required. \"%s\" is deactivated"
+msgstr "La version minimale de Dotclear est %s. Le plugin \"%s\" a été désactivé."
 
-#: _uninstall.php:35
-msgid "delete %s plugin files"
-msgstr "supprimer les fichiers du plugin %s"
+msgid "Edit basename"
+msgstr "Modifier l'URL"
 
-#: _uninstall.php:37
-msgid "delete %s version number"
-msgstr "supprimer la version %s"
+msgid "Edit event"
+msgstr "Modifier un événement"
 
-#: _widgets.php:51
-#: _widgets.php:106
-#: _widgets.php:204
-msgid "All periods"
-msgstr "Toutes les périodes"
+msgid "Edit this category"
+msgstr "Modifier cette catégorie"
 
-#: _widgets.php:52
-#: _widgets.php:107
-#: _widgets.php:205
-#: inc/index.events.php:225
-msgid "Not started"
-msgstr "Non débuté"
+msgid "Enable plugin"
+msgstr "Activer le plugin"
 
-#: _widgets.php:65
-msgid "EventHandler: events"
-msgstr "EventHandler : événements"
+msgid "End date"
+msgstr "Date de fin"
 
-#: _widgets.php:67
-#: _widgets.php:68
-msgid "Next events"
-msgstr "Événements à venir"
+msgid "End date:"
+msgstr "Date de fin :"
 
-#: _widgets.php:73
-msgid "Selected entries only"
-msgstr "Billets sélectionnés uniquement"
+#, php-format
+msgid "Event #%d (%s) has no related post to be unbound from."
+msgstr "L'événement n°%d (%s) n'a pas d'entrées liées."
 
-#: _widgets.php:74
-#: _widgets.php:123
-#: _widgets.php:230
-msgid "Period:"
-msgstr "Période :"
+#, php-format
+msgid "Event #%d (%s) unbound from %d related post"
+msgid_plural "Event #%d (%s) unbound from %d related posts"
+msgstr[0] "L'événement n°%d (%s) a bien été séparé de l'entrée liée"
+msgstr[1] "L'événement n°%d (%s) a bien été séparé de %d entrées liées"
 
-#: _widgets.php:75
-msgid "Date format of events:"
-msgstr "Format de date des événements :"
+msgid "Event handler"
+msgstr "Gestionnaire d'événements"
 
-#: _widgets.php:76
-msgid "Time format of events:"
-msgstr "Format d'heure des événements :"
+msgid "Event has been created."
+msgstr "L'événement a été créé."
 
-#: _widgets.php:77
-msgid "Show category"
-msgstr "Afficher la catégorie"
+msgid "Event has been updated."
+msgstr "L'événement a été mis à jour."
 
-#: _widgets.php:78
-#: _widgets.php:174
-#: _widgets.php:231
-#: _widgets.php:256
-msgid "Add link to events page"
-msgstr "Ajouter le lien vers la page des événements"
+msgid "Event is disabled on this blog"
+msgstr "L'événement est désactivé sur ce blog"
 
-#: _widgets.php:115
-msgid "EventHandler: events of an entry"
-msgstr "EventHandler : événements d'un billet"
+msgid "Event not being"
+msgstr "Événements pas en cours"
 
-#: _widgets.php:117
-#: _widgets.php:118
-msgid "Related events"
-msgstr "Événements liés"
+msgid "Event removed from post"
+msgstr "Événements retirés du billet"
+
+msgid "Event status"
+msgstr "Statut de l'événement"
 
-#: _widgets.php:148
 msgid "EventHandler: entries of an event"
 msgstr "EventHandler : billets d'un événement"
 
-#: _widgets.php:150
-#: _widgets.php:151
-msgid "Related entries"
-msgstr "Billets liés"
+msgid "EventHandler: events"
+msgstr "EventHandler : événements"
+
+msgid "EventHandler: events calendar"
+msgstr "EventHandler : calendrier des événements"
 
-#: _widgets.php:169
 msgid "EventHandler: events categories"
 msgstr "EventHandler : catégories d'événements"
 
-#: _widgets.php:171
-#: _widgets.php:172
-msgid "Events by categories"
-msgstr "Événements par catégorie"
-
-#: _widgets.php:173
-msgid "With events counts"
-msgstr "Avec le nombre d'événements"
+msgid "EventHandler: events map"
+msgstr "EventHandler : carte des événements"
 
-#: _widgets.php:188
-#: inc/index.settings.php:81
-msgid "road map"
-msgstr "route"
+msgid "EventHandler: events of an entry"
+msgstr "EventHandler : événements d'un billet"
 
-#: _widgets.php:189
-#: inc/index.settings.php:82
-msgid "satellite"
-msgstr "satellite"
+msgid "Events"
+msgstr "Événements"
 
-#: _widgets.php:190
-#: inc/index.settings.php:83
-msgid "hybrid"
-msgstr "hybride"
+msgid "Events by categories"
+msgstr "Événements par catégorie"
 
-#: _widgets.php:191
-#: inc/index.settings.php:84
-msgid "terrain"
-msgstr "terrain"
+msgid "Events calendar"
+msgstr "Calendrier des événements"
 
-#: _widgets.php:218
-msgid "EventHandler: events map"
-msgstr "EventHandler : carte des événements"
+msgid "Events from eventdata imported"
+msgstr "Événements importés depuis eventdata"
 
-#: _widgets.php:220
-#: _widgets.php:221
 msgid "Events on map"
 msgstr "Événements sur une carte"
 
-#: _widgets.php:223
-msgid "Default zoom on map:"
-msgstr "Zoom par défaut de la carte :"
-
-#: _widgets.php:224
-msgid "Default type of map:"
-msgstr "Type par défaut de la carte :"
+msgid "Events per page"
+msgstr "Evénements par page"
 
-#: _widgets.php:225
-msgid "Width of map (with unit as % or px):"
-msgstr "Largeur de la carte (avec les unités telles que % ou px) :"
+#, php-format
+msgid "Failed to delete records: %s"
+msgstr "Impossible de supprimer les enregistrements : %s"
 
-#: _widgets.php:226
-msgid "Height of map (with unit as % or px):"
-msgstr "Hauteur de la carte (avec les unités telles que % ou px) :"
+msgid "Failed to get calendar"
+msgstr "Impossible de récupérer le calendrier"
 
-#: _widgets.php:227
-msgid "Add tooltips"
-msgstr "Ajouter les info-bulles"
+#, php-format
+msgid "Failed to save configuration: %s"
+msgstr "Impossible de sauver la configuration : %s"
 
-#: _widgets.php:250
-msgid "EventHandler: events calendar"
-msgstr "EventHandler : calendrier des événements"
+msgid "Find coordinates on googleMap"
+msgstr "Trouver les coordonnées sur GoogleMaps"
 
-#: _widgets.php:252
-#: _widgets.php:253
-msgid "Events calendar"
-msgstr "Calendrier des événements"
+msgid "Finished"
+msgstr "Terminé"
 
-#: _widgets.php:254
 msgid "First day of week:"
 msgstr "Premier jour de la semaine :"
 
-#: _widgets.php:255
-msgid "Show only start date of events"
-msgstr "Afficher seulement la date de début des événements"
+#, php-format
+msgid "For the day of %s"
+msgstr "Pour la journée du %s"
 
-#: _widgets.php:351
-#: _widgets.php:472
-msgid "On %sd from %st to %et"
-msgstr "Le %sd de %st à %et"
+#, php-format
+msgid "For the month of %s"
+msgstr "Pour le mois de %s"
+
+#, php-format
+msgid "For the period between %s and %s"
+msgstr "Pour la période entre %s et %s"
+
+#, php-format
+msgid "For the period through %s and %s"
+msgstr "Pour la période passant entre %s et %s"
+
+#, php-format
+msgid "For the year of %s"
+msgstr "Pour l'année %s"
+
+msgid "From"
+msgstr "Du"
 
-#: _widgets.php:354
-#: _widgets.php:476
+#, php-format
 msgid "From %sd, %st to %ed, %et"
 msgstr "Du %sd, %st au %ed, %et"
 
-#: _widgets.php:372
-msgid "go to this category"
-msgstr "aller à cette catégorie"
+msgid "Go to this event on the site"
+msgstr "Voir cet événement sur le site"
 
-#: inc/class.admin.eventhandler.list.php:19
-#: inc/class.admin.eventhandler.minilist.php:22
-msgid "No event"
-msgstr "Pas d'événement"
+#, php-format
+msgid "Height of map (with unit as % or px):"
+msgstr "Hauteur de la carte (avec les unités telles que % ou px) :"
 
-#: inc/class.admin.eventhandler.list.php:100
-#: inc/class.admin.eventhandler.minilist.php:87
-#: inc/class.admin.eventhandler.posts.list.php:92
-#: inc/index.events.php:190
-msgid "selected"
-msgstr "Débuté"
+msgid "If you want to use maps, you must enter an address as precise as possible (number, street, city, country)"
+msgstr "Si vous souhaitez utiliser des cartes, vous devez entrer une adresse aussi précise que possible (numéro, rue, ville, pays)"
 
-#: inc/class.admin.eventhandler.minilist.php:30
-msgid "Period"
-msgstr "Période"
+msgid "Import eventdata records"
+msgstr "Importer les enregistrements de eventdata"
 
-#: inc/class.admin.eventhandler.php:49
-#: inc/class.admin.eventhandler.php:56
-#: inc/class.admin.eventhandler.php:234
-msgid "Bind events"
-msgstr "Attacher des événements"
+msgid "Latitude:"
+msgstr "Latitude :"
 
-#: inc/class.admin.eventhandler.php:50
-#: inc/class.admin.eventhandler.php:57
-msgid "Unbind events"
-msgstr "Détacher les événements"
+msgid "Level"
+msgstr "Niveau"
 
-#: inc/class.admin.eventhandler.php:86
-msgid "No such event"
-msgstr "Pas d'événement"
+msgid "List of entries related to this category"
+msgstr "Liste des billets liés à cette catégorie"
 
-#: inc/class.admin.eventhandler.php:110
-msgid "Select events to link to entries"
-msgstr "Sélectionner les événements à lier aux billets"
+msgid "List of events related to this category"
+msgstr "Liste des événements liés à cette catégorie"
 
-#: inc/class.admin.eventhandler.php:162
-msgid "Event #%d (%s) has no related post to be unbound from."
-msgstr "L'événement n°%d (%s) n'a pas d'entrées liées."
+msgid "Localization"
+msgstr "Localisation"
 
-#: inc/class.admin.eventhandler.php:222
-msgid "Check to unbind"
-msgstr "Cocher pour détacher"
+msgid "Location:"
+msgstr "Lieu :"
 
-#: inc/class.admin.eventhandler.php:241
-msgid "Change this entry into an event"
-msgstr "Changer ce billet en événement"
+msgid "Longitude:"
+msgstr "Longitude :"
 
-#: inc/class.admin.eventhandler.php:242
-msgid "Change into event"
-msgstr "Changer en événement"
+msgid "Maps"
+msgstr "Cartes"
 
-#: inc/class.eventhandler.php:220
-msgid "You are not allowed to create an event"
-msgstr "Vous n'êtes pas autorisé à créer un événement"
+msgid "Mark"
+msgstr "Marquer"
 
-#: inc/class.eventhandler.php:254
-msgid "You are not allowed to update events"
-msgstr "Vous n'êtes pas autorisé à mettre à jour les événements"
+msgid "Monday"
+msgstr "Lundi"
 
-#: inc/class.eventhandler.php:288
-msgid "You are not allowed to delete events"
-msgstr "Vous n'êtes pas autorisé à supprimer des événements"
+msgid "New event"
+msgstr "Nouvel événement"
 
-#: inc/class.eventhandler.php:315
-msgid "No event start date"
-msgstr "pas de date de début"
+msgid "Next events"
+msgstr "Événements à venir"
+
+msgid "No event"
+msgstr "Pas d'événement"
 
-#: inc/class.eventhandler.php:319
 msgid "No event end date"
 msgstr "pas de date de fin"
 
-#: inc/class.eventhandler.php:323
-msgid "Start date greater than end date"
-msgstr "date de début plus récente que la date de fin"
+msgid "No event start date"
+msgstr "pas de date de début"
+
+msgid "No such event"
+msgstr "Pas d'événement"
+
+msgid "No such event ID"
+msgstr "Pas de tel événement"
+
+msgid "Not finished"
+msgstr "Non terminé"
 
-#: inc/class.eventhandler.php:328
 msgid "Not full coordinate"
 msgstr "coordonnées incomplètes"
 
-#: inc/class.eventhandler.php:333
-#: inc/class.eventhandler.php:339
-msgid "Wrong format of coordinate"
-msgstr "mauvais format de coordonnées"
+msgid "Not started"
+msgstr "Non débuté"
 
-#: inc/class.eventhandler.php:374
-msgid "%s days"
-msgstr "%s jours"
+#, php-format
+msgid "On %sd from %st to %et"
+msgstr "Le %sd de %st à %et"
 
-#: inc/class.eventhandler.php:375
-msgid "one day"
-msgstr "un jour"
+msgid "Ongoing"
+msgstr "En cours"
 
-#: inc/class.eventhandler.php:376
-msgid "%s hours"
-msgstr "%s heures"
+msgid "Outgoing"
+msgstr "Pas en cours"
 
-#: inc/class.eventhandler.php:377
-msgid "one hour"
-msgstr "une heure"
+msgid "Period"
+msgstr "Période"
 
-#: inc/class.eventhandler.php:378
-msgid "%s minutes"
-msgstr "%s minutes"
+msgid "Period of events:"
+msgstr "Période d'événements : "
 
-#: inc/class.eventhandler.php:379
-msgid "one minute"
-msgstr "une minute"
+msgid "Period:"
+msgstr "Période :"
 
-#: inc/class.eventhandler.php:380
-msgid "instantaneous"
-msgstr "instantané"
+msgid "Please wait"
+msgstr "Veuillez patienter"
 
-#: inc/class.eventhandler.php:402
 msgid "Please wait, try to create map..."
 msgstr "Veuillez patienter, construction de la carte..."
 
-#: inc/index.event.php:49
-msgid "New event"
-msgstr "Nouvel événement"
-
-#: inc/index.event.php:134
-msgid "This event does not exist."
-msgstr "Cet événement n'existe pas."
+msgid "Preview event"
+msgstr "Prévisualiser l'événement"
 
-#: inc/index.event.php:161
-msgid "Change entry into event"
-msgstr "Changer un billet en événement"
+msgid "Published date"
+msgstr "Date de publication"
 
-#: inc/index.event.php:169
-msgid "Edit event"
-msgstr "Modifier un événement"
+msgid "Read more"
+msgstr "Lire la suite"
 
-#: inc/index.event.php:176
-msgid "next event"
-msgstr "Événement suivant"
+msgid "Records deleted"
+msgstr "Enregistrements supprimés"
 
-#: inc/index.event.php:183
-msgid "previous event"
-msgstr "Événement précédent"
+msgid "Records of eventdata have been imported for this blog."
+msgstr "Les enregistrements de eventdata ont déjà été importés pour ce blog."
 
-#: inc/index.event.php:382
-msgid "Event has been updated."
-msgstr "L'événement a été mis à jour."
+msgid "Related entries"
+msgstr "Billets liés"
 
-#: inc/index.event.php:384
-msgid "Event has been created."
-msgstr "L'événement a été créé."
+msgid "Related events"
+msgstr "Événements liés"
 
-#: inc/index.events.php:191
-msgid "not selected"
-msgstr "Non débuté"
+msgid "Schedule"
+msgstr "Programmer"
 
-#: inc/index.events.php:214
-msgid "Localization"
-msgstr "Localisation"
+msgid "Scheduled"
+msgstr "programmé"
 
-#: inc/index.events.php:255
-msgid "Unbind related entries"
-msgstr "Séparer les entrées liées"
+msgid "Scheduled events"
+msgstr "Événements programmés"
 
-#: inc/index.settings.php:73
-msgid "before content"
-msgstr "avant le contenu"
+msgid "Select events to link to entries"
+msgstr "Sélectionner les événements à lier aux billets"
 
-#: inc/index.settings.php:74
-msgid "after content"
-msgstr "après le contenu"
+msgid "Selected event"
+msgstr "Événement sélectionné"
 
-#: inc/lib.eventhandler.calendar.php:123
-msgid "Calendar"
-msgstr "Calendrier"
+msgid "Show category"
+msgstr "Afficher la catégorie"
 
-#: inc/lib.eventhandler.calendar.php:136
-msgid "Detail"
-msgstr "Détail"
+msgid "Show only start date of events"
+msgstr "Afficher seulement la date de début des événements"
 
-#: inc/lib.eventhandler.calendar.php:197
-msgid "one event"
-msgstr "un événement"
+msgid "Show related entries on event:"
+msgstr "Afficher les billets liés sur un événement :"
 
-#: inc/lib.eventhandler.calendar.php:197
-msgid "%s events"
-msgstr "%s événements"
+msgid "Show related events on entry:"
+msgstr "Afficher les événements liés sur un billet :"
 
-#: inc/lib.eventhandler.pubrest.php:30
-msgid "An error occured"
-msgstr "Erreur"
+msgid "Sort events by:"
+msgstr "Classés par : "
 
-#: inc/lib.eventhandler.pubrest.php:34
-msgid "Event is disabled on this blog"
-msgstr "L'événement est désactivé sur ce blog"
+msgid "Start date"
+msgstr "Date de début"
 
-#: inc/lib.eventhandler.pubrest.php:60
-msgid "Failed to get calendar"
-msgstr "Impossible de récupérer le calendrier"
+msgid "Start date greater than end date"
+msgstr "date de début plus récente que la date de fin"
 
-#: inc/lib.eventhandler.rs.extension.php:233
 msgid "Start date:"
 msgstr "Date de début :"
 
-#: inc/lib.eventhandler.rs.extension.php:234
-msgid "End date:"
-msgstr "Date de fin :"
-
-#: inc/lib.eventhandler.rs.extension.php:237
-msgid "Address:"
-msgstr "Adresse :"
-
-#: inc/lib.eventhandler.rs.extension.php:241
-msgid "Location:"
-msgstr "Lieu :"
-
-#: inc/lib.eventhandler.rs.extension.php:241
-msgid "latitude:"
-msgstr "latitude :"
-
-#: inc/lib.eventhandler.rs.extension.php:241
-msgid "longitude:"
-msgstr "longitude :"
-
-#: inc/lib.eventhandler.rs.extension.php:250
-msgid "Read more"
-msgstr "Lire la suite"
-
-#: index.php:45
-msgid "Settings"
-msgstr "Paramètres"
-
-#: index.php:54
-msgid "Configuration saved"
-msgstr "Configuration sauvegardée"
+msgid "Started"
+msgstr "Débuté"
 
-#: index.php:55
-msgid "Records deleted"
-msgstr "Enregistrements supprimés"
+msgid "Started events"
+msgstr "Événements débutés"
 
-#: index.php:60
-msgid "Failed to save configuration: %s"
-msgstr "Impossible de sauver la configuration : %s"
+msgid "Sunday"
+msgstr "Dimanche"
 
-#: index.php:61
-msgid "Failed to delete records: %s"
-msgstr "Impossible de supprimer les enregistrements : %s"
+msgid "There's no event at this time."
+msgstr "Il n'y a pas d'événement pour l'instant."
 
-msgid "Manage events on his blog"
-msgstr "Gérer des événements sur son blog"
+msgid "These events Atom feed"
+msgstr "Flux Atom des événements"
 
-msgid "Additionnal style sheet:"
-msgstr "Feuille de style additionnelle"
+msgid "This event does not exist."
+msgstr "Cet événement n'existe pas."
 
-msgid "Apply filters"
-msgstr "Filtres"
+msgid "This page is powered by Dotclear and eventHandler"
+msgstr "Cette page est propulsée par Dotclear et eventHandler"
 
-msgid "Attach selected events"
-msgstr "Lier les événements sélectionnés"
+msgid "Time format of events:"
+msgstr "Format d'heure des événements :"
 
-msgid "Bind an event"
-msgstr "Lier un événement"
+msgid "Unbind events"
+msgstr "Détacher les événements"
 
-msgid "Edit this category"
-msgstr "Modifier cette catégorie"
+msgid "Unbind related entries"
+msgstr "Séparer les entrées liées"
 
-msgid "Enable plugin"
-msgstr "Activer le plugin"
+msgid "Uncategorized"
+msgstr "Sans catégorie"
 
-msgid "Entries of an event"
-msgstr "Billets d'un événement"
+msgid "Unfinished events"
+msgstr "Événements non terminés"
 
-msgid "Events categories"
-msgstr "Catégories d'événements"
+msgid "When an event has an hidden category, it will only display on its category page."
+msgstr "Quand un événement a une catégorie cachée, il ne s'affiche que sur sa page de catégorie."
 
-msgid "Events from eventdata successfully imported"
-msgstr "Événements importés avec succès depuis eventdata"
+#, php-format
+msgid "Width of map (with unit as % or px):"
+msgstr "Largeur de la carte (avec les unités telles que % ou px) :"
 
-msgid "Events map"
-msgstr "Carte des événements"
+msgid "With events counts"
+msgstr "Avec le nombre d'événements"
 
-msgid "Events of an entry"
-msgstr "Événements d'un billet"
+msgid "Wrong format of coordinate"
+msgstr "mauvais format de coordonnées"
 
-msgid "Events:"
-msgstr "Événements :"
+msgid "You are not allowed to create an event"
+msgstr "Vous n'êtes pas autorisé à créer un événement"
 
-msgid "Find coordinates on googleMap"
-msgstr "Trouver les coordonnées sur GoogleMaps"
+msgid "You are not allowed to delete events"
+msgstr "Vous n'êtes pas autorisé à supprimer des événements"
 
-msgid "Height of map: (with unit as % or px)"
-msgstr "Hauteur de la carte : (avec les unités telles que % ou px)"
+msgid "You are not allowed to update events"
+msgstr "Vous n'êtes pas autorisé à mettre à jour les événements"
 
-msgid "If you want to use maps, you must enter an address as precise as possible (number, street, city, country)"
-msgstr "Si vous souhaitez utiliser des cartes, vous devez entrer une adresse aussi précise que possible (numéro, rue, ville, pays)"
+msgid "You must save event before adding entries"
+msgstr "Vous devez sauvegarder l'événement avant d'ajouter des billets"
 
-msgid "Import eventdata records"
-msgstr "Importer les enregistrements de eventdata"
+msgid "after content"
+msgstr "après le contenu"
 
-msgid "Latitude:"
-msgstr "Latitude :"
+msgid "before content"
+msgstr "avant le contenu"
 
-msgid "Level"
-msgstr "Niveau"
+#, php-format
+msgid "delete %s plugin files"
+msgstr "supprimer les fichiers du plugin %s"
 
-msgid "List of entries related to this category"
-msgstr "Liste des billets liés à cette catégorie"
+#, php-format
+msgid "delete %s version number"
+msgstr "supprimer la version %s"
 
-msgid "List of events related to this category"
-msgstr "Liste des événements liés à cette catégorie"
+#, php-format
+msgid "delete all %s settings"
+msgstr "supprimer tous les paramètres de %s"
 
-msgid "Localization:"
-msgstr "Localisation :"
+msgid "delete all settings"
+msgstr "supprimer tous les paramètres"
 
-msgid "Longitude:"
-msgstr "Longitude :"
+msgid "delete plugin files"
+msgstr "supprimer les fichiers du plugin"
 
-msgid "Maps"
-msgstr "Cartes"
+msgid "delete table"
+msgstr "supprimer la table de la base de données"
 
-msgid "Preview event"
-msgstr "Prévisualiser l'événement"
+msgid "delete the version number"
+msgstr "supprimer le numéro de version"
 
-msgid "Records of eventdata have been imported for this blog."
-msgstr "Les enregistrements de eventdata ont déjà été importés pour ce blog."
+msgid "finished"
+msgstr "terminé"
 
-msgid "Records succesfully deleted"
-msgstr "Enregistrements effacés avec succès"
+msgid "for a period of"
+msgstr "pour une durée de"
 
-msgid "Show related entries on event:"
-msgstr "Afficher les billets liés sur un événement :"
+msgid "go to this category"
+msgstr "aller à cette catégorie"
 
-msgid "Show related events on entry:"
-msgstr "Afficher les événements liés sur un billet :"
+msgid "hybrid"
+msgstr "hybride"
 
-msgid "View event"
-msgstr "Voir l'événement"
+msgid "instantaneous"
+msgstr "instantané"
 
-msgid "When an event has an hidden category, it will only display on its category page."
-msgstr "Quand un événement a une catégorie cachée, il ne s'affiche que sur sa page de catégorie."
+msgid "latitude:"
+msgstr "latitude :"
 
-msgid "Width of map: (with unit as % or px)"
-msgstr "Largeur de la carte : (avec les unités telles que % ou px)"
+msgid "list of events"
+msgstr "liste des événements"
 
-msgid "You must save event before adding entries"
-msgstr "Vous devez sauvegarder l'événement avant d'ajouter des billets"
+msgid "longitude:"
+msgstr "longitude :"
 
-msgid "Go to this event on the site"
-msgstr "Voir cet événement sur le site"
+msgid "next event"
+msgstr "Événement suivant"
 
-msgid "Selected event"
-msgstr "Événement sélectionné"
+msgid "of"
+msgstr "de"
 
-msgid "Event status"
-msgstr "Statut de l'événement"
+msgid "one day"
+msgstr "un jour"
 
-msgid "Period of events:"
-msgstr "Période d'événements :"
+msgid "one event"
+msgstr "un événement"
 
-msgid "Sort events by:"
-msgstr "Classer par :"
+msgid "one hour"
+msgstr "une heure"
 
-msgid "Atom feed"
-msgstr "Flux Atom"
+msgid "one minute"
+msgstr "une minute"
 
-msgid "These events Atom feed"
-msgstr "Flux Atom des événements"
+msgid "ongoing"
+msgstr "en cours"
 
-msgid "Add these events to your iCalendar"
-msgstr "Ajouter ces événements à votre iCalendar"
+msgid "previous event"
+msgstr "Événement précédent"
 
-msgid "iCalendar"
-msgstr "iCalender"
+msgid "road map"
+msgstr "route"
 
-msgid "Display these events on hCalendar format"
-msgstr "Afficher ces événements au format hCalendar"
+msgid "satellite"
+msgstr "satellite"
 
-msgid "Display these events on a map"
-msgstr "Afficher ces événements sur un carte"
+msgid "scheduled"
+msgstr "programmé"
 
-msgid "for a period of"
-msgstr "pour une durée de"
+msgid "terrain"
+msgstr "terrain"
 
 msgid "this event is"
 msgstr "cet événement est"
 
-msgid "Display this event on hCalendar format"
-msgstr "Afficher cet événement au format hCalendar"
-
-msgid "From"
-msgstr "Du"
+msgid "till"
+msgstr "à"
 
 msgid "to"
 msgstr "au"
 
-msgid "Add this event to your iCalendar"
-msgstr "Ajouter cet événement à votre iCalendar"
-
-msgid "%d entry has been successfully bound %s"
-msgid_plural "%d entries have been successfully bound %s"
-msgstr[0] "%d billet a bien été lié %s"
-msgstr[1] "%d billets ont bien été liés %s"
-
-msgid "%d post has been successfully unbound from its events"
-msgid_plural "%d posts have been successfully unbound from their events"
-msgstr[0] "%d billet a été bien été détaché de ses événements"
-msgstr[1] "%d billets ont été bien été détachés de leurs événements"
-
 msgid "to the selected event"
 msgid_plural "to the selected events"
 msgstr[0] "à l'événement sélectionné"
 msgstr[1] "aux événements sélectionnés"
-
-msgid "Event #%d (%s) successfully unbound from %d related post"
-msgid_plural "Event #%d (%s) successfully unbound from %d related posts"
-msgstr[0] "L'événement n°%d (%s) a bien été séparé d'%d entrée liée"
-msgstr[1] "L'événement n°%d (%s) a bien été séparé de %d entrées liées"
-
-msgid "Event #%d (%s) has no related post to be unbound from."
-msgstr "L'événement n°%d (%s) n'a pas d'entrées liées."
-
-msgid "Configuration has been updated."
-msgstr "La configuration a été mise à jour."
diff --git a/locales/templates/messages.pot b/locales/templates/messages.pot
index dc1dfe3..e3f7aa7 100644
--- a/locales/templates/messages.pot
+++ b/locales/templates/messages.pot
@@ -6,39 +6,72 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: eventHandler 1.1\n"
+"Project-Id-Version: eventHandler 2015.05.31\n"
 "Report-Msgid-Bugs-To: nikrou77+l10n@gmail.com\n"
-"POT-Creation-Date: 2014-11-19 08:47+0100\n"
+"POT-Creation-Date: 2015-05-31 19:55+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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: _widgets.php:73
+#: inc/class.eventhandler.admin.widgets.php:64
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: _widgets.php:74
+#: inc/class.eventhandler.admin.widgets.php:65
 msgid "%H:%M"
 msgstr ""
 
-#: _admin.php:409 _admin.php:410 inc/index.event.php:121
-#: inc/index.events.php:148 inc/index.events.php:149 inc/index.events.php:151
+#: inc/class.admin.eventhandler.minilist.php:98
+#: inc/class.admin.eventhandler.minilist.php:99
+#: inc/class.admin.eventhandler.list.php:125
+#: inc/class.admin.eventhandler.list.php:126
+#: inc/class.admin.eventhandler.list.php:128
+#: inc/class.admin.eventhandler.posts.list.php:101
 msgid "%Y-%m-%d %H:%M"
 msgstr ""
 
-#: _public.php:1112 _public.php:1112
+#: inc/class.admin.eventhandler.php:101
+#, php-format
+msgid "%d entry has been bound %s"
+msgid_plural "%d entries have been bound %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: inc/index.events.php:128
+#, php-format
+msgid "%d entry has been moved to category \"%s\""
+msgid_plural "%d entries have been moved to category \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: inc/index.events.php:86
+#, php-format
+msgid "%d entry has been set to user \"%s\""
+msgid_plural "%d entries have been set to user \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: inc/class.admin.eventhandler.php:149
+#, php-format
+msgid "%d post has been unbound from its events"
+msgid_plural "%d posts have been unbound from their events"
+msgstr[0] ""
+msgstr[1] ""
+
+#: inc/class.tpl.eventhandler.php:266
 msgid "%m %Y"
 msgstr ""
 
-#: _public.php:1093 _public.php:1093
+#: inc/class.tpl.eventhandler.php:252
 msgid "%m %d %Y"
 msgstr ""
 
-#: inc/class.eventhandler.php:441
+#: inc/class.eventhandler.php:372
 #, php-format
 msgid "%s days"
 msgstr ""
@@ -48,50 +81,71 @@ msgstr ""
 msgid "%s events"
 msgstr ""
 
-#: inc/class.eventhandler.php:443
+#: inc/class.eventhandler.php:374
 #, php-format
 msgid "%s hours"
 msgstr ""
 
-#: inc/class.eventhandler.php:445
+#: inc/class.eventhandler.php:376
 #, php-format
 msgid "%s minutes"
 msgstr ""
 
-#: inc/index.settings.php:112
+#: tpl/settings.tpl:16 tpl/settings.tpl:19 tpl/settings.tpl:16
+#: tpl/settings.tpl:19
 msgid "Activation"
 msgstr ""
 
-#: _widgets.php:76 _widgets.php:157 _widgets.php:208 _widgets.php:228
+#: inc/class.eventhandler.admin.widgets.php:67
+#: inc/class.eventhandler.admin.widgets.php:169
+#: inc/class.eventhandler.admin.widgets.php:226
+#: inc/class.eventhandler.admin.widgets.php:253
 msgid "Add link to events page"
 msgstr ""
 
-#: _widgets.php:204
+#: eventHandler_dummy.php:2
+msgid "Add these events to your iCalendar"
+msgstr ""
+
+#: eventHandler_dummy.php:3
+msgid "Add this event to your iCalendar"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:222
 msgid "Add tooltips"
 msgstr ""
 
-#: inc/index.settings.php:117
+#: tpl/settings.tpl:31 tpl/settings.tpl:31
 msgid "Additionnal style sheet:"
 msgstr ""
 
-#: inc/lib.eventhandler.rs.extension.php:237 inc/index.event.php:682
+#: inc/lib.eventhandler.rs.extension.php:237 tpl/edit_event.tpl:127
 msgid "Address:"
 msgstr ""
 
-#: _public.php:862 _public.php:1066 _public.php:862 _public.php:1066
+#: inc/class.tpl.eventhandler.php:62 inc/class.tpl.eventhandler.php:228
 msgid "All"
 msgstr ""
 
-#: _widgets.php:348 _widgets.php:462 _widgets.php:595 _widgets.php:683
-#: _widgets.php:726 _public.php:1054 _public.php:1054
+#: inc/class.tpl.eventhandler.php:218
+#: inc/class.eventhandler.public.widgets.php:127
+#: inc/class.eventhandler.public.widgets.php:230
+#: inc/class.eventhandler.public.widgets.php:366
+#: inc/class.eventhandler.public.widgets.php:450
+#: inc/class.eventhandler.public.widgets.php:495 eventHandler_dummy.php:4
 msgid "All events"
 msgstr ""
 
-#: _widgets.php:60 _widgets.php:149 _widgets.php:193 _widgets.php:219
+#: inc/class.eventhandler.admin.widgets.php:49
+#: inc/class.eventhandler.admin.widgets.php:156
+#: inc/class.eventhandler.admin.widgets.php:206
+#: inc/class.eventhandler.admin.widgets.php:239
 msgid "All pages"
 msgstr ""
 
-#: _widgets.php:51 _widgets.php:101 _widgets.php:184
+#: inc/class.eventhandler.admin.widgets.php:40
+#: inc/class.eventhandler.admin.widgets.php:94
+#: inc/class.eventhandler.admin.widgets.php:197
 msgid "All periods"
 msgstr ""
 
@@ -99,154 +153,205 @@ msgstr ""
 msgid "An error occured"
 msgstr ""
 
-#: _services.php:44
+#: _services.php:43
 msgid "An error occured when trying de unbind event"
 msgstr ""
 
-#: inc/index.events.php:556
-msgid "Apply filters"
+#: tpl/list_events.tpl:71
+msgid "Apply filters and display options"
 msgstr ""
 
-#: _widgets.php:47 _widgets.php:97 _widgets.php:134 _widgets.php:180
-#: inc/index.events.php:309
+#: eventHandler_dummy.php:5
+msgid "Archives"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:36
+#: inc/class.eventhandler.admin.widgets.php:90
+#: inc/class.eventhandler.admin.widgets.php:134
+#: inc/class.eventhandler.admin.widgets.php:193 inc/index.events.php:219
 msgid "Ascending"
 msgstr ""
 
-#: inc/index.events.php:576
-msgid "Attach selected events"
+#: eventHandler_dummy.php:6
+msgid "Atom feed"
 msgstr ""
 
-#: inc/index.event.php:547
-msgid "Attachment has been removed."
+#: tpl/list_events.tpl:22
+#, php-format
+msgid "Attach events to \"%s\" post."
 msgstr ""
 
-#: inc/index.event.php:547
-msgid "Attachment has been successfully removed."
+#: tpl/list_events.tpl:83
+msgid "Attach selected events"
 msgstr ""
 
-#: inc/index.event.php:40 inc/index.events.php:43 inc/index.events.php:299
-#: _public.php:947 _public.php:947
+#: inc/class.tpl.eventhandler.php:136 inc/index.events.php:209
+#: inc/class.admin.eventhandler.list.php:33
+#: inc/class.admin.eventhandler.posts.list.php:31
 msgid "Author"
 msgstr ""
 
-#: inc/index.events.php:527
+#: tpl/list_events.tpl:30
 msgid "Author:"
 msgstr ""
 
-#: inc/index.event.php:206 inc/index.event.php:212
+#: inc/index.event.php:103 inc/index.event.php:107
 msgid "Available"
 msgstr ""
 
-#: inc/index.events.php:512
-msgid "Bind an event"
+#: inc/class.admin.eventhandler.php:49 inc/class.admin.eventhandler.php:56
+#: inc/class.admin.eventhandler.php:227
+msgid "Bind events"
 msgstr ""
 
-#: _admin.php:91 _admin.php:261
-msgid "Bind events"
+#: eventHandler_dummy.php:7
+msgid "Browse this category"
+msgstr ""
+
+#: eventHandler_dummy.php:8
+msgid "By"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:70
+#: inc/class.eventhandler.admin.widgets.php:116
+#: inc/class.eventhandler.admin.widgets.php:150
+#: inc/class.eventhandler.admin.widgets.php:172
+#: inc/class.eventhandler.admin.widgets.php:229
+#: inc/class.eventhandler.admin.widgets.php:256
+msgid "CSS class:"
 msgstr ""
 
 #: inc/lib.eventhandler.calendar.php:123
 msgid "Calendar"
 msgstr ""
 
-#: inc/index.settings.php:139
+#: tpl/edit_event.tpl:176
+msgid "Cancel"
+msgstr ""
+
+#: tpl/list_events.tpl:11
+msgid "Cancel filters and display options"
+msgstr ""
+
+#: tpl/settings.tpl:78 tpl/settings.tpl:80 tpl/settings.tpl:78
+#: tpl/settings.tpl:80
 msgid "Categories"
 msgstr ""
 
-#: inc/index.event.php:39 inc/index.event.php:615 inc/index.events.php:42
-#: inc/index.events.php:298 inc/index.settings.php:144
+#: inc/index.events.php:208 inc/class.admin.eventhandler.list.php:32
+#: inc/class.admin.eventhandler.posts.list.php:30 tpl/edit_event.tpl:84
+#: tpl/settings.tpl:85 tpl/settings.tpl:85
 msgid "Category"
 msgstr ""
 
-#: _widgets.php:67 _widgets.php:112 _widgets.php:140
-#: inc/lib.eventhandler.rs.extension.php:245 inc/index.event.php:616
-#: inc/index.events.php:529
+#: inc/class.eventhandler.admin.widgets.php:58
+#: inc/class.eventhandler.admin.widgets.php:110
+#: inc/class.eventhandler.admin.widgets.php:145
+#: inc/lib.eventhandler.rs.extension.php:245 tpl/list_events.tpl:33
+#: tpl/edit_event.tpl:85
 msgid "Category:"
 msgstr ""
 
-#: inc/index.events.php:339 inc/index.events.php:342
+#: inc/index.events.php:248 inc/index.events.php:250
 msgid "Change"
 msgstr ""
 
-#: inc/index.events.php:343
+#: inc/index.events.php:251
 msgid "Change author"
 msgstr ""
 
-#: inc/index.events.php:339
+#: inc/index.events.php:248
 msgid "Change category"
 msgstr ""
 
-#: inc/index.event.php:277
+#: inc/index.event.php:161
 msgid "Change entry into event"
 msgstr ""
 
-#: _admin.php:270
+#: inc/class.admin.eventhandler.php:233
 msgid "Change into event"
 msgstr ""
 
-#: _admin.php:269
+#: inc/class.admin.eventhandler.php:233
 msgid "Change this entry into an event"
 msgstr ""
 
-#: _admin.php:250
+#: inc/class.admin.eventhandler.php:218
 msgid "Check to unbind"
 msgstr ""
 
-#: inc/index.event.php:550
-msgid "Comment has been created."
+#: inc/class.tpl.eventhandler.php:224
+msgid "Completed events"
 msgstr ""
 
-#: inc/index.event.php:550
-msgid "Comment has been successfully created."
+#: tpl/settings.tpl:29 tpl/settings.tpl:29
+msgid "Configuration"
 msgstr ""
 
-#: _public.php:1060 _public.php:1060
-msgid "Completed events"
+#: inc/index.settings.php:73
+msgid "Configuration has been updated."
 msgstr ""
 
-#: index.php:60
+#: index.php:54
 msgid "Configuration saved"
 msgstr ""
 
-#: index.php:60
-msgid "Configuration successfully saved"
+#: inc/class.eventhandler.admin.widgets.php:69
+#: inc/class.eventhandler.admin.widgets.php:115
+#: inc/class.eventhandler.admin.widgets.php:149
+#: inc/class.eventhandler.admin.widgets.php:171
+#: inc/class.eventhandler.admin.widgets.php:228
+#: inc/class.eventhandler.admin.widgets.php:255
+msgid "Content only"
 msgstr ""
 
-#: inc/index.event.php:715
+#: tpl/edit_event.tpl:161
 msgid "Content:"
 msgstr ""
 
-#: inc/index.event.php:634
+#: eventHandler_dummy.php:9
+msgid "Continue reading"
+msgstr ""
+
+#: tpl/edit_event.tpl:68
 msgid "Convert to XHTML"
 msgstr ""
 
-#: _public.php:1055 _public.php:1055
+#: inc/class.tpl.eventhandler.php:219
 msgid "Current events"
 msgstr ""
 
-#: _widgets.php:41 _widgets.php:91 _widgets.php:130 _widgets.php:174
-#: inc/index.event.php:38 inc/index.events.php:41 inc/index.events.php:296
+#: inc/class.eventhandler.admin.widgets.php:30
+#: inc/class.eventhandler.admin.widgets.php:84
+#: inc/class.eventhandler.admin.widgets.php:130
+#: inc/class.eventhandler.admin.widgets.php:187 inc/index.events.php:206
+#: inc/class.admin.eventhandler.list.php:31
+#: inc/class.admin.eventhandler.posts.list.php:29
 msgid "Date"
 msgstr ""
 
-#: _widgets.php:73
+#: inc/class.eventhandler.admin.widgets.php:64
 msgid "Date format of events:"
 msgstr ""
 
-#: _widgets.php:201 inc/index.settings.php:191
+#: inc/class.eventhandler.admin.widgets.php:219 tpl/settings.tpl:69
+#: tpl/settings.tpl:69
 msgid "Default type of map:"
 msgstr ""
 
-#: _widgets.php:200 inc/index.settings.php:187
+#: inc/class.eventhandler.admin.widgets.php:218 tpl/settings.tpl:63
+#: tpl/settings.tpl:63
 msgid "Default zoom on map:"
 msgstr ""
 
-#: inc/index.events.php:347
+#: inc/index.events.php:254 tpl/edit_event.tpl:181
 msgid "Delete"
 msgstr ""
 
-#: _widgets.php:48 _widgets.php:98 _widgets.php:135 _widgets.php:181
-#: inc/index.events.php:308
+#: inc/class.eventhandler.admin.widgets.php:37
+#: inc/class.eventhandler.admin.widgets.php:91
+#: inc/class.eventhandler.admin.widgets.php:135
+#: inc/class.eventhandler.admin.widgets.php:194 inc/index.events.php:218
 msgid "Descending"
 msgstr ""
 
@@ -254,157 +359,197 @@ msgstr ""
 msgid "Detail"
 msgstr ""
 
-#: _public.php:716 _public.php:716
+#: inc/class.url.eventhandler.php:452
 msgid "Directory:"
 msgstr ""
 
-#: _widgets.php:77 _widgets.php:158 _widgets.php:209 _widgets.php:229
+#: inc/class.eventhandler.admin.widgets.php:68
+#: inc/class.eventhandler.admin.widgets.php:170
+#: inc/class.eventhandler.admin.widgets.php:227
+#: inc/class.eventhandler.admin.widgets.php:254
 msgid "Display on:"
 msgstr ""
 
-#: inc/index.event.php:560
+#: tpl/list_events.tpl:58
+msgid "Display options"
+msgstr ""
+
+#: eventHandler_dummy.php:10
+msgid "Display these events on a map"
+msgstr ""
+
+#: eventHandler_dummy.php:11
+msgid "Display these events on hCalendar format"
+msgstr ""
+
+#: eventHandler_dummy.php:12
+msgid "Display this event on hCalendar format"
+msgstr ""
+
+#: inc/index.event.php:388
 msgid "Don't forget to validate your XHTML conversion by saving your post."
 msgstr ""
 
-#: inc/index.event.php:649
+#: _install.php:21
+#, php-format
+msgid "Dotclear version %s minimum is required. \"%s\" is deactivated"
+msgstr ""
+
+#: tpl/edit_event.tpl:94
 msgid "Edit basename"
 msgstr ""
 
-#: inc/index.event.php:287 inc/index.event.php:609
+#: inc/index.event.php:169 tpl/edit_event.tpl:51 tpl/edit_event.tpl:109
 msgid "Edit event"
 msgstr ""
 
-#: inc/index.settings.php:173
+#: tpl/settings.tpl:108 tpl/settings.tpl:108
 msgid "Edit this category"
 msgstr ""
 
-#: inc/index.settings.php:115
-msgid "Enable extension"
+#: tpl/settings.tpl:22 tpl/settings.tpl:22
+msgid "Enable plugin"
 msgstr ""
 
-#: _admin.php:345 _widgets.php:44 _widgets.php:94 _widgets.php:177
-#: inc/index.events.php:39 inc/index.events.php:303 _public.php:950
-#: _public.php:950
+#: inc/class.eventhandler.admin.widgets.php:33
+#: inc/class.eventhandler.admin.widgets.php:87
+#: inc/class.eventhandler.admin.widgets.php:190
+#: inc/class.tpl.eventhandler.php:139 inc/index.events.php:213
+#: inc/class.admin.eventhandler.minilist.php:32
+#: inc/class.admin.eventhandler.list.php:29
 msgid "End date"
 msgstr ""
 
-#: inc/lib.eventhandler.rs.extension.php:234 inc/index.event.php:673
+#: inc/lib.eventhandler.rs.extension.php:234 tpl/edit_event.tpl:119
 msgid "End date:"
 msgstr ""
 
-#: inc/index.events.php:40 inc/index.events.php:348 inc/index.settings.php:128
-#: inc/index.settings.php:146
+#: inc/index.events.php:255 inc/class.admin.eventhandler.list.php:30
+#: tpl/settings.tpl:50 tpl/settings.tpl:87 tpl/settings.tpl:50
+#: tpl/settings.tpl:87
 msgid "Entries"
 msgstr ""
 
-#: _widgets.php:68 _widgets.php:113 _widgets.php:141
+#: inc/class.eventhandler.admin.widgets.php:59
+#: inc/class.eventhandler.admin.widgets.php:111
+#: inc/class.eventhandler.admin.widgets.php:146
 msgid "Entries limit:"
 msgstr ""
 
-#: _widgets.php:138
-msgid "Entries of an event"
+#: tpl/edit_event.tpl:72
+msgid "Entry language"
 msgstr ""
 
-#: inc/index.events.php:552
-msgid "Entries per page"
+#: inc/class.admin.eventhandler.php:162
+#, php-format
+msgid "Event #%d (%s) has no related post to be unbound from."
 msgstr ""
 
-#: inc/index.event.php:541
-msgid "Entry has been created."
-msgstr ""
+#: inc/class.admin.eventhandler.php:171
+#, php-format
+msgid "Event #%d (%s) unbound from %d related post"
+msgid_plural "Event #%d (%s) unbound from %d related posts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: inc/index.event.php:541
-msgid "Entry has been successfully created."
+#: _admin.php:29 inc/class.admin.eventhandler.php:19 index.php:49
+#: tpl/edit_event.tpl:3 tpl/settings.tpl:3 tpl/settings.tpl:3
+msgid "Event handler"
 msgstr ""
 
-#: inc/index.event.php:538
-msgid "Entry has been successfully updated."
+#: inc/index.event.php:312
+msgid "Event has been created."
 msgstr ""
 
-#: inc/index.event.php:538
-msgid "Entry has been updated."
+#: inc/index.event.php:295
+msgid "Event has been updated."
 msgstr ""
 
-#: inc/index.event.php:640
-msgid "Entry language"
+#: inc/lib.eventhandler.pubrest.php:34
+msgid "Event is disabled on this blog"
 msgstr ""
 
-#: inc/index.event.php:620
-msgid "Entry status"
+#: inc/class.tpl.eventhandler.php:220
+msgid "Event not being"
 msgstr ""
 
-#: _admin.php:28 _admin.php:58 inc/index.event.php:520
-#: inc/index.events.php:493 inc/index.events.php:504
-#: inc/index.settings.php:103 index.php:55
-msgid "Event handler"
+#: _services.php:47
+msgid "Event removed from post"
 msgstr ""
 
-#: inc/lib.eventhandler.pubrest.php:34
-msgid "Event is disabled on this blog"
+#: tpl/edit_event.tpl:58
+msgid "Event status"
 msgstr ""
 
-#: _public.php:1056 _public.php:1056
-msgid "Event not being"
+#: inc/class.eventhandler.admin.widgets.php:139
+msgid "EventHandler: entries of an event"
 msgstr ""
 
-#: _services.php:48
-msgid "Event removed from post"
+#: inc/class.eventhandler.admin.widgets.php:54
+msgid "EventHandler: events"
 msgstr ""
 
-#: _services.php:48
-msgid "Event successfully removed from post"
+#: inc/class.eventhandler.admin.widgets.php:245
+msgid "EventHandler: events calendar"
 msgstr ""
 
-#: _admin.php:91 _admin.php:92 _widgets.php:65 inc/index.event.php:565
-#: inc/index.events.php:493 inc/index.events.php:496 inc/index.events.php:504
-#: inc/index.events.php:512 inc/index.settings.php:106
-#: inc/index.settings.php:121 inc/index.settings.php:147 _public.php:702
-#: _public.php:712 _public.php:757 _public.php:702 _public.php:712
-#: _public.php:757
-msgid "Events"
+#: inc/class.eventhandler.admin.widgets.php:162
+msgid "EventHandler: events categories"
 msgstr ""
 
-#: _widgets.php:155
-msgid "Events by categories"
+#: inc/class.eventhandler.admin.widgets.php:212
+msgid "EventHandler: events map"
 msgstr ""
 
-#: _widgets.php:224 _widgets.php:225
-msgid "Events calendar"
+#: inc/class.eventhandler.admin.widgets.php:104
+msgid "EventHandler: events of an entry"
 msgstr ""
 
-#: _widgets.php:154
-msgid "Events categories"
+#: inc/class.url.eventhandler.php:439 inc/class.url.eventhandler.php:449
+#: inc/class.url.eventhandler.php:491 inc/class.admin.eventhandler.php:49
+#: inc/class.admin.eventhandler.php:50 inc/class.admin.eventhandler.php:55
+#: inc/class.admin.eventhandler.php:209 tpl/list_events.tpl:3
+#: tpl/list_events.tpl:16 tpl/edit_event.tpl:26 tpl/settings.tpl:10
+#: tpl/settings.tpl:40 tpl/settings.tpl:88 eventHandler_dummy.php:13
+#: tpl/settings.tpl:10 tpl/settings.tpl:40 tpl/settings.tpl:88
+msgid "Events"
 msgstr ""
 
-#: inc/index.settings.php:214
-msgid "Events from eventdata successfully imported"
+#: inc/class.eventhandler.admin.widgets.php:165
+#: inc/class.eventhandler.admin.widgets.php:167
+msgid "Events by categories"
 msgstr ""
 
-#: _widgets.php:198
-msgid "Events map"
+#: inc/class.eventhandler.admin.widgets.php:248
+#: inc/class.eventhandler.admin.widgets.php:250
+msgid "Events calendar"
 msgstr ""
 
-#: _widgets.php:110
-msgid "Events of an entry"
+#: tpl/settings.tpl:140 tpl/settings.tpl:140
+msgid "Events from eventdata imported"
 msgstr ""
 
-#: _widgets.php:199
+#: inc/class.eventhandler.admin.widgets.php:215
+#: inc/class.eventhandler.admin.widgets.php:217
 msgid "Events on map"
 msgstr ""
 
-#: _admin.php:238
-msgid "Events:"
+#: tpl/list_events.tpl:65
+msgid "Events per page"
 msgstr ""
 
-#: _widgets.php:62 _widgets.php:151 _widgets.php:195 _widgets.php:221
+#: inc/class.eventhandler.admin.widgets.php:51
+#: inc/class.eventhandler.admin.widgets.php:158
+#: inc/class.eventhandler.admin.widgets.php:208
+#: inc/class.eventhandler.admin.widgets.php:241
 msgid "Except on home page"
 msgstr ""
 
-#: inc/index.event.php:710
+#: tpl/edit_event.tpl:156
 msgid "Excerpt:"
 msgstr ""
 
-#: index.php:67
+#: index.php:61
 #, php-format
 msgid "Failed to delete records: %s"
 msgstr ""
@@ -413,270 +558,326 @@ msgstr ""
 msgid "Failed to get calendar"
 msgstr ""
 
-#: index.php:66
+#: index.php:60
 #, php-format
 msgid "Failed to save configuration: %s"
 msgstr ""
 
-#: inc/index.event.php:544
-msgid "File has been attached."
+#: tpl/edit_event.tpl:77
+msgid "Filing"
 msgstr ""
 
-#: inc/index.event.php:544
-msgid "File has been successfully attached."
-msgstr ""
-
-#: inc/index.events.php:519 inc/index.events.php:524
+#: tpl/list_events.tpl:29
 msgid "Filters"
 msgstr ""
 
-#: inc/index.event.php:688
+#: tpl/edit_event.tpl:135
 msgid "Find coordinates on googleMap"
 msgstr ""
 
-#: _widgets.php:54 _widgets.php:104 _widgets.php:187 inc/index.events.php:317
-#: _public.php:868 _public.php:1072 _public.php:868 _public.php:1072
+#: inc/class.eventhandler.admin.widgets.php:43
+#: inc/class.eventhandler.admin.widgets.php:97
+#: inc/class.eventhandler.admin.widgets.php:200
+#: inc/class.tpl.eventhandler.php:68 inc/class.tpl.eventhandler.php:234
+#: inc/index.events.php:227
 msgid "Finished"
 msgstr ""
 
-#: _widgets.php:226
+#: inc/class.eventhandler.admin.widgets.php:251
 msgid "First day of week:"
 msgstr ""
 
-#: _public.php:1108 _public.php:1108
+#: inc/class.tpl.eventhandler.php:264
 #, php-format
 msgid "For the day of %s"
 msgstr ""
 
-#: _public.php:1113 _public.php:1113
+#: inc/class.tpl.eventhandler.php:267
 #, php-format
 msgid "For the month of %s"
 msgstr ""
 
-#: _public.php:1127 _public.php:1127
+#: inc/class.tpl.eventhandler.php:276
 #, php-format
 msgid "For the period between %s and %s"
 msgstr ""
 
-#: _public.php:1131 _public.php:1131
+#: inc/class.tpl.eventhandler.php:278
 #, php-format
 msgid "For the period through %s and %s"
 msgstr ""
 
-#: _public.php:1117 _public.php:1117
+#: inc/class.tpl.eventhandler.php:269
 #, php-format
 msgid "For the year of %s"
 msgstr ""
 
-#: _widgets.php:318 _widgets.php:436
+#: eventHandler_dummy.php:15
+msgid "From"
+msgstr ""
+
+#: inc/class.eventhandler.public.widgets.php:94
+#: inc/class.eventhandler.public.widgets.php:205
 #, php-format
 msgid "From %sd, %st to %ed, %et"
 msgstr ""
 
-#: _widgets.php:203
+#: tpl/edit_event.tpl:36
+msgid "Go to this event on the site"
+msgstr ""
+
+#: eventHandler_dummy.php:16
+msgid "GoogleMaps"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:221
 #, php-format
-msgid "Height of map: (with unit as % or px)"
+msgid "Height of map (with unit as % or px):"
 msgstr ""
 
-#: inc/index.settings.php:143
+#: tpl/settings.tpl:84 tpl/settings.tpl:84
 msgid "Hide"
 msgstr ""
 
-#: _widgets.php:61 _widgets.php:150 _widgets.php:194 _widgets.php:220
+#: inc/class.eventhandler.admin.widgets.php:50
+#: inc/class.eventhandler.admin.widgets.php:157
+#: inc/class.eventhandler.admin.widgets.php:207
+#: inc/class.eventhandler.admin.widgets.php:240
 msgid "Home page only"
 msgstr ""
 
-#: inc/index.event.php:687
-msgid ""
-"If you want to use maps, you must enter an address as precise as possible "
-"(number, street, city, country)"
+#: tpl/edit_event.tpl:134
+msgid "If you want to use maps, you must enter an address as precise as possible (number, street, city, country)"
 msgstr ""
 
-#: inc/index.settings.php:220
+#: tpl/settings.tpl:148 tpl/settings.tpl:148
 msgid "Import eventdata records"
 msgstr ""
 
-#: inc/index.events.php:542
+#: tpl/list_events.tpl:51
 msgid "Lang:"
 msgstr ""
 
-#: inc/index.event.php:691
+#: tpl/edit_event.tpl:137 eventHandler_dummy.php:19
 msgid "Latitude:"
 msgstr ""
 
-#: inc/index.settings.php:145
+#: tpl/settings.tpl:86 tpl/settings.tpl:86
 msgid "Level"
 msgstr ""
 
-#: inc/index.settings.php:165
+#: tpl/settings.tpl:102 tpl/settings.tpl:102
 msgid "List of entries related to this category"
 msgstr ""
 
-#: inc/index.settings.php:158
+#: tpl/settings.tpl:98 tpl/settings.tpl:98
 msgid "List of events related to this category"
 msgstr ""
 
-#: inc/index.events.php:304
+#: inc/index.events.php:214 tpl/edit_event.tpl:125
 msgid "Localization"
 msgstr ""
 
-#: inc/index.event.php:679
-msgid "Localization:"
-msgstr ""
-
 #: inc/lib.eventhandler.rs.extension.php:241
 msgid "Location:"
 msgstr ""
 
-#: inc/index.event.php:697
+#: tpl/edit_event.tpl:141 eventHandler_dummy.php:21
 msgid "Longitude:"
 msgstr ""
 
-#: inc/index.event.php:686 inc/index.settings.php:185
+#: tpl/edit_event.tpl:133 tpl/settings.tpl:60 tpl/settings.tpl:60
 msgid "Maps"
 msgstr ""
 
-#: inc/index.events.php:335
+#: inc/index.events.php:244
 msgid "Mark"
 msgstr ""
 
-#: inc/index.events.php:332
+#: inc/index.events.php:241
 msgid "Mark as pending"
 msgstr ""
 
-#: inc/index.events.php:336
+#: inc/index.events.php:245
 msgid "Mark as selected"
 msgstr ""
 
-#: inc/index.events.php:337
+#: inc/index.events.php:246
 msgid "Mark as unselected"
 msgstr ""
 
-#: _widgets.php:216
+#: inc/class.eventhandler.admin.widgets.php:236
 msgid "Monday"
 msgstr ""
 
-#: inc/index.events.php:540
+#: tpl/list_events.tpl:48
 msgid "Month:"
 msgstr ""
 
-#: inc/index.event.php:206 inc/index.event.php:211 inc/index.event.php:216
+#: inc/index.event.php:103 inc/index.event.php:106 inc/index.event.php:109
 msgid "Most used"
 msgstr ""
 
-#: inc/index.event.php:158 inc/index.event.php:584 inc/index.events.php:497
-#: inc/index.events.php:513 inc/index.settings.php:108
+#: inc/index.event.php:49 tpl/list_events.tpl:20
 msgid "New event"
 msgstr ""
 
-#: _widgets.php:66
+#: inc/class.eventhandler.admin.widgets.php:56
+#: inc/class.eventhandler.admin.widgets.php:57
 msgid "Next events"
 msgstr ""
 
-#: inc/index.event.php:26
+#: inc/class.admin.eventhandler.posts.list.php:19
 msgid "No entry"
 msgstr ""
 
-#: _admin.php:331 inc/index.events.php:26
+#: inc/class.admin.eventhandler.php:72
+msgid "No entry selected"
+msgstr ""
+
+#: inc/class.admin.eventhandler.minilist.php:22
+#: inc/class.admin.eventhandler.list.php:19
 msgid "No event"
 msgstr ""
 
-#: inc/class.eventhandler.php:380
+#: inc/class.eventhandler.php:317
 msgid "No event end date"
 msgstr ""
 
-#: inc/class.eventhandler.php:375
+#: inc/class.eventhandler.php:313
 msgid "No event start date"
 msgstr ""
 
-#: _admin.php:122
+#: inc/class.admin.eventhandler.php:86
 msgid "No such event"
 msgstr ""
 
-#: inc/class.eventhandler.php:311 inc/class.eventhandler.php:355
-#: _services.php:35
+#: inc/class.eventhandler.php:258 inc/class.eventhandler.php:292
+#: _services.php:34
 msgid "No such event ID"
 msgstr ""
 
-#: inc/index.events.php:170 _services.php:31
+#: inc/index.events.php:27 _services.php:30
 msgid "No such post ID"
 msgstr ""
 
-#: inc/index.event.php:83 inc/index.events.php:86 inc/index.events.php:260
+#: inc/index.events.php:176 inc/class.admin.eventhandler.list.php:73
+#: inc/class.admin.eventhandler.posts.list.php:65
 msgid "None"
 msgstr ""
 
-#: _widgets.php:55 _widgets.php:105 _widgets.php:188 inc/index.events.php:318
-#: _public.php:867 _public.php:1071 _public.php:867 _public.php:1071
+#: inc/class.eventhandler.admin.widgets.php:44
+#: inc/class.eventhandler.admin.widgets.php:98
+#: inc/class.eventhandler.admin.widgets.php:201
+#: inc/class.tpl.eventhandler.php:67 inc/class.tpl.eventhandler.php:233
+#: inc/index.events.php:228
 msgid "Not finished"
 msgstr ""
 
-#: inc/class.eventhandler.php:391
+#: inc/class.eventhandler.php:326
 msgid "Not full coordinate"
 msgstr ""
 
-#: _widgets.php:52 _widgets.php:102 _widgets.php:185 inc/index.events.php:315
+#: inc/class.eventhandler.admin.widgets.php:41
+#: inc/class.eventhandler.admin.widgets.php:95
+#: inc/class.eventhandler.admin.widgets.php:198 inc/index.events.php:225
 msgid "Not started"
 msgstr ""
 
-#: inc/index.event.php:719
+#: tpl/edit_event.tpl:166
 msgid "Notes:"
 msgstr ""
 
-#: _widgets.php:315 _widgets.php:432
+#: inc/class.eventhandler.admin.widgets.php:71
+#: inc/class.eventhandler.admin.widgets.php:117
+#: inc/class.eventhandler.admin.widgets.php:151
+#: inc/class.eventhandler.admin.widgets.php:173
+#: inc/class.eventhandler.admin.widgets.php:230
+#: inc/class.eventhandler.admin.widgets.php:257
+msgid "Offline"
+msgstr ""
+
+#: inc/class.eventhandler.public.widgets.php:92
+#: inc/class.eventhandler.public.widgets.php:203
 #, php-format
 msgid "On %sd from %st to %et"
 msgstr ""
 
-#: _widgets.php:56 _widgets.php:106 _widgets.php:189 inc/index.events.php:319
-#: _public.php:863 _public.php:1067 _public.php:863 _public.php:1067
+#: inc/class.eventhandler.admin.widgets.php:45
+#: inc/class.eventhandler.admin.widgets.php:99
+#: inc/class.eventhandler.admin.widgets.php:202
+#: inc/class.tpl.eventhandler.php:63 inc/class.tpl.eventhandler.php:229
+#: inc/index.events.php:229
 msgid "Ongoing"
 msgstr ""
 
-#: _widgets.php:69 _widgets.php:114 _widgets.php:142 _widgets.php:205
-#: inc/index.events.php:547
+#: tpl/edit_event.tpl:91
+msgid "Options"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:60
+#: inc/class.eventhandler.admin.widgets.php:112
+#: inc/class.eventhandler.admin.widgets.php:147
+#: inc/class.eventhandler.admin.widgets.php:223 tpl/list_events.tpl:59
 msgid "Order by:"
 msgstr ""
 
-#: _widgets.php:57 _widgets.php:107 _widgets.php:190 inc/index.events.php:320
-#: _public.php:864 _public.php:1068 _public.php:864 _public.php:1068
+#: inc/class.eventhandler.admin.widgets.php:46
+#: inc/class.eventhandler.admin.widgets.php:100
+#: inc/class.eventhandler.admin.widgets.php:203
+#: inc/class.tpl.eventhandler.php:64 inc/class.tpl.eventhandler.php:230
+#: inc/index.events.php:230
 msgid "Outgoing"
 msgstr ""
 
-#: _admin.php:353 _admin.php:366 inc/index.event.php:49 inc/index.event.php:62
-#: inc/index.events.php:52 inc/index.events.php:65
+#: inc/class.admin.eventhandler.minilist.php:46
+#: inc/class.admin.eventhandler.minilist.php:59
+#: inc/class.admin.eventhandler.list.php:47
+#: inc/class.admin.eventhandler.list.php:59
+#: inc/class.admin.eventhandler.posts.list.php:39
+#: inc/class.admin.eventhandler.posts.list.php:51
 msgid "Page(s)"
 msgstr ""
 
-#: _admin.php:343
+#: inc/class.admin.eventhandler.minilist.php:30
 msgid "Period"
 msgstr ""
 
-#: _widgets.php:72 _widgets.php:116 _widgets.php:207 inc/index.events.php:531
+#: eventHandler_dummy.php:26
+msgid "Period of events:"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:63
+#: inc/class.eventhandler.admin.widgets.php:114
+#: inc/class.eventhandler.admin.widgets.php:225 tpl/list_events.tpl:36
 msgid "Period:"
 msgstr ""
 
-#: index.php:42 _public.php:127 _public.php:127
+#: eventHandler_dummy.php:27
+msgid "Permalink"
+msgstr ""
+
+#: inc/class.public.eventhandler.php:49
 msgid "Please wait"
 msgstr ""
 
-#: inc/class.eventhandler.php:470
+#: inc/class.eventhandler.php:400
 msgid "Please wait, try to create map..."
 msgstr ""
 
-#: inc/index.event.php:579
+#: tpl/edit_event.tpl:173
 msgid "Preview event"
 msgstr ""
 
-#: inc/index.events.php:329
+#: inc/index.events.php:238
 msgid "Publish"
 msgstr ""
 
-#: _public.php:948 _public.php:948
+#: inc/class.tpl.eventhandler.php:137
 msgid "Published date"
 msgstr ""
 
-#: inc/index.event.php:624
+#: tpl/edit_event.tpl:61
 msgid "Published on"
 msgstr ""
 
@@ -684,238 +885,281 @@ msgstr ""
 msgid "Read more"
 msgstr ""
 
-#: index.php:61
-msgid "Records deleted"
+#: eventHandler_dummy.php:29
+msgid "Read this post"
 msgstr ""
 
-#: inc/index.settings.php:217
-msgid "Records of eventdata have been imported for this blog."
+#: index.php:55
+msgid "Records deleted"
 msgstr ""
 
-#: index.php:61
-msgid "Records succesfully deleted"
+#: tpl/settings.tpl:144 tpl/settings.tpl:144
+msgid "Records of eventdata have been imported for this blog."
 msgstr ""
 
-#: _widgets.php:139 inc/index.event.php:740
+#: inc/class.eventhandler.admin.widgets.php:142
+#: inc/class.eventhandler.admin.widgets.php:144 tpl/edit_event.tpl:190
+#: eventHandler_dummy.php:30
 msgid "Related entries"
 msgstr ""
 
-#: _widgets.php:111
+#: inc/class.eventhandler.admin.widgets.php:107
+#: inc/class.eventhandler.admin.widgets.php:109 eventHandler_dummy.php:31
 msgid "Related events"
 msgstr ""
 
-#: inc/index.event.php:706 inc/index.event.php:714
+#: eventHandler_dummy.php:32
+msgid "Remember me on this blog"
+msgstr ""
+
+#: tpl/edit_event.tpl:152 tpl/edit_event.tpl:160
 msgid "Required field"
 msgstr ""
 
-#: inc/index.events.php:331
+#: inc/class.admin.eventhandler.php:135 tpl/edit_event.tpl:170
+#: tpl/settings.tpl:132 tpl/settings.tpl:132
+msgid "Save"
+msgstr ""
+
+#: inc/index.events.php:240
 msgid "Schedule"
 msgstr ""
 
-#: _public.php:865 _public.php:1069 _public.php:865 _public.php:1069
+#: inc/class.tpl.eventhandler.php:65 inc/class.tpl.eventhandler.php:231
 msgid "Scheduled"
 msgstr ""
 
-#: _public.php:1057 _public.php:1057
+#: inc/class.tpl.eventhandler.php:221
 msgid "Scheduled events"
 msgstr ""
 
-#: _admin.php:172
+#: inc/class.admin.eventhandler.php:110
 msgid "Select events to link to entries"
 msgstr ""
 
-#: inc/index.events.php:301 _public.php:946 _public.php:946
+#: inc/class.tpl.eventhandler.php:135 inc/index.events.php:211
 msgid "Selected"
 msgstr ""
 
-#: inc/index.events.php:595
+#: tpl/list_events.tpl:97
 msgid "Selected entries action:"
 msgstr ""
 
-#: _widgets.php:71
+#: inc/class.eventhandler.admin.widgets.php:62
 msgid "Selected entries only"
 msgstr ""
 
-#: inc/index.event.php:638
-msgid "Selected entry"
+#: tpl/edit_event.tpl:80
+msgid "Selected event"
 msgstr ""
 
-#: inc/index.events.php:538
+#: tpl/list_events.tpl:45
 msgid "Selected:"
 msgstr ""
 
-#: inc/index.settings.php:103 inc/index.settings.php:107 index.php:51
+#: index.php:45 tpl/settings.tpl:3 tpl/settings.tpl:11 tpl/settings.tpl:3
+#: tpl/settings.tpl:11
 msgid "Settings"
 msgstr ""
 
-#: _widgets.php:75
+#: tpl/list_events.tpl:63
+msgid "Show"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:66
 msgid "Show category"
 msgstr ""
 
-#: _widgets.php:227
+#: inc/index.events.php:275
+msgid "Show filters and display options"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:252
 msgid "Show only start date of events"
 msgstr ""
 
-#: inc/index.settings.php:123
+#: tpl/settings.tpl:44 tpl/settings.tpl:44
 msgid "Show related entries on event:"
 msgstr ""
 
-#: inc/index.settings.php:130
+#: tpl/settings.tpl:53 tpl/settings.tpl:53
 msgid "Show related events on entry:"
 msgstr ""
 
-#: _widgets.php:70 _widgets.php:115 _widgets.php:143 _widgets.php:206
-#: inc/index.events.php:549
+#: eventHandler_dummy.php:33
+msgid "Sort events by:"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:61
+#: inc/class.eventhandler.admin.widgets.php:113
+#: inc/class.eventhandler.admin.widgets.php:148
+#: inc/class.eventhandler.admin.widgets.php:224 tpl/list_events.tpl:61
 msgid "Sort:"
 msgstr ""
 
-#: _admin.php:344 _widgets.php:43 _widgets.php:93 _widgets.php:176
-#: inc/index.events.php:38 inc/index.events.php:302 _public.php:949
-#: _public.php:949
+#: inc/class.eventhandler.admin.widgets.php:32
+#: inc/class.eventhandler.admin.widgets.php:86
+#: inc/class.eventhandler.admin.widgets.php:189
+#: inc/class.tpl.eventhandler.php:138 inc/index.events.php:212
+#: inc/class.admin.eventhandler.minilist.php:31
+#: inc/class.admin.eventhandler.list.php:28
 msgid "Start date"
 msgstr ""
 
-#: inc/class.eventhandler.php:385
+#: inc/class.eventhandler.php:321
 msgid "Start date greater than end date"
 msgstr ""
 
-#: inc/lib.eventhandler.rs.extension.php:233 inc/index.event.php:667
+#: inc/lib.eventhandler.rs.extension.php:233 tpl/edit_event.tpl:113
 msgid "Start date:"
 msgstr ""
 
-#: _widgets.php:53 _widgets.php:103 _widgets.php:186 inc/index.events.php:316
-#: _public.php:866 _public.php:1070 _public.php:866 _public.php:1070
+#: inc/class.eventhandler.admin.widgets.php:42
+#: inc/class.eventhandler.admin.widgets.php:96
+#: inc/class.eventhandler.admin.widgets.php:199
+#: inc/class.tpl.eventhandler.php:66 inc/class.tpl.eventhandler.php:232
+#: inc/index.events.php:226
 msgid "Started"
 msgstr ""
 
-#: _public.php:1058 _public.php:1058
+#: inc/class.tpl.eventhandler.php:222
 msgid "Started events"
 msgstr ""
 
-#: _admin.php:346 inc/index.event.php:41 inc/index.events.php:44
-#: inc/index.events.php:300 inc/index.events.php:328
+#: inc/index.events.php:210 inc/index.events.php:237
+#: inc/class.admin.eventhandler.minilist.php:33
+#: inc/class.admin.eventhandler.list.php:34
+#: inc/class.admin.eventhandler.posts.list.php:32 tpl/edit_event.tpl:56
 msgid "Status"
 msgstr ""
 
-#: inc/index.events.php:536
+#: tpl/list_events.tpl:39
 msgid "Status:"
 msgstr ""
 
-#: _widgets.php:215
+#: inc/class.eventhandler.admin.widgets.php:235
 msgid "Sunday"
 msgstr ""
 
-#: inc/index.event.php:629
+#: tpl/edit_event.tpl:65
 msgid "Text formatting"
 msgstr ""
 
-#: _public.php:795 _public.php:795
+#: inc/class.url.eventhandler.php:527
 msgid "There's no event at this time."
 msgstr ""
 
-#: inc/index.event.php:230
+#: eventHandler_dummy.php:34
+msgid "These events Atom feed"
+msgstr ""
+
+#: inc/index.event.php:121
 msgid "This entry does not exist."
 msgstr ""
 
-#: inc/index.event.php:247
+#: inc/index.event.php:134
 msgid "This event does not exist."
 msgstr ""
 
-#: _public.php:735 _public.php:735
+#: inc/class.url.eventhandler.php:470
 msgid "This page is powered by Dotclear and eventHandler"
 msgstr ""
 
-#: _widgets.php:74
+#: inc/index.events.php:78
+msgid "This user does not exist"
+msgstr ""
+
+#: inc/class.eventhandler.admin.widgets.php:65
 msgid "Time format of events:"
 msgstr ""
 
-#: _admin.php:342 _widgets.php:42 _widgets.php:92 _widgets.php:131
-#: _widgets.php:175 inc/index.event.php:37 inc/index.events.php:37
-#: inc/index.events.php:297 _public.php:945 _public.php:945
+#: inc/class.eventhandler.admin.widgets.php:31
+#: inc/class.eventhandler.admin.widgets.php:85
+#: inc/class.eventhandler.admin.widgets.php:131
+#: inc/class.eventhandler.admin.widgets.php:188
+#: inc/class.tpl.eventhandler.php:134 inc/index.events.php:207
+#: inc/class.admin.eventhandler.minilist.php:29
+#: inc/class.admin.eventhandler.list.php:27
+#: inc/class.admin.eventhandler.posts.list.php:28
 msgid "Title"
 msgstr ""
 
-#: _widgets.php:66 _widgets.php:111 _widgets.php:139 _widgets.php:155
-#: _widgets.php:199 _widgets.php:225 inc/index.event.php:706
+#: inc/class.eventhandler.admin.widgets.php:57
+#: inc/class.eventhandler.admin.widgets.php:109
+#: inc/class.eventhandler.admin.widgets.php:144
+#: inc/class.eventhandler.admin.widgets.php:167
+#: inc/class.eventhandler.admin.widgets.php:217
+#: inc/class.eventhandler.admin.widgets.php:250 tpl/edit_event.tpl:152
 msgid "Title:"
 msgstr ""
 
-#: _admin.php:92
+#: inc/class.admin.eventhandler.php:50 inc/class.admin.eventhandler.php:57
 msgid "Unbind events"
 msgstr ""
 
-#: inc/index.events.php:348
+#: inc/index.events.php:255
 msgid "Unbind related entries"
 msgstr ""
 
-#: _widgets.php:35 _widgets.php:85 _widgets.php:124
+#: inc/class.eventhandler.admin.widgets.php:24
+#: inc/class.eventhandler.admin.widgets.php:78
+#: inc/class.eventhandler.admin.widgets.php:124
 msgid "Uncategorized"
 msgstr ""
 
-#: _public.php:1059 _public.php:1059
+#: inc/class.tpl.eventhandler.php:223
 msgid "Unfinished events"
 msgstr ""
 
-#: inc/index.events.php:330
+#: inc/index.events.php:239
 msgid "Unpublish"
 msgstr ""
 
-#: inc/index.event.php:570
-msgid "View event"
+#: tpl/edit_event.tpl:97
+msgid "Warning: If you set the URL manually, it may conflict with another entry."
 msgstr ""
 
-#: inc/index.event.php:653
-msgid ""
-"Warning: If you set the URL manually, it may conflict with another entry."
-msgstr ""
-
-#: inc/index.settings.php:140
-msgid ""
-"When an event has an hidden category, it will only display on its category "
-"page."
+#: tpl/settings.tpl:81 tpl/settings.tpl:81
+msgid "When an event has an hidden category, it will only display on its category page."
 msgstr ""
 
-#: _widgets.php:202
+#: inc/class.eventhandler.admin.widgets.php:220
 #, php-format
-msgid "Width of map: (with unit as % or px)"
+msgid "Width of map (with unit as % or px):"
 msgstr ""
 
-#: _widgets.php:156
+#: inc/class.eventhandler.admin.widgets.php:168
 msgid "With events counts"
 msgstr ""
 
-#: inc/class.eventhandler.php:398 inc/class.eventhandler.php:406
+#: inc/class.eventhandler.php:331 inc/class.eventhandler.php:337
 msgid "Wrong format of coordinate"
 msgstr ""
 
-#: inc/class.eventhandler.php:270
+#: inc/class.eventhandler.php:218
 msgid "You are not allowed to create an event"
 msgstr ""
 
-#: inc/class.eventhandler.php:348
+#: inc/class.eventhandler.php:286
 msgid "You are not allowed to delete events"
 msgstr ""
 
-#: inc/class.eventhandler.php:304
+#: inc/class.eventhandler.php:252
 msgid "You are not allowed to update events"
 msgstr ""
 
-#: inc/index.event.php:745
+#: tpl/edit_event.tpl:192
 msgid "You must save event before adding entries"
 msgstr ""
 
-#: inc/index.settings.php:70
+#: inc/index.settings.php:91
 msgid "after content"
 msgstr ""
 
-#: inc/index.settings.php:69
+#: inc/index.settings.php:90
 msgid "before content"
 msgstr ""
 
-#: inc/index.event.php:731
-msgid "delete"
-msgstr ""
-
 #: _uninstall.php:35
 #, php-format
 msgid "delete %s plugin files"
@@ -947,23 +1191,35 @@ msgstr ""
 msgid "delete the version number"
 msgstr ""
 
-#: _public.php:25 _public.php:25
+#: _public.php:24
 msgid "finished"
 msgstr ""
 
-#: _widgets.php:336
+#: eventHandler_dummy.php:14
+msgid "for a period of"
+msgstr ""
+
+#: inc/class.eventhandler.public.widgets.php:114
 msgid "go to this category"
 msgstr ""
 
-#: inc/index.settings.php:68
+#: eventHandler_dummy.php:17
+msgid "hCalendar"
+msgstr ""
+
+#: inc/index.settings.php:89
 msgid "hide"
 msgstr ""
 
-#: _widgets.php:170 inc/index.settings.php:79
+#: inc/class.eventhandler.admin.widgets.php:183 inc/index.settings.php:100
 msgid "hybrid"
 msgstr ""
 
-#: inc/class.eventhandler.php:447
+#: eventHandler_dummy.php:18
+msgid "iCalendar"
+msgstr ""
+
+#: inc/class.eventhandler.php:378
 msgid "instantaneous"
 msgstr ""
 
@@ -971,23 +1227,39 @@ msgstr ""
 msgid "latitude:"
 msgstr ""
 
+#: eventHandler_dummy.php:20
+msgid "list of events"
+msgstr ""
+
 #: inc/lib.eventhandler.rs.extension.php:241
 msgid "longitude:"
 msgstr ""
 
-#: inc/index.event.php:295
+#: eventHandler_dummy.php:22
+msgid "next entries"
+msgstr ""
+
+#: inc/index.event.php:176
 msgid "next event"
 msgstr ""
 
-#: inc/index.events.php:279
+#: inc/index.events.php:191
 msgid "not selected"
 msgstr ""
 
-#: inc/index.events.php:597
+#: eventHandler_dummy.php:23
+msgid "of"
+msgstr ""
+
+#: tpl/list_events.tpl:99
 msgid "ok"
 msgstr ""
 
-#: inc/class.eventhandler.php:442
+#: eventHandler_dummy.php:24
+msgid "on"
+msgstr ""
+
+#: inc/class.eventhandler.php:373
 msgid "one day"
 msgstr ""
 
@@ -995,60 +1267,92 @@ msgstr ""
 msgid "one event"
 msgstr ""
 
-#: inc/class.eventhandler.php:444
+#: inc/class.eventhandler.php:375
 msgid "one hour"
 msgstr ""
 
-#: inc/class.eventhandler.php:446
+#: inc/class.eventhandler.php:377
 msgid "one minute"
 msgstr ""
 
-#: _public.php:24 _public.php:24
+#: _public.php:23
 msgid "ongoing"
 msgstr ""
 
-#: _admin.php:384 inc/index.event.php:99 inc/index.events.php:102
+#: eventHandler_dummy.php:25
+msgid "page"
+msgstr ""
+
+#: inc/class.admin.eventhandler.minilist.php:76
+#: inc/class.admin.eventhandler.list.php:89
+#: inc/class.admin.eventhandler.posts.list.php:81
 msgid "pending"
 msgstr ""
 
-#: inc/index.event.php:303
+#: eventHandler_dummy.php:28
+msgid "previous entries"
+msgstr ""
+
+#: inc/index.event.php:183
 msgid "previous event"
 msgstr ""
 
-#: _admin.php:391 inc/index.event.php:106 inc/index.events.php:109
+#: inc/class.admin.eventhandler.minilist.php:82
+#: inc/class.admin.eventhandler.list.php:95
+#: inc/class.admin.eventhandler.posts.list.php:87
 msgid "protected"
 msgstr ""
 
-#: _admin.php:375 inc/index.event.php:90 inc/index.events.php:93
+#: inc/class.admin.eventhandler.minilist.php:67
+#: inc/class.admin.eventhandler.list.php:80
+#: inc/class.admin.eventhandler.posts.list.php:72
 msgid "published"
 msgstr ""
 
-#: _widgets.php:168 inc/index.settings.php:77
+#: inc/class.eventhandler.admin.widgets.php:181 inc/index.settings.php:98
 msgid "road map"
 msgstr ""
 
-#: _widgets.php:169 inc/index.settings.php:78
+#: inc/class.eventhandler.admin.widgets.php:182 inc/index.settings.php:99
 msgid "satellite"
 msgstr ""
 
-#: _admin.php:196 inc/index.event.php:729 inc/index.settings.php:198
-msgid "save"
-msgstr ""
-
-#: _admin.php:381 inc/index.event.php:96 inc/index.events.php:99
-#: _public.php:23 _public.php:23
+#: inc/class.admin.eventhandler.minilist.php:73
+#: inc/class.admin.eventhandler.list.php:86
+#: inc/class.admin.eventhandler.posts.list.php:78 _public.php:22
 msgid "scheduled"
 msgstr ""
 
-#: _admin.php:397 inc/index.event.php:112 inc/index.events.php:115
-#: inc/index.events.php:278
+#: inc/index.events.php:190 inc/class.admin.eventhandler.minilist.php:87
+#: inc/class.admin.eventhandler.list.php:100
+#: inc/class.admin.eventhandler.posts.list.php:92
 msgid "selected"
 msgstr ""
 
-#: _widgets.php:171 inc/index.settings.php:80
+#: inc/class.eventhandler.admin.widgets.php:184 inc/index.settings.php:101
 msgid "terrain"
 msgstr ""
 
-#: _admin.php:378 inc/index.event.php:93 inc/index.events.php:96
+#: eventHandler_dummy.php:35
+msgid "this event is"
+msgstr ""
+
+#: eventHandler_dummy.php:36
+msgid "till"
+msgstr ""
+
+#: eventHandler_dummy.php:37
+msgid "to"
+msgstr ""
+
+#: inc/class.admin.eventhandler.php:105
+msgid "to the selected event"
+msgid_plural "to the selected events"
+msgstr[0] ""
+msgstr[1] ""
+
+#: inc/class.admin.eventhandler.minilist.php:70
+#: inc/class.admin.eventhandler.list.php:83
+#: inc/class.admin.eventhandler.posts.list.php:75
 msgid "unpublished"
 msgstr ""
diff --git a/tpl/settings.tpl b/tpl/settings.tpl
index 7e86337..2620c43 100644
--- a/tpl/settings.tpl
+++ b/tpl/settings.tpl
@@ -137,7 +137,7 @@
     <form id="setting-form" method="post" action="plugin.php">
       <div>
 	<?php if (isset($eventdata_import) && $eventdata_import === true):?>
-	<p class="message"><?php echo __('Events from eventdata successfully imported');?></p>
+	<p class="message"><?php echo __('Events from eventdata imported');?></p>
 	<?php endif;?>
 
 	<?php if ($s->eventdata_import):?>