diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 39321cf..645f52d 100644
Binary files a/locale/fr/LC_MESSAGES/django.mo and b/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 4ff6439..921c94c 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 20:28+0000\n"
-"PO-Revision-Date: 2017-11-06 21:30+0100\n"
+"POT-Creation-Date: 2017-11-07 22:57+0000\n"
+"PO-Revision-Date: 2017-11-07 23:58+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -34,15 +34,15 @@ msgstr "Décliné"
 msgid "Waiting"
 msgstr "En attente"
 
-#: cfp/forms.py:29 cfp/forms.py:130 cfp/forms.py:227 cfp/models.py:360
+#: cfp/forms.py:29 cfp/forms.py:130 cfp/forms.py:227 cfp/models.py:369
 msgid "Confirmed"
 msgstr "Confirmé"
 
-#: cfp/forms.py:30 cfp/models.py:362
+#: cfp/forms.py:30 cfp/models.py:371
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: cfp/forms.py:62 cfp/models.py:461
+#: cfp/forms.py:62 cfp/models.py:470
 msgid "Activity"
 msgstr "Activité"
 
@@ -65,13 +65,13 @@ msgstr "Catégorie"
 msgid "Title"
 msgstr "Titre"
 
-#: cfp/forms.py:108 cfp/models.py:154 cfp/models.py:456
+#: cfp/forms.py:108 cfp/models.py:154 cfp/models.py:465
 #: cfp/templates/cfp/proposal_talk_details.html:75
 #: cfp/templates/cfp/staff/talk_details.html:64
 msgid "Description"
 msgstr "Description"
 
-#: cfp/forms.py:109 cfp/models.py:111 cfp/models.py:431
+#: cfp/forms.py:109 cfp/models.py:111 cfp/models.py:440
 #: cfp/templates/cfp/staff/participant_details.html:19
 #: cfp/templates/cfp/staff/talk_details.html:78
 #: cfp/templates/cfp/staff/volunteer_details.html:22
@@ -82,7 +82,7 @@ msgstr "Notes"
 msgid "Visible by speakers"
 msgstr "Visible par les orateurs"
 
-#: cfp/forms.py:136 cfp/forms.py:233 cfp/models.py:317
+#: cfp/forms.py:136 cfp/forms.py:233 cfp/models.py:326
 #: cfp/templates/cfp/staff/talk_details.html:21
 #: cfp/templates/cfp/staff/talk_list.html:46
 #: cfp/templates/cfp/staff/track_form.html:14
@@ -120,7 +120,7 @@ msgstr "Programmé"
 msgid "Filter talks already / not yet scheduled"
 msgstr "Filtrer les exposés déjà / pas encore planifiées"
 
-#: cfp/forms.py:160 cfp/models.py:334
+#: cfp/forms.py:160 cfp/models.py:343
 #: cfp/templates/cfp/staff/talk_details.html:54
 msgid "Materials"
 msgstr "Supports"
@@ -149,7 +149,7 @@ msgstr "Accepter la proposition ?"
 msgid "Assign to a track"
 msgstr "Assigner à une session"
 
-#: cfp/forms.py:182
+#: cfp/forms.py:182 cfp/templates/cfp/admin/tag_list.html:11
 msgid "Add a tag"
 msgstr "Ajouter une étiquette"
 
@@ -161,7 +161,7 @@ msgstr "Assigner à une salle"
 msgid "Notify by mail?"
 msgstr "Notifier par e-mail ?"
 
-#: cfp/forms.py:249 cfp/models.py:426
+#: cfp/forms.py:249 cfp/models.py:435
 #: cfp/templates/cfp/staff/volunteer_list.html:30
 msgid "Email"
 msgstr "E-mail"
@@ -245,7 +245,7 @@ msgstr ""
 "L’adresse de réponse doit être une chaine de texte formatable avec un "
 "argument « token » (e.g. ponyconf+{token}@exemple.com)."
 
-#: cfp/models.py:99 cfp/models.py:152 cfp/models.py:204 cfp/models.py:454
+#: cfp/models.py:99 cfp/models.py:152 cfp/models.py:204 cfp/models.py:463
 #: cfp/templates/cfp/staff/participant_list.html:35
 #: cfp/templates/cfp/staff/volunteer_list.html:29
 msgid "Name"
