Merge pull request #23 from mcarton/typos

Fix spelling & typos
This commit is contained in:
Guilhem Saurel 2016-08-28 21:04:04 +02:00 committed by GitHub
commit 5ed8a79758
4 changed files with 41 additions and 38 deletions

View File

@ -14,7 +14,7 @@
<tr> <tr>
<th>#</th> <th>#</th>
<th>Username</th> <th>Username</th>
<th>Fullname</th> <th>Full name</th>
<th>Orga</th> <th>Orga</th>
<th>Reviews</th> <th>Reviews</th>
<th>Conversations</th> <th>Conversations</th>
@ -32,11 +32,11 @@
title="{% trans "View conversation" %}"><span class="glyphicon glyphicon-envelope"></span></a> title="{% trans "View conversation" %}"><span class="glyphicon glyphicon-envelope"></span></a>
{% if request.user in participation.conversation.subscribers.all %} {% if request.user in participation.conversation.subscribers.all %}
<a href="{% url 'unsubscribe-conversation' participation.user.username %}?next={% url 'list-participant' %}" <a href="{% url 'unsubscribe-conversation' participation.user.username %}?next={% url 'list-participant' %}"
data-toggle="tooltip" data-placement="bottom" title="{% trans "Unsubscribe to conversation" %}"> data-toggle="tooltip" data-placement="bottom" title="{% trans "Unsubscribe from the conversation" %}">
<span class="glyphicon glyphicon-star"></span></a> <span class="glyphicon glyphicon-star"></span></a>
{% else %} {% else %}
<a href="{% url 'subscribe-conversation' participation.user.username %}?next={% url 'list-participant' %}" <a href="{% url 'subscribe-conversation' participation.user.username %}?next={% url 'list-participant' %}"
data-toggle="tooltip" data-placement="bottom" title="{% trans "Subscribe to conversation" %}"> data-toggle="tooltip" data-placement="bottom" title="{% trans "Subscribe to the conversation" %}">
<span class="glyphicon glyphicon-star-empty"></span></a> <span class="glyphicon glyphicon-star-empty"></span></a>
{% endif %} {% endif %}
</td> </td>

View File

