diff --git a/accounts/templates/accounts/participation_list.html b/accounts/templates/accounts/participation_list.html
index 1aa073a..a260cd8 100644
--- a/accounts/templates/accounts/participation_list.html
+++ b/accounts/templates/accounts/participation_list.html
@@ -14,7 +14,7 @@
# |
Username |
- Fullname |
+ Full name |
Orga |
Reviews |
Conversations |
@@ -32,11 +32,11 @@
title="{% trans "View conversation" %}">
{% if request.user in participation.conversation.subscribers.all %}
+ data-toggle="tooltip" data-placement="bottom" title="{% trans "Unsubscribe from the conversation" %}">
{% else %}
+ data-toggle="tooltip" data-placement="bottom" title="{% trans "Subscribe to the conversation" %}">
{% endif %}
diff --git a/conversations/templates/conversations/correspondents.html b/conversations/templates/conversations/correspondents.html
index b3af798..c5d402c 100644
--- a/conversations/templates/conversations/correspondents.html
+++ b/conversations/templates/conversations/correspondents.html
@@ -15,7 +15,7 @@
# |
Username |
- Fullname |
+ Full name |
Administration |
{% for correspondent in correspondent_list %}
@@ -26,9 +26,9 @@
{% if request.user in correspondent.conversation.subscribers.all %}
-
+
{% else %}
-
+
{% endif %}
|
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 70c88b8..506db79 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-21 10:21+0000\n"
+"POT-Creation-Date: 2016-08-28 14:09+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -25,47 +25,47 @@ msgstr ""
"Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de "
"viande, etc."
-#: accounts/models.py:17 proposals/templates/proposals/user_details.html:16
+#: accounts/models.py:18 proposals/templates/proposals/user_details.html:16
msgid "Biography"
msgstr "Biographie"
-#: accounts/models.py:53
+#: accounts/models.py:54
msgid "Need transport?"
-msgstr "Besoin de défraiment pour le transport ?"
+msgstr "Besoin de défrayement pour le transport ?"
-#: accounts/models.py:56
+#: accounts/models.py:57
msgid "I'm ok to travel by"
msgstr "J’accepte de voyager en"
-#: accounts/models.py:58
+#: accounts/models.py:59
msgid "Need hosting?"
msgstr "Besoin d'un hébergement ?"
-#: accounts/models.py:59
+#: accounts/models.py:60
msgid "Ok for homestay?"
msgstr "Ok pour un logement chez l'habitant ?"
-#: accounts/models.py:61
+#: accounts/models.py:62
msgid "Constraints"
msgstr "Contraintes"
-#: accounts/models.py:62
+#: accounts/models.py:63
msgid "I can output"
msgstr "Sortie vidéo"
-#: accounts/models.py:63
+#: accounts/models.py:64
msgid "I need sound"
msgstr "J’ai besoin de son"
-#: accounts/models.py:65
+#: accounts/models.py:66
msgid "I'm ok to be recorded on video"
msgstr "J’accepte d’être enregistré en vidéo"
-#: accounts/models.py:66
+#: accounts/models.py:67
msgid "Video licence"
msgstr "Licence vidéo"
-#: accounts/models.py:68 proposals/models.py:60
+#: accounts/models.py:69 proposals/models.py:60
#: proposals/templates/proposals/user_details.html:23
msgid "Notes"
msgstr "Notes"
@@ -117,17 +117,17 @@ msgstr "Afficher la discussion"
#: accounts/templates/accounts/participation_list.html:35
#: conversations/templates/conversations/correspondents.html:29
-msgid "Unsubscribe to conversation"
+msgid "Unsubscribe from the conversation"
msgstr "Se désabonner de la discussion"
#: accounts/templates/accounts/participation_list.html:39
#: conversations/templates/conversations/correspondents.html:31
-msgid "Subscribe to conversation"
+msgid "Subscribe to the conversation"
msgstr "S’abonner à la discussion"
#: accounts/templates/accounts/profile.html:12
msgid "Profile"
-msgstr "Profile"
+msgstr "Profil"
#: accounts/templates/accounts/profile.html:20 accounts/views.py:17
msgid "Change avatar"
@@ -183,7 +183,7 @@ msgid "Delete These"
msgstr ""
#: accounts/templates/registration/login.html:11
-#: ponyconf/templates/base.html:76
+#: ponyconf/templates/base.html:79
msgid "Login"
msgstr "Se connecter"
@@ -276,20 +276,20 @@ msgstr "Thèmes"
msgid "Speakers"
msgstr "Orateurs"
-#: ponyconf/templates/base.html:75
+#: ponyconf/templates/base.html:78
msgid "Register"
msgstr "S’inscrire"
-#: ponyconf/templates/base.html:101
+#: ponyconf/templates/base.html:104
msgid "Powered by"
msgstr "Propulsé par"
#: proposals/forms.py:22
msgid "Should be less than 255 characters"
-msgstr "Text court, moins de 255 caractères"
+msgstr "Texte court, moins de 255 caractères"
#: proposals/forms.py:23
-msgid "If you want to say some precisions to organizers."
+msgid "If you want to add some precisions for the organizers."
msgstr "Si vous souhaitez apporter des précisions à l'équipe d'organisation."
#: proposals/models.py:31
@@ -320,9 +320,12 @@ msgstr "Format"
msgid "No talks"
msgstr "Aucun exposé"
+#: proposals/templates/proposals/conference.html:9
+msgid "Conference settings"
+msgstr ""
+
#: proposals/templates/proposals/speaker_list.html:15
#: proposals/templates/proposals/topic_list.html:23
-#: proposals/templates/proposals/topic_list.html:27
msgid "talk"
msgstr "exposé"
@@ -365,9 +368,9 @@ msgid "Topics:"
msgstr "Thèmes :"
#: proposals/templates/proposals/talk_detail.html:44
-#: proposals/templates/proposals/topic_list.html:33
+#: proposals/templates/proposals/topic_list.html:31
msgid "No topics."
-msgstr "Aucun thèmes."
+msgstr "Aucun thème."
#: proposals/templates/proposals/talk_detail.html:49
msgid "Notes:"
@@ -391,7 +394,7 @@ msgstr "Somme :"
#: proposals/templates/proposals/talk_detail.html:66
msgid "Status:"
-msgstr "Status :"
+msgstr "Statut :"
#: proposals/templates/proposals/talk_detail.html:69
msgid "Messages:"
@@ -404,7 +407,7 @@ msgstr "Proposer un exposé"
#: proposals/templates/proposals/talks.html:14
msgid "My participing talks"
-msgstr "Exposés auquels je participe"
+msgstr "Exposés auxquels je participe"
#: proposals/templates/proposals/talks.html:19
msgid "Others talks"
@@ -422,23 +425,23 @@ msgstr "Ajouter un thème"
msgid "reviewer"
msgstr "Responsable"
-#: proposals/views.py:38
+#: proposals/views.py:62
#, python-format
msgid "Talks related to %s:"
msgstr "Exposés portant sur la thématique %s :"
-#: proposals/views.py:57
+#: proposals/views.py:81
msgid "Talk modified successfully!"
msgstr "Exposé modifié avec succès !"
-#: proposals/views.py:63
+#: proposals/views.py:87
msgid "Talk proposed successfully!"
msgstr "Exposé proposé avec succès !"
-#: proposals/views.py:131
+#: proposals/views.py:155
msgid "Vote successfully created"
msgstr "A voté !"
-#: proposals/views.py:131
+#: proposals/views.py:155
msgid "Vote successfully updated"
msgstr "Vote mis à jour"
diff --git a/proposals/forms.py b/proposals/forms.py
index e66b213..6df7ae1 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -20,7 +20,7 @@ class TalkForm(ModelForm):
widgets = {'topics': CheckboxSelectMultiple(), 'speakers': Select2TagWidget()}
help_texts = {
'abstract': _('Should be less than 255 characters'),
- 'notes': _('If you want to say some precisions to organizers.'),
+ 'notes': _('If you want to add some precisions for the organizers.'),
}