@@ -280,11 +280,11 @@ msgstr "Facebook"
 msgid "Mastodon"
 msgstr "Mastodon"
 
-#: cfp/models.py:109 cfp/models.py:428
+#: cfp/models.py:109 cfp/models.py:437
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: cfp/models.py:112 cfp/models.py:316
+#: cfp/models.py:112 cfp/models.py:325
 msgid "This field is only visible by organizers."
 msgstr "Ce champs est uniquement visible par les organisateurs."
 
@@ -296,19 +296,23 @@ msgstr "Orateur invité"
 msgid "Color"
 msgstr "Couleur"
 
-#: cfp/models.py:238
+#: cfp/models.py:208
+msgid "Show the tag on the program"
+msgstr "Afficher l’étiquette sur le programme"
+
+#: cfp/models.py:244
 msgid "Default duration (min)"
 msgstr "Durée par défaut (min)"
 
-#: cfp/models.py:239
+#: cfp/models.py:245
 msgid "Color on program"
 msgstr "Couleur sur le programme"
 
-#: cfp/models.py:240
+#: cfp/models.py:246
 msgid "Label on program"
 msgstr "Label dans le xml du programme"
 
-#: cfp/models.py:311 cfp/templates/cfp/proposal_talk_details.html:53
+#: cfp/models.py:320 cfp/templates/cfp/proposal_talk_details.html:53
 #: cfp/templates/cfp/staff/base.html:11
 #: cfp/templates/cfp/staff/participant_list.html:8
 #: cfp/templates/cfp/staff/talk_details.html:68
@@ -316,19 +320,19 @@ msgstr "Label dans le xml du programme"
 msgid "Speakers"
 msgstr "Orateurs"
 
-#: cfp/models.py:312
+#: cfp/models.py:321
 msgid "Talk Title"
 msgstr "Titre de la proposition"
 
-#: cfp/models.py:315
+#: cfp/models.py:324
 msgid "Description of your talk"
 msgstr "Description de votre proposition"
 
-#: cfp/models.py:319 cfp/templates/cfp/proposal_talk_details.html:85
+#: cfp/models.py:328 cfp/templates/cfp/proposal_talk_details.html:85
 msgid "Message to organizers"
 msgstr "Message aux organisateurs"
 
-#: cfp/models.py:320
+#: cfp/models.py:329
 msgid ""
 "If you have any constraint or if you have anything that may help you to "
 "select your talk, like a video or slides of your talk, please write it down "
@@ -338,67 +342,67 @@ msgstr ""
 "votre proposition, comme une vidéo, des slides, n'hésitez pas à les ajouter "
 "ici."
 
-#: cfp/models.py:323
+#: cfp/models.py:332
 msgid "Talk Category"
 msgstr "Catégorie de proposition"
 
-#: cfp/models.py:324
+#: cfp/models.py:333
 msgid "I'm ok to be recorded on video"
 msgstr "J’accepte d’être enregistré en vidéo"
 
-#: cfp/models.py:326
+#: cfp/models.py:335
 msgid "Video licence"
 msgstr "Licence vidéo"
 
-#: cfp/models.py:327
+#: cfp/models.py:336
 msgid "I need sound"
 msgstr "J’ai besoin de son"
 
-#: cfp/models.py:330
+#: cfp/models.py:339
 msgid "Beginning date and time"
 msgstr "Date et heure de début"
 
-#: cfp/models.py:331
+#: cfp/models.py:340
 msgid "Duration (min)"
 msgstr "Durée (min)"
 
-#: cfp/models.py:335
+#: cfp/models.py:344
 msgid ""
 "You can use this field to share some materials related to your intervention."
 msgstr ""
 "Vous pouvez utiliser ce champs pour partager les supports de votre "
 "intervention."
 
-#: cfp/models.py:364
+#: cfp/models.py:373
 msgid "Waiting confirmation"
 msgstr "En attente de confirmation"
 
-#: cfp/models.py:366
+#: cfp/models.py:375
 msgid "Refused"
 msgstr "Refusé"
 
-#: cfp/models.py:368
+#: cfp/models.py:377
 #, python-format
 msgid "Pending decision, score: %(score).1f"
 msgstr "En cours, score : %(score).1f"
 