@ -15,7 +15,7 @@
<tr> <tr>
<th>#</th> <th>#</th>
<th>Username</th> <th>Username</th>
<th>Fullname</th> <th>Full name</th>
<th>Administration</th> <th>Administration</th>
</tr> </tr>
{% for correspondent in correspondent_list %} {% for correspondent in correspondent_list %}
@ -26,9 +26,9 @@
<td> <td>
<a href="{% url 'conversation' correspondent.user.username %}"><span class="glyphicon glyphicon-envelope"></span></a> <a href="{% url 'conversation' correspondent.user.username %}"><span class="glyphicon glyphicon-envelope"></span></a>
{% if request.user in correspondent.conversation.subscribers.all %} {% if request.user in correspondent.conversation.subscribers.all %}
<a href="{% url 'unsubscribe-conversation' correspondent.user.username %}?next={% url 'correspondents' %}" data-toggle="tooltip" data-placement="bottom" title="{% trans "Unsubscribe to conversation" %}"><span class="glyphicon glyphicon-star"></span></a> <a href="{% url 'unsubscribe-conversation' correspondent.user.username %}?next={% url 'correspondents' %}" data-toggle="tooltip" data-placement="bottom" title="{% trans "Unsubscribe from the conversation" %}"><span class="glyphicon glyphicon-star"></span></a>
{% else %} {% else %}
<a href="{% url 'subscribe-conversation' correspondent.user.username %}?next={% url 'correspondents' %}" data-toggle="tooltip" data-placement="bottom" title="{% trans "Subscribe to conversation" %}"><span class="glyphicon glyphicon-star-empty"></span></a> <a href="{% url 'subscribe-conversation' correspondent.user.username %}?next={% url 'correspondents' %}" data-toggle="tooltip" data-placement="bottom" title="{% trans "Subscribe to the conversation" %}"><span class="glyphicon glyphicon-star-empty"></span></a>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -25,47 +25,47 @@ msgstr ""
"Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de " "Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de "
"viande, etc." "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" msgid "Biography"
msgstr "Biographie" msgstr "Biographie"
#: accounts/models.py:53 #: accounts/models.py:54
msgid "Need transport?" 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" msgid "I'm ok to travel by"
msgstr "Jaccepte de voyager en" msgstr "Jaccepte de voyager en"
#: accounts/models.py:58 #: accounts/models.py:59
msgid "Need hosting?" msgid "Need hosting?"
msgstr "Besoin d'un hébergement ?" msgstr "Besoin d'un hébergement ?"
#: accounts/models.py:59 #: accounts/models.py:60
msgid "Ok for homestay?" msgid "Ok for homestay?"
msgstr "Ok pour un logement chez l'habitant ?" msgstr "Ok pour un logement chez l'habitant ?"
#: accounts/models.py:61 #: accounts/models.py:62
msgid "Constraints" msgid "Constraints"
msgstr "Contraintes" msgstr "Contraintes"
#: accounts/models.py:62 #: accounts/models.py:63
msgid "I can output" msgid "I can output"
msgstr "Sortie vidéo" msgstr "Sortie vidéo"
#: accounts/models.py:63 #: accounts/models.py:64
msgid "I need sound" msgid "I need sound"
msgstr "Jai besoin de son" msgstr "Jai besoin de son"
#: accounts/models.py:65 #: accounts/models.py:66
msgid "I'm ok to be recorded on video" msgid "I'm ok to be recorded on video"
msgstr "Jaccepte dêtre enregistré en vidéo" msgstr "Jaccepte dêtre enregistré en vidéo"
#: accounts/models.py:66 #: accounts/models.py:67
msgid "Video licence" msgid "Video licence"
msgstr "Licence vidéo" 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 #: proposals/templates/proposals/user_details.html:23
msgid "Notes" msgid "Notes"
msgstr "Notes" msgstr "Notes"
@ -117,17 +117,17 @@ msgstr "Afficher la discussion"
#: accounts/templates/accounts/participation_list.html:35 #: accounts/templates/accounts/participation_list.html:35
#: conversations/templates/conversations/correspondents.html:29 #: conversations/templates/conversations/correspondents.html:29
msgid "Unsubscribe to conversation" msgid "Unsubscribe from the conversation"
msgstr "Se désabonner de la discussion" msgstr "Se désabonner de la discussion"
#: accounts/templates/accounts/participation_list.html:39 #: accounts/templates/accounts/participation_list.html:39
#: conversations/templates/conversations/correspondents.html:31 #: conversations/templates/conversations/correspondents.html:31
msgid "Subscribe to conversation" msgid "Subscribe to the conversation"
msgstr "Sabonner à la discussion" msgstr "Sabonner à la discussion"
#: accounts/templates/accounts/profile.html:12 #: accounts/templates/accounts/profile.html:12
msgid "Profile" msgid "Profile"
msgstr "Profile" msgstr "Profil"
#: accounts/templates/accounts/profile.html:20 accounts/views.py:17 #: accounts/templates/accounts/profile.html:20 accounts/views.py:17
msgid "Change avatar" msgid "Change avatar"
@ -183,7 +183,7 @@ msgid "Delete These"
msgstr "" msgstr ""
#: accounts/templates/registration/login.html:11 #: accounts/templates/registration/login.html:11
#: ponyconf/templates/base.html:76 #: ponyconf/templates/base.html:79
msgid "Login" msgid "Login"
msgstr "Se connecter" msgstr "Se connecter"
@ -276,20 +276,20 @@ msgstr "Thèmes"
msgid "Speakers" msgid "Speakers"
msgstr "Orateurs" msgstr "Orateurs"
#: ponyconf/templates/base.html:75 #: ponyconf/templates/base.html:78
msgid "Register" msgid "Register"
msgstr "Sinscrire" msgstr "Sinscrire"
#: ponyconf/templates/base.html:101 #: ponyconf/templates/base.html:104
msgid "Powered by" msgid "Powered by"
msgstr "Propulsé par" msgstr "Propulsé par"
#: proposals/forms.py:22 #: proposals/forms.py:22
msgid "Should be less than 255 characters" 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 #: 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." msgstr "Si vous souhaitez apporter des précisions à l'équipe d'organisation."
#: proposals/models.py:31 #: proposals/models.py:31
@ -320,9 +320,12 @@ msgstr "Format"
msgid "No talks" msgid "No talks"
msgstr "Aucun exposé" msgstr "Aucun exposé"
#: proposals/templates/proposals/conference.html:9
msgid "Conference settings"
msgstr ""
#: proposals/templates/proposals/speaker_list.html:15 #: proposals/templates/proposals/speaker_list.html:15
#: proposals/templates/proposals/topic_list.html:23 #: proposals/templates/proposals/topic_list.html:23
#: proposals/templates/proposals/topic_list.html:27
msgid "talk" msgid "talk"
msgstr "exposé" msgstr "exposé"
@ -365,9 +368,9 @@ msgid "Topics:"
msgstr "Thèmes :" msgstr "Thèmes :"
#: proposals/templates/proposals/talk_detail.html:44 #: proposals/templates/proposals/talk_detail.html:44
#: proposals/templates/proposals/topic_list.html:33 #: proposals/templates/proposals/topic_list.html:31
msgid "No topics." msgid "No topics."
msgstr "Aucun thèmes." msgstr "Aucun thème."
#: proposals/templates/proposals/talk_detail.html:49 #: proposals/templates/proposals/talk_detail.html:49
msgid "Notes:" msgid "Notes:"
@ -391,7 +394,7 @@ msgstr "Somme :"
#: proposals/templates/proposals/talk_detail.html:66 #: proposals/templates/proposals/talk_detail.html:66
msgid "Status:" msgid "Status:"
msgstr "Status :" msgstr "Statut :"
#: proposals/templates/proposals/talk_detail.html:69 #: proposals/templates/proposals/talk_detail.html:69
msgid "Messages:" msgid "Messages:"
@ -404,7 +407,7 @@ msgstr "Proposer un exposé"
#: proposals/templates/proposals/talks.html:14 #: proposals/templates/proposals/talks.html:14
msgid "My participing talks" msgid "My participing talks"
msgstr "Exposés auquels je participe" msgstr "Exposés auxquels je participe"
#: proposals/templates/proposals/talks.html:19 #: proposals/templates/proposals/talks.html:19
msgid "Others talks" msgid "Others talks"
@ -422,23 +425,23 @@ msgstr "Ajouter un thème"
msgid "reviewer" msgid "reviewer"
msgstr "Responsable" msgstr "Responsable"
#: proposals/views.py:38 #: proposals/views.py:62
#, python-format #, python-format
msgid "Talks related to %s:" msgid "Talks related to %s:"
msgstr "Exposés portant sur la thématique %s :" msgstr "Exposés portant sur la thématique %s :"
#: proposals/views.py:57 #: proposals/views.py:81
msgid "Talk modified successfully!" msgid "Talk modified successfully!"
msgstr "Exposé modifié avec succès !" msgstr "Exposé modifié avec succès !"
#: proposals/views.py:63 #: proposals/views.py:87
msgid "Talk proposed successfully!" msgid "Talk proposed successfully!"
msgstr "Exposé proposé avec succès !" msgstr "Exposé proposé avec succès !"
#: proposals/views.py:131 #: proposals/views.py:155
msgid "Vote successfully created" msgid "Vote successfully created"
msgstr "A voté !" msgstr "A voté !"
#: proposals/views.py:131 #: proposals/views.py:155
msgid "Vote successfully updated" msgid "Vote successfully updated"
msgstr "Vote mis à jour" msgstr "Vote mis à jour"

View File

@ -20,7 +20,7 @@ class TalkForm(ModelForm):
widgets = {'topics': CheckboxSelectMultiple(), 'speakers': Select2TagWidget()} widgets = {'topics': CheckboxSelectMultiple(), 'speakers': Select2TagWidget()}
help_texts = { help_texts = {
'abstract': _('Should be less than 255 characters'), '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.'),
} }