diff --git a/shared/locale/en/LC_MESSAGES/django.mo b/shared/locale/en/LC_MESSAGES/django.mo index 82c6c8f..440065f 100644 Binary files a/shared/locale/en/LC_MESSAGES/django.mo and b/shared/locale/en/LC_MESSAGES/django.mo differ diff --git a/shared/locale/en/LC_MESSAGES/django.po b/shared/locale/en/LC_MESSAGES/django.po index 28712e8..fed5159 100644 --- a/shared/locale/en/LC_MESSAGES/django.po +++ b/shared/locale/en/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-15 22:50+0200\n" -"PO-Revision-Date: 2021-04-15 22:55+0200\n" +"POT-Creation-Date: 2021-04-17 00:58+0200\n" +"PO-Revision-Date: 2021-04-17 00:58+0200\n" "Last-Translator: Test Translator \n" "Language-Team: \n" "Language: en\n" @@ -38,8 +38,8 @@ msgstr "Invalid file extension, a CSV file is required." msgid "Supprimer le vote de {} ({}) ?" msgstr "Delete the vote of {} ({}) ?" -#: elections/forms.py:95 elections/templates/elections/election_admin.html:174 -#: elections/templates/elections/election_admin.html:201 +#: elections/forms.py:95 elections/templates/elections/election_admin.html:176 +#: elections/templates/elections/election_admin.html:203 #: elections/templates/elections/election_voters.html:57 msgid "Supprimer" msgstr "Delete" @@ -52,91 +52,91 @@ msgstr "No" msgid "Oui" msgstr "Yes" -#: elections/models.py:30 +#: elections/models.py:31 msgid "nom" msgstr "name" -#: elections/models.py:31 +#: elections/models.py:32 msgid "nom bref" msgstr "short name" -#: elections/models.py:33 +#: elections/models.py:34 msgid "description" msgstr "description" -#: elections/models.py:36 +#: elections/models.py:37 msgid "date et heure de début" msgstr "start date and time" -#: elections/models.py:37 +#: elections/models.py:38 msgid "date et heure de fin" msgstr "end date and time" -#: elections/models.py:40 +#: elections/models.py:41 msgid "conditions de vote" msgstr "voting requirements" -#: elections/models.py:44 +#: elections/models.py:45 msgid "restreint le vote à une liste de personnes" msgstr "restricts the vote to a list of people" -#: elections/models.py:48 +#: elections/models.py:49 msgid "mail avec les identifiants envoyé" msgstr "mail with credentials sent" -#: elections/models.py:65 +#: elections/models.py:66 msgid "résultats publics" msgstr "results published" -#: elections/models.py:66 +#: elections/models.py:67 msgid "dépouillée" msgstr "counted" -#: elections/models.py:68 +#: elections/models.py:69 msgid "archivée" msgstr "archived" -#: elections/models.py:78 +#: elections/models.py:79 msgid "question" msgstr "question" -#: elections/models.py:80 +#: elections/models.py:81 msgid "type de question" msgstr "type of question" -#: elections/models.py:87 +#: elections/models.py:88 msgid "nombre maximal de votes reçus" msgstr "maximal number of votes received" -#: elections/models.py:134 +#: elections/models.py:139 msgid "texte" msgstr "text" -#: elections/models.py:136 +#: elections/models.py:141 msgid "option gagnante" msgstr "winning option" -#: elections/models.py:144 +#: elections/models.py:149 msgid "nombre de votes reçus" msgstr "number of votes received" -#: elections/models.py:163 +#: elections/models.py:168 msgid "rang de l'option" msgstr "option's ranking" -#: elections/models.py:179 +#: elections/models.py:184 msgid "votes supplémentaires" msgstr "extra votes" -#: elections/models.py:195 +#: elections/models.py:200 msgid "Nom et Prénom" msgstr "Name and surname" -#: elections/models.py:217 elections/tests/test_models.py:57 +#: elections/models.py:222 elections/tests/test_models.py:57 msgid "identifiants spécifiques" msgstr "dedicated credentials" -#: elections/models.py:221 +#: elections/models.py:226 msgid "Peut administrer des élections" msgstr "Can manage elections" @@ -201,7 +201,7 @@ msgstr "Delete a vote" #: elections/templates/elections/election_update.html:47 #: elections/templates/elections/option_update.html:29 #: elections/templates/elections/question_update.html:29 -#: elections/templates/elections/vote.html:125 +#: elections/templates/elections/vote.html:40 #: shared/templates/auth/election_login.html:25 #: shared/templates/authens/pwd_login.html:25 #: shared/templates/authens/pwd_reset_confirm.html:25 @@ -210,13 +210,14 @@ msgid "Enregistrer" msgstr "Save" #: elections/templates/elections/delete_vote.html:32 +#: elections/templates/elections/election_ballots.html:18 #: elections/templates/elections/election_update.html:55 #: elections/templates/elections/election_voters.html:19 #: elections/templates/elections/mail_voters.html:43 #: elections/templates/elections/option_update.html:37 #: elections/templates/elections/question_update.html:37 #: elections/templates/elections/upload_voters.html:46 -#: elections/templates/elections/vote.html:134 +#: elections/templates/elections/vote.html:49 #: shared/templates/auth/election_login.html:34 #: shared/templates/authens/pwd_login.html:34 #: shared/templates/authens/pwd_reset.html:34 @@ -227,33 +228,37 @@ msgstr "Back" msgid "Votant·e·s" msgstr "Voters" -#: elections/templates/elections/election.html:29 +#: elections/templates/elections/election.html:31 +msgid "Bulletins" +msgstr "Ballots" + +#: elections/templates/elections/election.html:41 msgid "Élection terminée" msgstr "Election completed" -#: elections/templates/elections/election.html:31 +#: elections/templates/elections/election.html:43 msgid "Élection en cours" msgstr "Election in progress" -#: elections/templates/elections/election.html:40 +#: elections/templates/elections/election.html:52 #: elections/templates/elections/election_list.html:72 msgid "Administrer" msgstr "Manage" -#: elections/templates/elections/election.html:67 +#: elections/templates/elections/election.html:79 #, python-format msgid "Créé par %(creator)s" msgstr "Created by %(creator)s" -#: elections/templates/elections/election.html:80 +#: elections/templates/elections/election.html:92 msgid "Votre vote a bien été enregistré." msgstr "Your vote has been recorded." -#: elections/templates/elections/election.html:107 +#: elections/templates/elections/election.html:119 msgid "Voter" msgstr "Vote" -#: elections/templates/elections/election.html:118 +#: elections/templates/elections/election.html:130 msgid "" "Pour voter lors de cette élection, vous devez vous connecter à l'aide des " "identifiants reçus par mail." @@ -261,7 +266,7 @@ msgstr "" "To vote in this election, you must log in using the login credentials you " "received by e-mail." -#: elections/templates/elections/election.html:120 +#: elections/templates/elections/election.html:132 #: elections/templates/elections/election_voters.html:44 msgid "" "Pour voter lors de cette élection, vous devez vous connecter à l'aide du CAS " @@ -272,16 +277,16 @@ msgstr "" "restrictions may apply and your vote may be deleted if you are not eligible " "to vote." -#: elections/templates/elections/election.html:136 +#: elections/templates/elections/election.html:148 msgid "Connexion par identifiants" msgstr "Login with credentials" -#: elections/templates/elections/election.html:147 +#: elections/templates/elections/election.html:159 #: shared/templates/authens/login_switch.html:20 msgid "Connexion via CAS" msgstr "Login via CAS" -#: elections/templates/elections/election.html:175 +#: elections/templates/elections/election.html:187 msgid "A voté" msgstr "Voted" @@ -294,8 +299,8 @@ msgid "Exporter les votant·e·s" msgstr "Export the list of voters" #: elections/templates/elections/election_admin.html:61 -#: elections/templates/elections/election_admin.html:183 -#: elections/templates/elections/election_admin.html:206 +#: elections/templates/elections/election_admin.html:185 +#: elections/templates/elections/election_admin.html:208 msgid "Modifier" msgstr "Edit" @@ -313,28 +318,32 @@ msgstr "Voters' list" msgid "Dépouiller" msgstr "Count" -#: elections/templates/elections/election_admin.html:101 +#: elections/templates/elections/election_admin.html:102 msgid "Publier" msgstr "Publish" -#: elections/templates/elections/election_admin.html:103 +#: elections/templates/elections/election_admin.html:104 msgid "Dépublier" msgstr "De-publish" -#: elections/templates/elections/election_admin.html:113 +#: elections/templates/elections/election_admin.html:115 msgid "Archiver" msgstr "Archive" -#: elections/templates/elections/election_admin.html:249 -#: elections/templates/elections/election_admin.html:260 +#: elections/templates/elections/election_admin.html:251 +#: elections/templates/elections/election_admin.html:262 msgid "Rajouter une option" msgstr "Add an option" -#: elections/templates/elections/election_admin.html:264 -#: elections/templates/elections/election_admin.html:274 +#: elections/templates/elections/election_admin.html:266 +#: elections/templates/elections/election_admin.html:276 msgid "Rajouter une question" msgstr "Add a question" +#: elections/templates/elections/election_ballots.html:26 +msgid "Liste des bulletins" +msgstr "List of ballots" + #: elections/templates/elections/election_create.html:31 msgid "Création d'une élection" msgstr "Creating an election" @@ -469,32 +478,32 @@ msgstr "Login" msgid "Email" msgstr "E-mail" -#: elections/templates/elections/vote.html:25 -#: elections/templates/elections/vote.html:76 -msgid "Option(s) selectionnée(s)" -msgstr "Selected option(s)" - -#: elections/templates/elections/vote.html:75 -msgid "Classement" -msgstr "Ranking" - -#: elections/templates/elections/vote.html:101 +#: elections/templates/elections/vote.html:15 msgid "Vote pour la question :" msgstr "Vote for the question:" -#: elections/templates/elections/vote.html:142 +#: elections/templates/elections/vote.html:57 msgid "Confirmation du vote" msgstr "Confirmation of the vote" -#: elections/templates/elections/vote.html:154 +#: elections/templates/elections/vote.html:69 msgid "Confirmer" msgstr "Confirm" -#: elections/templates/elections/vote.html:161 +#: elections/templates/elections/vote.html:76 #: shared/templates/forms/modal-form.html:30 msgid "Annuler" msgstr "Cancel" +#: elections/templates/elections/vote/rank.html:44 +msgid "Classement" +msgstr "Ranking" + +#: elections/templates/elections/vote/rank.html:45 +#: elections/templates/elections/vote/select.html:24 +msgid "Option(s) selectionnée(s)" +msgstr "Selected option(s)" + #: elections/utils.py:206 msgid "Vous devez sélectionnner une option." msgstr "You must select an option." @@ -511,7 +520,7 @@ msgstr "The maximum ranking is {}." msgid "Le classement minimal est 1." msgstr "The minimum ranking is 1." -#: elections/utils.py:289 +#: elections/utils.py:342 msgid "" "Format invalide. Vérifiez que le fichier est bien formé (i.e. chaque ligne " "de la forme 'login,nom,email')." @@ -519,23 +528,23 @@ msgstr "" "Invalid format. Check that the file is properly formed (i.e. each line of " "the form 'login,name,e-mail')." -#: elections/utils.py:303 +#: elections/utils.py:356 msgid "La ligne {} n'a pas le bon nombre d'éléments." msgstr "The line {} has the wrong number of elements." -#: elections/utils.py:308 +#: elections/utils.py:361 msgid "Valeur manquante dans la ligne {} : 'login'." msgstr "Missing value in line {}: 'login'." -#: elections/utils.py:313 +#: elections/utils.py:366 msgid "Doublon dans les logins : lignes {} et {}." msgstr "Duplicate logins: lines {} and {}." -#: elections/utils.py:321 +#: elections/utils.py:374 msgid "Valeur manquante dans la ligne {} : 'nom'." msgstr "Missing value in line {}: 'name'." -#: elections/utils.py:327 +#: elections/utils.py:380 msgid "Adresse mail invalide à la ligne {} : '{}'." msgstr "Invalid e-mail address in line {}: '{}'." @@ -587,7 +596,7 @@ msgstr "Option successfully modified!" msgid "Option supprimée !" msgstr "Option deleted!" -#: elections/views.py:542 +#: elections/views.py:557 msgid "Votre choix a bien été enregistré !" msgstr "Your choice has been recorded!"