-#: cfp/models.py:425
+#: cfp/models.py:434
 msgid "Your Name"
 msgstr "Votre Nom"
 
-#: cfp/models.py:429
+#: cfp/models.py:438
 msgid "SMS prefered"
 msgstr "SMS préférés"
 
-#: cfp/models.py:432
+#: cfp/models.py:441
 msgid "If you have some constraints, you can indicate them here."
 msgstr "Si vous avez des contraintes, vous pouvez les indiquer ici."
 
-#: cfp/models.py:457 cfp/templates/cfp/staff/volunteer_details.html:8
+#: cfp/models.py:466 cfp/templates/cfp/staff/volunteer_details.html:8
 msgid "Volunteer"
 msgstr "Bénévole"
 
-#: cfp/models.py:462 cfp/templates/cfp/staff/volunteer_details.html:27
+#: cfp/models.py:471 cfp/templates/cfp/staff/volunteer_details.html:27
 #: cfp/templates/cfp/staff/volunteer_list.html:32
 msgid "Activities"
 msgstr "Activités"
@@ -423,10 +427,44 @@ msgstr "[%(prefix)s] Talk: %(talk)s"
 msgid "Conference"
 msgstr "Conférence"
 
-#: cfp/templates/cfp/admin/base.html:19 cfp/templates/cfp/staff/base.html:21
+#: cfp/templates/cfp/admin/base.html:11
+#: cfp/templates/cfp/admin/category_list.html:9
+msgid "Categories"
+msgstr "Catégories"
+
+#: cfp/templates/cfp/admin/base.html:12 cfp/templates/cfp/admin/tag_list.html:9
+#: cfp/templates/cfp/staff/talk_details.html:28
+#: cfp/templates/cfp/staff/talk_list.html:47
+msgid "Tags"
+msgstr "Étiquettes"
+
+#: cfp/templates/cfp/admin/base.html:21 cfp/templates/cfp/staff/base.html:21
 msgid "Please select a category."
 msgstr "Veuillez sélectionner une catégorie."
 
+#: cfp/templates/cfp/admin/category_form.html:16
+msgid "Edit category"
+msgstr "Édition d’une catégorie"
+
+#: cfp/templates/cfp/admin/category_form.html:18
+msgid "New category"
+msgstr "Nouvelle catégorie"
+
+#: cfp/templates/cfp/admin/category_list.html:11
+msgid "Add a category"
+msgstr "Ajouter une catégorie"
+
+#: cfp/templates/cfp/admin/category_list.html:17
+#: cfp/templates/cfp/admin/tag_list.html:17
+#: cfp/templates/cfp/staff/participant_details.html:13
+#: cfp/templates/cfp/staff/talk_details.html:10
+msgid "Edit"
+msgstr "Éditer"
+
+#: cfp/templates/cfp/admin/category_list.html:21
+msgid "No categories."
+msgstr "Aucune catégorie."
+
 #: cfp/templates/cfp/admin/conference.html:13
 #: cfp/templates/cfp/admin/create_user.html:8
 msgid "Add a new user"
@@ -446,6 +484,18 @@ msgstr "Envoyer"
 msgid "Cancel"
 msgstr "Annuler"
 
+#: cfp/templates/cfp/admin/tag_form.html:16
+msgid "Edit tag"
+msgstr "Édition d’une étiquette"
+
+#: cfp/templates/cfp/admin/tag_form.html:18
+msgid "New tag"
+msgstr "Nouvelle étiquette"
+
+#: cfp/templates/cfp/admin/tag_list.html:21
+msgid "No tags."
+msgstr "Aucune étiquette."
+
 #: cfp/templates/cfp/closed.html:9 cfp/templates/cfp/proposal_home.html:12
 msgid "Participate"
 msgstr "Participer"
@@ -697,11 +747,6 @@ msgstr "Salles"
 msgid "VIP"
 msgstr "VIP"
 
-#: cfp/templates/cfp/staff/participant_details.html:13
-#: cfp/templates/cfp/staff/talk_details.html:10
-msgid "Edit"
-msgstr "Éditer"
-
 #: cfp/templates/cfp/staff/participant_details.html:23
 msgid "Informations"
 msgstr "Informations"
@@ -882,11 +927,6 @@ msgctxt "session"
 msgid "not defined"
 msgstr "non définie"
 
-#: cfp/templates/cfp/staff/talk_details.html:28
-#: cfp/templates/cfp/staff/talk_list.html:47
-msgid "Tags"
-msgstr "Étiquettes"
-
 #: cfp/templates/cfp/staff/talk_details.html:29
 msgctxt "tag"
 msgid "none"
@@ -997,10 +1037,6 @@ msgstr "bénévole"
 msgid "Phone"
 msgstr "Téléphone"
 
-#: cfp/templates/cfp/staff/volunteer_list.html:47
-msgid "The volunteer made a few remarks to the staff."
-msgstr "Le bénévole a fait quelques remarques au staff."
-
 #: cfp/templates/cfp/volunteer.html:9 cfp/templates/cfp/volunteer_enrole.html:9
 msgid "Become a volunteers!"
 msgstr "Devenez un bénévole !"
@@ -1023,7 +1059,7 @@ msgstr ""
 msgid "We are looking for help with the following activities:"
 msgstr "Nous cherchons de l’aide pour les activités suivantes :"
 
-#: cfp/views.py:50
+#: cfp/views.py:51
 msgid ""
 "Hi {},\n"
 "\n"
@@ -1051,26 +1087,26 @@ msgstr ""
 "{}\n"
 "\n"
 
-#: cfp/views.py:70
+#: cfp/views.py:71
 msgid "Thank you for your help!"
 msgstr "Merci pour votre aide !"
 
-#: cfp/views.py:75
+#: cfp/views.py:76
 msgid ""
 "Thank you for your participation! You can now subscribe to some activities."
 msgstr ""
 "Merci pour votre participation ! Vous pouvez maintenant vous inscrire à une "
 "ou plusieurs activités."
 
-#: cfp/views.py:97
+#: cfp/views.py:98
 msgid "Thank you for your participation!"
 msgstr "Merci pour votre participation !"
 
-#: cfp/views.py:101
+#: cfp/views.py:102
 msgid "Okay, no problem!"
 msgstr "Ok, pas de soucis !"
 
-#: cfp/views.py:173
+#: cfp/views.py:174
 msgid ""
 "Hi {},\n"
 "\n"
@@ -1110,15 +1146,15 @@ msgstr ""
 "{}\n"
 "\n"
 
-#: cfp/views.py:203 cfp/views.py:287
+#: cfp/views.py:204 cfp/views.py:288
 msgid "You proposition have been successfully submitted!"
 msgstr "Votre proposition a été transmise avec succès !"
 
-#: cfp/views.py:217
+#: cfp/views.py:218
 msgid "Sorry, we do not know this email."
 msgstr "Désolé, nous ne connaissons pas cette e-mail."
 
-#: cfp/views.py:222
+#: cfp/views.py:223
 msgid ""
 "Hi {},\n"
 "\n"
@@ -1149,41 +1185,41 @@ msgstr ""
 "{}\n"
 "\n"
 
-#: cfp/views.py:242
+#: cfp/views.py:243
 msgid "A email have been sent with a link to access to your profil."
 msgstr "Un e-mail vous a été envoyé avec un lien pour accéder à votre profil."
 
-#: cfp/views.py:283 cfp/views.py:356
+#: cfp/views.py:284 cfp/views.py:357
 msgid "Changes saved."
 msgstr "Modifications sauvegardées."
 
-#: cfp/views.py:304
+#: cfp/views.py:305
 msgid "You already confirmed your participation to this talk."
 msgstr "Vous avez déjà confirmé votre participation à cet exposé."
 
-#: cfp/views.py:306
+#: cfp/views.py:307
 msgid "You already cancelled your participation to this talk."
 msgstr "Vous avez déjà annulé votre participation à cet exposé."
 
-#: cfp/views.py:311
+#: cfp/views.py:312
 msgid "Your participation has been taken into account, thank you!"
 msgstr "Votre participation a été prise en compte, merci !"
 
-#: cfp/views.py:312
+#: cfp/views.py:313
 #, python-format
 msgid "Speaker %(speaker)s confirmed his/her participation."
 msgstr "L’intervenant %(speaker)s a confirmé sa participation."
 
-#: cfp/views.py:314
+#: cfp/views.py:315
 msgid "We have noted your unavailability."
 msgstr "Nous avons enregistré votre indisponibilité."
 
-#: cfp/views.py:315
+#: cfp/views.py:316
 #, python-format
 msgid "Speaker %(speaker)s CANCELLED his/her participation."
 msgstr "L’intervenant %(speaker)s a ANNULÉ sa participation."
 
-#: cfp/views.py:363
+#: cfp/views.py:364
 msgid ""
 "Hi {},\n"
 "\n"
@@ -1223,59 +1259,59 @@ msgstr ""
 "{}\n"
 "\n"
 
-#: cfp/views.py:394 cfp/views.py:414
+#: cfp/views.py:395 cfp/views.py:415
 msgid "Co-speaker successfully added to the talk."
 msgstr "Co-intervenant ajouté à l’exposé avec succès."
 
-#: cfp/views.py:427
+#: cfp/views.py:428
 msgid "Co-speaker successfully removed from the talk."
 msgstr "Co-intervenant supprimé de l’exposé avec succès."
 
-#: cfp/views.py:469
+#: cfp/views.py:470
 msgid "The speaker confirmation have been noted."
 msgstr "La confirmation de l’orateur a été notée."
 
-#: cfp/views.py:470
+#: cfp/views.py:471
 msgid "The talk have been confirmed."
 msgstr "L’exposé a été confirmé."
 
-#: cfp/views.py:472
+#: cfp/views.py:473
 msgid "The speaker unavailability have been noted."
 msgstr "L’indisponibilité de l’intervenant a été notée."
 
-#: cfp/views.py:473
+#: cfp/views.py:474
 msgid "The talk have been cancelled."
 msgstr "L’exposé a été annulé."
 
-#: cfp/views.py:548 cfp/views.py:650
+#: cfp/views.py:549 cfp/views.py:651
 msgid "The talk has been accepted."
 msgstr "L’exposé a été accepté."
 
-#: cfp/views.py:550 cfp/views.py:652
+#: cfp/views.py:551 cfp/views.py:653
 msgid "The talk has been declined."
 msgstr "L’exposé a été décliné."
 
-#: cfp/views.py:619 cfp/views.py:712
+#: cfp/views.py:620 cfp/views.py:713
 msgid "Message sent!"
 msgstr "Message envoyé !"
 
-#: cfp/views.py:633
+#: cfp/views.py:634
 msgid "Vote successfully created"
 msgstr "A voté !"
 
-#: cfp/views.py:633
+#: cfp/views.py:634
 msgid "Vote successfully updated"
 msgstr "Vote mis à jour"
 
-#: cfp/views.py:654
+#: cfp/views.py:655
 msgid "Decision taken in account"
 msgstr "Décision enregistrée"
 
-#: cfp/views.py:747
+#: cfp/views.py:748
 msgid "[{}] You have been added to the staff team"
 msgstr "[{}] Vous avez été ajouté aux membres du staff"
 
-#: cfp/views.py:748
+#: cfp/views.py:749
 msgid ""
 "Hi {},\n"
 "\n"
@@ -1299,15 +1335,15 @@ msgstr ""
 "{}\n"
 "\n"
 
-#: cfp/views.py:769
+#: cfp/views.py:770
 msgid "Modifications successfully saved."
 msgstr "Modification enregistrée avec succès."
 
-#: cfp/views.py:846
+#: cfp/views.py:905
 msgid "User created successfully."
 msgstr "Utilisateur créé avec succès."
 
-#: cfp/views.py:867
+#: cfp/views.py:926
 #, python-format
 msgid "Format '%s' not available"
 msgstr "Format '%s' non disponible"
@@ -1389,6 +1425,9 @@ msgstr "Changement de mot de passe"
 msgid "Email address"
 msgstr "Adresse e-mail"
 
+#~ msgid "The volunteer made a few remarks to the staff."
+#~ msgstr "Le bénévole a fait quelques remarques au staff."
+
 #~ msgid "Your proposition have been successfully submitted!"
 #~ msgstr "Votre proposition a été transmise avec succès !"