Index: /trunk/lib/Epoll/I18N/fr.po
===================================================================
--- /trunk/lib/Epoll/I18N/fr.po	(revision 322)
+++ /trunk/lib/Epoll/I18N/fr.po	(revision 323)
@@ -39,18 +39,4 @@
 msgstr "%1 choix possibles:"
 
-#. (sendvoting)
-#: root/templates/default.tt:10
-msgid "A mail has been sent to %1"
-msgstr "Un mail a Ã©tÃ© envoyÃ© Ã  %1"
-
-#. (c.req.param("mail"))
-#: root/templates/newpoll/request.tt:4
-msgid ""
-"A mail has been sent to %1, follow the procedure to complete poll\n"
-"creation"
-msgstr ""
-"Un mail a Ã©tÃ© envoyÃ© Ã  %1, suivez la procÃ©dure pour finir\n"
-"la crÃ©ation du vote"
-
 #: root/mail/voting_passwd.tt:18
 #, fuzzy
@@ -75,4 +61,20 @@
 msgstr "Ajouter un choix"
 
+#. (sendvoting)
+#: root/templates/default.tt:10
+#, fuzzy
+msgid "An email has been sent to %1"
+msgstr "Un mail a Ã©tÃ© envoyÃ© Ã  %1"
+
+#. (c.req.param("mail"))
+#: root/templates/newpoll/request.tt:4
+#, fuzzy
+msgid ""
+"An email has been sent to %1, follow the instructions to complete poll\n"
+"creation"
+msgstr ""
+"Un mail a Ã©tÃ© envoyÃ© Ã  %1, suivez la procÃ©dure pour finir\n"
+"la crÃ©ation du vote"
+
 #: root/templates/admin/date.tt:34
 msgid "Apr"
@@ -99,17 +101,18 @@
 msgstr "Bulletins"
 
-#: root/templates/includes/poll_results.tt:47
-#, fuzzy
-msgid "Ballot list:"
-msgstr "Bulletins:"
-
-#: root/templates/includes/poll.tt:22 root/templates/includes/poll.tt:32
-msgid "Ballot:"
-msgstr "Bulletins:"
-
 #: root/templates/includes/poll_results.tt:26
 #, fuzzy
 msgid "Ballots count"
 msgstr "bulletins contenant:"
+
+#: root/templates/includes/poll_results.tt:47
+#, fuzzy
+msgid "Ballots list:"
+msgstr "Bulletins:"
+
+#: root/templates/includes/poll.tt:22 root/templates/includes/poll.tt:32
+#, fuzzy
+msgid "Ballots:"
+msgstr "Bulletins:"
 
 #: root/templates/importv/ldap.tt:2
@@ -123,5 +126,6 @@
 
 #: root/templates/admin/denied.tt:4
-msgid "Cannot modify a started or finish poll"
+#, fuzzy
+msgid "Cannot modify a running or a finished poll"
 msgstr "Impossible de modifier un vote entamÃ© ou fini"
 
@@ -187,14 +191,17 @@
 
 #: root/templates/admin/includes/poll_settings.tt:43
-msgid "Do not crypt ballot"
+#, fuzzy
+msgid "Don't encrypt ballot"
 msgstr "Ne pas chiffrer les bulletins"
 
+#: root/templates/admin/includes/poll_extra_settings.tt:4
+#, fuzzy
+msgid "Don't send receipt by email"
+msgstr "Ne pas envoyer d'accusÃ© de reception par mail"
+
 #: root/templates/admin/includes/poll_extra_settings.tt:16
-msgid "Do not give ballot id after poll"
+#, fuzzy
+msgid "Don't show ballot id after poll"
 msgstr "Ne pas donner l'id du bulletin aprÃšs le vote"
-
-#: root/templates/admin/includes/poll_extra_settings.tt:4
-msgid "Do not send receipt by mail"
-msgstr "Ne pas envoyer d'accusÃ© de reception par mail"
 
 #: root/templates/admin/includes/poll_settings.tt:40
@@ -212,16 +219,34 @@
 msgstr "Effacer"
 
+#: root/templates/admin/voters.tt:11
+msgid "Email address:"
+msgstr ""
+
+#: root/templates/importv/ldap.tt:7
+msgid "Email attributes:"
+msgstr ""
+
+#: root/templates/admin/includes/poll_extra_settings.tt:9
+#, fuzzy
+msgid "Email includes ballot id"
+msgstr "Le mail inclus l'id des bulletins"
+
+#: root/templates/admin/voters.tt:30
+msgid "Email language"
+msgstr ""
+
 #: root/templates/includes/ballot_form.tt:22
 msgid "Empty ballot"
 msgstr "Bulletin vide"
 
+#: root/templates/admin/votersimport.tt:48
+#, fuzzy
+msgid "Enter a hint for the password here"
+msgstr "Entrer la clef du vote ici:"
+
 #: root/templates/newpoll/default.tt:5
 msgid "Enter administration password for this poll"
 msgstr "Saisissez le mot de passe d'administration du vote"
 
-#: root/templates/admin/votersimport.tt:48
-msgid "Enter here a comment to explain the password to use"
-msgstr ""
-
 #: root/templates/admin/includes/ballot_decrypt.tt:8
 msgid "Enter poll key here:"
@@ -233,5 +258,6 @@
 
 #: root/templates/newpoll/norequest.tt:6
-msgid "Enter the request ID received by mail"
+#, fuzzy
+msgid "Enter the request ID you received by email"
 msgstr "Saisissez l'identifiant de requÃšte reÃ§u par mail"
 
@@ -261,6 +287,6 @@
 
 #: root/templates/pollinc/binary/ballot.tt:19
-msgid "From voting list"
-msgstr "Depuis la liste des votants"
+msgid "From the list of voters"
+msgstr ""
 
 #: root/templates/includes/poll_results.tt:49
@@ -310,6 +336,8 @@
 
 #: root/mail/voting_passwd.tt:16
-msgid "Keep this information preciously, they won't be retransmit again."
-msgstr "Conservez ces information prÃ©cieusement, elles ne seront pas retransmise"
+#, fuzzy
+msgid "Keep this information in a safe place, it won't be sent to you again."
+msgstr ""
+"Conservez ces information prÃ©cieusement, elles ne seront pas retransmise"
 
 #: root/templates/admin/votersimport.tt:16
@@ -326,17 +354,9 @@
 msgstr ""
 
-#: root/templates/importv/ldap.tt:7
-msgid "Mail attributes:"
-msgstr ""
-
-#: root/templates/admin/includes/poll_extra_settings.tt:9
-msgid "Mail include ballot id"
-msgstr "Le mail inclus l'id des bulletins"
-
-#: root/templates/admin/voters.tt:30
-msgid "Mail language"
-msgstr ""
-
-#: root/templates/admin/voters.tt:11 root/templates/ballot/login.tt:13
+#: root/templates/includes/signing_list.tt:11
+msgid "List of voters"
+msgstr ""
+
+#: root/templates/ballot/login.tt:13
 msgid "Mail:"
 msgstr "Mail:"
@@ -372,6 +392,12 @@
 
 #: root/templates/admin/ballot.tt:11
-msgid "No choice are configured"
+#, fuzzy
+msgid "No choices are configured"
 msgstr "Aucun choix n'est configurÃ©"
+
+#: root/templates/ballot/index.tt:15
+#, fuzzy
+msgid "No polls currently running"
+msgstr "Le vote est en cours"
 
 #: root/templates/pollinc/binary/results.tt:42
@@ -381,5 +407,6 @@
 
 #: root/templates/admin/voters.tt:40
-msgid "No subscribed voter"
+#, fuzzy
+msgid "No subscribed voters"
 msgstr "Pas de votants inscrits"
 
@@ -389,5 +416,6 @@
 
 #: root/templates/pollinc/binary/ballot.tt:33
-msgid "No voter to show"
+#, fuzzy
+msgid "No voters to show"
 msgstr "Pas de votants"
 
@@ -411,10 +439,10 @@
 #: root/templates/includes/poll_results.tt:17
 #, fuzzy
-msgid "Number of choice to retain:"
+msgid "Number of choices to retain:"
 msgstr "Nombre de personnes Ã  Ã©lire"
 
 #: root/templates/includes/poll_results.tt:30
 #, fuzzy
-msgid "Number of empty ballot"
+msgid "Number of empty ballots"
 msgstr "Nombre de personnes Ã  Ã©lire"
 
@@ -425,22 +453,20 @@
 #: root/templates/includes/poll_results.tt:35
 #, fuzzy
-msgid "Number of nul ballot"
+msgid "Number of null ballots"
 msgstr "Nombre de personnes Ã  Ã©lire"
 
-#: root/templates/pollinc/binary/ballot_settings.tt:11
-msgid "Number of people to elect"
-msgstr "Nombre de personnes Ã  Ã©lire"
-
 #: root/templates/pollinc/binary/ballot_settings.tt:23
-msgid "Number of people to elect, taken from voting list"
+#, fuzzy
+msgid "Number of people to elect, taken from the list of voters"
 msgstr "Nombre de personnes Ã  Ã©lire depuis la liste Ã©lectorale"
 
 #: root/templates/pollinc/binary/ballot_settings.tt:6
-msgid "Number of possible choice:"
+#, fuzzy
+msgid "Number of possible choices:"
 msgstr "Nombre de choix possibles:"
 
 #: root/templates/pollinc/binary/results.tt:15
 #, fuzzy
-msgid "Number of voice"
+msgid "Number of votes"
 msgstr "Nombre de choix possibles:"
 
@@ -490,5 +516,5 @@
 
 #: root/templates/includes/poll_results.tt:13
-msgid "Poll administrator must validate some ballot"
+msgid "Poll administrator must validate some ballots"
 msgstr ""
 
@@ -514,4 +540,9 @@
 msgstr "DÃ©but du vote:"
 
+#: root/templates/pollinc/binary/ballot_settings.tt:11
+#, fuzzy
+msgid "Possible number of people to elect"
+msgstr "Nombre de personnes Ã  Ã©lire"
+
 #: root/templates/admin/ballot.tt:31
 msgid "Preview of ballot"
@@ -523,5 +554,5 @@
 
 #: root/templates/includes/poll_results.tt:90
-msgid "Results are not yet published"
+msgid "Results haven't been published yet"
 msgstr ""
 
@@ -532,5 +563,5 @@
 #: root/mail/ballot_confirm.tt:13
 #, fuzzy
-msgid "Results will be availlable here"
+msgid "Results will be available here"
 msgstr "Les rÃ©sultats seront disponibles"
 
@@ -591,5 +622,6 @@
 
 #: root/templates/includes/poll.tt:25
-msgid "The number of ballot and people having voted differ"
+#, fuzzy
+msgid "The number of ballots doesn't match the number of voters"
 msgstr "Le nombre de bulletins et de votants diffÃ©rent"
 
@@ -599,15 +631,18 @@
 
 #: root/templates/vote/default.tt:16
-msgid "This poll is not opened yet"
+#, fuzzy
+msgid "This poll is not open for voting yet"
 msgstr "Ce vote n'est pas encore ouvert"
 
 #: root/templates/ballot/closed.tt:10
-msgid "This poll is over, results are available"
+#, fuzzy
+msgid "This poll is over, results are now available"
 msgstr "Ce vote est terminÃ©, les rÃ©sultats sont disponibles"
 
 #: root/templates/admin/delete.tt:24
+#, fuzzy
 msgid ""
-"This will definitely delete all data about this poll (configuration,\n"
-"voting list, ballots."
+"This will completely delete all data about this poll (configuration,\n"
+"list of voters, ballots."
 msgstr ""
 "La destruction du vote entrainera de faÃ§on irrÃ©versible l'effacement de\n"
@@ -615,7 +650,8 @@
 
 #: root/templates/admin/delete.tt:10
+#, fuzzy
 msgid ""
-"This will delete sensible data from database, results will be computed\n"
-"definitively. Notice voting people will not be able to check ballots anymore"
+"This will delete sensitive data from database and results will be finally\n"
+"computed. Note that voters won't be able to check their ballots anymore"
 msgstr ""
 "En effaÃ§ant les bulletins, vous effacez les donnÃ©es sensibles du vote, les\n"
@@ -672,8 +708,4 @@
 msgstr "Votant"
 
-#: root/templates/includes/signing_list.tt:11
-msgid "Voting list"
-msgstr "Liste des votants"
-
 #: root/templates/includes/header.tt:28
 msgid "Web voting system"
@@ -693,5 +725,6 @@
 
 #: root/templates/admin/delete_poll_confirm.tt:11
-msgid "Yes, destroy this poll"
+#, fuzzy
+msgid "Yes, delete this poll"
 msgstr "Oui, dÃ©truire ce vote"
 
@@ -707,10 +740,6 @@
 #: root/mail/voting_passwd.tt:2
 #, fuzzy
-msgid "You are invited to participate to this poll"
+msgid "You are invited to participate in this poll"
 msgstr "Vous Ãªtes invitÃ© Ã  participer Ã  ce vote"
-
-#: root/mail/poll_request.tt:1
-msgid "You asked the creation of a new poll"
-msgstr "Vous avez demandÃ© la crÃ©ation d'un nouveau vote"
 
 #: root/templates/includes/poll_running.tt:4
@@ -726,24 +755,37 @@
 msgstr "Vous pouvez saisir le code de la requÃªte ici"
 
+#: root/templates/default.tt:7
+#, fuzzy
+msgid "You don't own any polls"
+msgstr "Vous n'avez pas de vote"
+
 #: root/mail/ballot_confirm.tt:2
 #, fuzzy
-msgid "You just particiapted to the poll:"
+msgid "You have just particiapted in the poll:"
 msgstr "a dÃ©jÃ  participÃ© au vote le %1"
 
+#: root/mail/voting_passwd.tt:12
+msgid "You will be able to submit your vote from"
+msgstr ""
+
 #: root/templates/ballot/done.tt:7
-msgid "You just submitted your ballot"
+#, fuzzy
+msgid "You've just submitted your ballot"
 msgstr "Vous venez de soumettre votre bulletin"
 
-#: root/templates/default.tt:7
-msgid "You own no poll"
-msgstr "Vous n'avez pas de vote"
-
-#: root/mail/voting_passwd.tt:12
-msgid "You will be able to submit your choice between"
-msgstr ""
+#: root/mail/poll_request.tt:1
+#, fuzzy
+msgid "You've requested to create a new poll"
+msgstr "Vous avez demandÃ© la crÃ©ation d'un nouveau vote"
 
 #: root/mail/ballot_confirm.tt:9
-msgid "Your ballot is identified by ID"
-msgstr "Votre bulletin a l'identifiant:"
+#, fuzzy
+msgid "Your ballot ID"
+msgstr "L'identifiant de vote bulletin est:"
+
+#: root/templates/newpoll/index.tt:9
+#, fuzzy
+msgid "Your email address:"
+msgstr "Votre mail:"
 
 #: root/mail/voting_passwd.tt:8
@@ -751,8 +793,4 @@
 msgid "Your login is"
 msgstr "L'identifiant de vote bulletin est:"
-
-#: root/templates/newpoll/index.tt:9
-msgid "Your mail:"
-msgstr "Votre mail:"
 
 #: root/mail/voting_passwd.tt:9
@@ -770,13 +808,16 @@
 
 #: root/templates/ballot/default.tt:42
-msgid "Your vote will be definitive after validation"
+#, fuzzy
+msgid "Your vote will be final after validation"
 msgstr "Votre vote sera dÃ©finitevement enregistrÃ© aprÃšs confirmation"
 
 #: root/templates/ballot/default.tt:55
-msgid "Your vote will be registered only after confirm"
+#, fuzzy
+msgid "Your vote will be registered only after validation"
 msgstr "Votre vote sera enregistrÃ© seulement aprÃšs confirmation"
 
 #: root/templates/admin/voters.tt:8
-msgid "add a voting"
+#, fuzzy
+msgid "add a vote"
 msgstr "ajouter un votant"
 
@@ -787,11 +828,7 @@
 #. (signed_date)
 #: root/templates/ballot/signed.tt:5
-msgid "already participated to this poll the %1"
+#, fuzzy
+msgid "already participated in this poll the %1"
 msgstr "a dÃ©jÃ  participÃ© au vote le %1"
-
-#: root/mail/voting_passwd.tt:13
-#, fuzzy
-msgid "and"
-msgstr "Jan"
 
 #: root/templates/admin/validate.tt:19
@@ -808,8 +845,4 @@
 msgstr ""
 
-#: root/templates/admin/includes/poll_settings.tt:49
-msgid "crypt the poll"
-msgstr "Chiffrer ce vote"
-
 #: root/templates/includes/poll_results.tt:50
 msgid "date (=> view as)"
@@ -826,6 +859,11 @@
 #: root/templates/admin/voters.tt:23
 #, fuzzy
-msgid "delete voters list"
+msgid "delete the list of voters"
 msgstr "SystÃšme de vote en ligne"
+
+#: root/templates/admin/includes/poll_settings.tt:49
+#, fuzzy
+msgid "encrypt the poll"
+msgstr "Chiffrer ce vote"
 
 #. (poll.info("elected_count"))
@@ -848,6 +886,6 @@
 
 #: root/templates/pollinc/binary/ballot_settings.tt:12
-msgid "if different of number of choice"
-msgstr "si diffÃ©rent du nombre de choix"
+msgid "if you want to vote for more than one person"
+msgstr ""
 
 #: root/templates/admin/validate.tt:82
@@ -856,15 +894,7 @@
 
 #: root/templates/admin/validate.tt:14
+#: root/templates/includes/poll_results.tt:76
 msgid "invalid"
 msgstr "invalide"
-
-#: root/templates/includes/poll_results.tt:76
-#, fuzzy
-msgid "invalided"
-msgstr "invalide"
-
-#: root/templates/admin/validate.tt:56
-msgid "is not valid"
-msgstr "n'est pas valide"
 
 #: root/templates/admin/validate.tt:54
@@ -872,4 +902,9 @@
 msgstr "est valide"
 
+#: root/templates/admin/validate.tt:56
+#, fuzzy
+msgid "isn't valid"
+msgstr "n'est pas valide"
+
 #: root/templates/admin/validate.tt:8
 msgid "list ballots:"
@@ -885,5 +920,6 @@
 
 #: root/templates/admin/validate.tt:82
-msgid "must be see as"
+#, fuzzy
+msgid "must be seen as"
 msgstr "doit Ãªtre vu comme"
 
@@ -894,5 +930,6 @@
 
 #: root/templates/admin/validate.tt:12
-msgid "needing validation"
+#, fuzzy
+msgid "need validation"
 msgstr "necessitant une validation"
 
@@ -939,4 +976,8 @@
 msgstr "heure:"
 
+#: root/mail/voting_passwd.tt:13
+msgid "to"
+msgstr ""
+
 #: root/templates/admin/validate.tt:16
 msgid "valid"
@@ -955,4 +996,28 @@
 msgstr "L'identifiant de vote bulletin est:"
 
+#~ msgid "From voting list"
+#~ msgstr "Depuis la liste des votants"
+
+#, fuzzy
+#~ msgid "Number of voice"
+#~ msgstr "Nombre de choix possibles:"
+
+#~ msgid "Voting list"
+#~ msgstr "Liste des votants"
+
+#~ msgid "Your ballot is identified by ID"
+#~ msgstr "Votre bulletin a l'identifiant:"
+
+#, fuzzy
+#~ msgid "and"
+#~ msgstr "Jan"
+
+#~ msgid "if different of number of choice"
+#~ msgstr "si diffÃ©rent du nombre de choix"
+
+#, fuzzy
+#~ msgid "invalided"
+#~ msgstr "invalide"
+
 #~ msgid "to come"
 #~ msgstr "Ã  venir"
@@ -962,8 +1027,4 @@
 #~ msgstr "Bulletins"
 
-#, fuzzy
-#~ msgid "Number of voices"
-#~ msgstr "Nombre de choix possibles:"
-
 #~ msgid "From a csv file"
 #~ msgstr "Depuis un fichier CSV"
Index: /trunk/lib/Epoll/I18N/messages.pot
===================================================================
--- /trunk/lib/Epoll/I18N/messages.pot	(revision 322)
+++ /trunk/lib/Epoll/I18N/messages.pot	(revision 323)
@@ -39,7 +39,27 @@
 msgstr ""
 
+#: root/mail/voting_passwd.tt:18
+msgid "About this poll"
+msgstr ""
+
+#: root/templates/pollinc/binary/results.tt:10
+msgid "Absolute Majority"
+msgstr ""
+
+#: root/templates/admin/login.tt:6
+msgid "Access to administration of poll:"
+msgstr ""
+
+#: root/templates/admin/ballot.tt:26 root/templates/admin/voters.tt:12 root/templates/admin/voters.tt:25
+msgid "Add"
+msgstr ""
+
+#: root/templates/admin/ballot.tt:24
+msgid "Add a choice"
+msgstr ""
+
 #. (sendvoting)
 #: root/templates/default.tt:10
-msgid "A mail has been sent to %1"
+msgid "An email has been sent to %1"
 msgstr ""
 
@@ -47,26 +67,6 @@
 #: root/templates/newpoll/request.tt:4
 msgid ""
-"A mail has been sent to %1, follow the procedure to complete poll\n"
+"An email has been sent to %1, follow the instructions to complete poll\n"
 "creation"
-msgstr ""
-
-#: root/mail/voting_passwd.tt:18
-msgid "About this poll"
-msgstr ""
-
-#: root/templates/pollinc/binary/results.tt:10
-msgid "Absolute Majority"
-msgstr ""
-
-#: root/templates/admin/login.tt:6
-msgid "Access to administration of poll:"
-msgstr ""
-
-#: root/templates/admin/ballot.tt:26 root/templates/admin/voters.tt:12 root/templates/admin/voters.tt:25
-msgid "Add"
-msgstr ""
-
-#: root/templates/admin/ballot.tt:24
-msgid "Add a choice"
 msgstr ""
 
@@ -95,16 +95,16 @@
 msgstr ""
 
-#: root/templates/includes/poll_results.tt:47
-msgid "Ballot list:"
-msgstr ""
-
-#: root/templates/includes/poll.tt:22 root/templates/includes/poll.tt:32
-msgid "Ballot:"
-msgstr ""
-
 #: root/templates/includes/poll_results.tt:26
 msgid "Ballots count"
 msgstr ""
 
+#: root/templates/includes/poll_results.tt:47
+msgid "Ballots list:"
+msgstr ""
+
+#: root/templates/includes/poll.tt:22 root/templates/includes/poll.tt:32
+msgid "Ballots:"
+msgstr ""
+
 #: root/templates/importv/ldap.tt:2
 msgid "Base DN:"
@@ -116,5 +116,5 @@
 
 #: root/templates/admin/denied.tt:4
-msgid "Cannot modify a started or finish poll"
+msgid "Cannot modify a running or a finished poll"
 msgstr ""
 
@@ -180,13 +180,13 @@
 
 #: root/templates/admin/includes/poll_settings.tt:43
-msgid "Do not crypt ballot"
+msgid "Don't encrypt ballot"
+msgstr ""
+
+#: root/templates/admin/includes/poll_extra_settings.tt:4
+msgid "Don't send receipt by email"
 msgstr ""
 
 #: root/templates/admin/includes/poll_extra_settings.tt:16
-msgid "Do not give ballot id after poll"
-msgstr ""
-
-#: root/templates/admin/includes/poll_extra_settings.tt:4
-msgid "Do not send receipt by mail"
+msgid "Don't show ballot id after poll"
 msgstr ""
 
@@ -203,16 +203,32 @@
 msgstr ""
 
+#: root/templates/admin/voters.tt:11
+msgid "Email address:"
+msgstr ""
+
+#: root/templates/importv/ldap.tt:7
+msgid "Email attributes:"
+msgstr ""
+
+#: root/templates/admin/includes/poll_extra_settings.tt:9
+msgid "Email includes ballot id"
+msgstr ""
+
+#: root/templates/admin/voters.tt:30
+msgid "Email language"
+msgstr ""
+
 #: root/templates/includes/ballot_form.tt:22
 msgid "Empty ballot"
 msgstr ""
 
+#: root/templates/admin/votersimport.tt:48
+msgid "Enter a hint for the password here"
+msgstr ""
+
 #: root/templates/newpoll/default.tt:5
 msgid "Enter administration password for this poll"
 msgstr ""
 
-#: root/templates/admin/votersimport.tt:48
-msgid "Enter here a comment to explain the password to use"
-msgstr ""
-
 #: root/templates/admin/includes/ballot_decrypt.tt:8
 msgid "Enter poll key here:"
@@ -224,5 +240,5 @@
 
 #: root/templates/newpoll/norequest.tt:6
-msgid "Enter the request ID received by mail"
+msgid "Enter the request ID you received by email"
 msgstr ""
 
@@ -252,5 +268,5 @@
 
 #: root/templates/pollinc/binary/ballot.tt:19
-msgid "From voting list"
+msgid "From the list of voters"
 msgstr ""
 
@@ -298,5 +314,5 @@
 
 #: root/mail/voting_passwd.tt:16
-msgid "Keep this information preciously, they won't be retransmit again."
+msgid "Keep this information in a safe place, it won't be sent to you again."
 msgstr ""
 
@@ -313,17 +329,9 @@
 msgstr ""
 
-#: root/templates/importv/ldap.tt:7
-msgid "Mail attributes:"
-msgstr ""
-
-#: root/templates/admin/includes/poll_extra_settings.tt:9
-msgid "Mail include ballot id"
-msgstr ""
-
-#: root/templates/admin/voters.tt:30
-msgid "Mail language"
-msgstr ""
-
-#: root/templates/admin/voters.tt:11 root/templates/ballot/login.tt:13
+#: root/templates/includes/signing_list.tt:11
+msgid "List of voters"
+msgstr ""
+
+#: root/templates/ballot/login.tt:13
 msgid "Mail:"
 msgstr ""
@@ -358,5 +366,9 @@
 
 #: root/templates/admin/ballot.tt:11
-msgid "No choice are configured"
+msgid "No choices are configured"
+msgstr ""
+
+#: root/templates/ballot/index.tt:15
+msgid "No polls currently running"
 msgstr ""
 
@@ -366,5 +378,5 @@
 
 #: root/templates/admin/voters.tt:40
-msgid "No subscribed voter"
+msgid "No subscribed voters"
 msgstr ""
 
@@ -374,5 +386,5 @@
 
 #: root/templates/pollinc/binary/ballot.tt:33
-msgid "No voter to show"
+msgid "No voters to show"
 msgstr ""
 
@@ -394,9 +406,9 @@
 
 #: root/templates/includes/poll_results.tt:17
-msgid "Number of choice to retain:"
+msgid "Number of choices to retain:"
 msgstr ""
 
 #: root/templates/includes/poll_results.tt:30
-msgid "Number of empty ballot"
+msgid "Number of empty ballots"
 msgstr ""
 
@@ -406,21 +418,17 @@
 
 #: root/templates/includes/poll_results.tt:35
-msgid "Number of nul ballot"
-msgstr ""
-
-#: root/templates/pollinc/binary/ballot_settings.tt:11
-msgid "Number of people to elect"
+msgid "Number of null ballots"
 msgstr ""
 
 #: root/templates/pollinc/binary/ballot_settings.tt:23
-msgid "Number of people to elect, taken from voting list"
+msgid "Number of people to elect, taken from the list of voters"
 msgstr ""
 
 #: root/templates/pollinc/binary/ballot_settings.tt:6
-msgid "Number of possible choice:"
+msgid "Number of possible choices:"
 msgstr ""
 
 #: root/templates/pollinc/binary/results.tt:15
-msgid "Number of voice"
+msgid "Number of votes"
 msgstr ""
 
@@ -468,5 +476,5 @@
 
 #: root/templates/includes/poll_results.tt:13
-msgid "Poll administrator must validate some ballot"
+msgid "Poll administrator must validate some ballots"
 msgstr ""
 
@@ -492,4 +500,8 @@
 msgstr ""
 
+#: root/templates/pollinc/binary/ballot_settings.tt:11
+msgid "Possible number of people to elect"
+msgstr ""
+
 #: root/templates/admin/ballot.tt:31
 msgid "Preview of ballot"
@@ -501,5 +513,5 @@
 
 #: root/templates/includes/poll_results.tt:90
-msgid "Results are not yet published"
+msgid "Results haven't been published yet"
 msgstr ""
 
@@ -509,5 +521,5 @@
 
 #: root/mail/ballot_confirm.tt:13
-msgid "Results will be availlable here"
+msgid "Results will be available here"
 msgstr ""
 
@@ -565,5 +577,5 @@
 
 #: root/templates/includes/poll.tt:25
-msgid "The number of ballot and people having voted differ"
+msgid "The number of ballots doesn't match the number of voters"
 msgstr ""
 
@@ -573,21 +585,21 @@
 
 #: root/templates/vote/default.tt:16
-msgid "This poll is not opened yet"
+msgid "This poll is not open for voting yet"
 msgstr ""
 
 #: root/templates/ballot/closed.tt:10
-msgid "This poll is over, results are available"
+msgid "This poll is over, results are now available"
 msgstr ""
 
 #: root/templates/admin/delete.tt:24
 msgid ""
-"This will definitely delete all data about this poll (configuration,\n"
-"voting list, ballots."
+"This will completely delete all data about this poll (configuration,\n"
+"list of voters, ballots."
 msgstr ""
 
 #: root/templates/admin/delete.tt:10
 msgid ""
-"This will delete sensible data from database, results will be computed\n"
-"definitively. Notice voting people will not be able to check ballots anymore"
+"This will delete sensitive data from database and results will be finally\n"
+"computed. Note that voters won't be able to check their ballots anymore"
 msgstr ""
 
@@ -636,8 +648,4 @@
 msgstr ""
 
-#: root/templates/includes/signing_list.tt:11
-msgid "Voting list"
-msgstr ""
-
 #: root/templates/includes/header.tt:28
 msgid "Web voting system"
@@ -657,5 +665,5 @@
 
 #: root/templates/admin/delete_poll_confirm.tt:11
-msgid "Yes, destroy this poll"
+msgid "Yes, delete this poll"
 msgstr ""
 
@@ -668,9 +676,5 @@
 
 #: root/mail/voting_passwd.tt:2
-msgid "You are invited to participate to this poll"
-msgstr ""
-
-#: root/mail/poll_request.tt:1
-msgid "You asked the creation of a new poll"
+msgid "You are invited to participate in this poll"
 msgstr ""
 
@@ -687,22 +691,30 @@
 msgstr ""
 
+#: root/templates/default.tt:7
+msgid "You don't own any polls"
+msgstr ""
+
 #: root/mail/ballot_confirm.tt:2
-msgid "You just particiapted to the poll:"
+msgid "You have just particiapted in the poll:"
+msgstr ""
+
+#: root/mail/voting_passwd.tt:12
+msgid "You will be able to submit your vote from"
 msgstr ""
 
 #: root/templates/ballot/done.tt:7
-msgid "You just submitted your ballot"
-msgstr ""
-
-#: root/templates/default.tt:7
-msgid "You own no poll"
-msgstr ""
-
-#: root/mail/voting_passwd.tt:12
-msgid "You will be able to submit your choice between"
+msgid "You've just submitted your ballot"
+msgstr ""
+
+#: root/mail/poll_request.tt:1
+msgid "You've requested to create a new poll"
 msgstr ""
 
 #: root/mail/ballot_confirm.tt:9
-msgid "Your ballot is identified by ID"
+msgid "Your ballot ID"
+msgstr ""
+
+#: root/templates/newpoll/index.tt:9
+msgid "Your email address:"
 msgstr ""
 
@@ -711,8 +723,4 @@
 msgstr ""
 
-#: root/templates/newpoll/index.tt:9
-msgid "Your mail:"
-msgstr ""
-
 #: root/mail/voting_passwd.tt:9
 msgid "Your password is"
@@ -728,13 +736,13 @@
 
 #: root/templates/ballot/default.tt:42
-msgid "Your vote will be definitive after validation"
+msgid "Your vote will be final after validation"
 msgstr ""
 
 #: root/templates/ballot/default.tt:55
-msgid "Your vote will be registered only after confirm"
+msgid "Your vote will be registered only after validation"
 msgstr ""
 
 #: root/templates/admin/voters.tt:8
-msgid "add a voting"
+msgid "add a vote"
 msgstr ""
 
@@ -745,9 +753,5 @@
 #. (signed_date)
 #: root/templates/ballot/signed.tt:5
-msgid "already participated to this poll the %1"
-msgstr ""
-
-#: root/mail/voting_passwd.tt:13
-msgid "and"
+msgid "already participated in this poll the %1"
 msgstr ""
 
@@ -764,8 +768,4 @@
 msgstr ""
 
-#: root/templates/admin/includes/poll_settings.tt:49
-msgid "crypt the poll"
-msgstr ""
-
 #: root/templates/includes/poll_results.tt:50
 msgid "date (=> view as)"
@@ -781,5 +781,9 @@
 
 #: root/templates/admin/voters.tt:23
-msgid "delete voters list"
+msgid "delete the list of voters"
+msgstr ""
+
+#: root/templates/admin/includes/poll_settings.tt:49
+msgid "encrypt the poll"
 msgstr ""
 
@@ -802,5 +806,5 @@
 
 #: root/templates/pollinc/binary/ballot_settings.tt:12
-msgid "if different of number of choice"
+msgid "if you want to vote for more than one person"
 msgstr ""
 
@@ -809,14 +813,6 @@
 msgstr ""
 
-#: root/templates/admin/validate.tt:14
+#: root/templates/admin/validate.tt:14 root/templates/includes/poll_results.tt:76
 msgid "invalid"
-msgstr ""
-
-#: root/templates/includes/poll_results.tt:76
-msgid "invalided"
-msgstr ""
-
-#: root/templates/admin/validate.tt:56
-msgid "is not valid"
 msgstr ""
 
@@ -825,4 +821,8 @@
 msgstr ""
 
+#: root/templates/admin/validate.tt:56
+msgid "isn't valid"
+msgstr ""
+
 #: root/templates/admin/validate.tt:8
 msgid "list ballots:"
@@ -838,5 +838,5 @@
 
 #: root/templates/admin/validate.tt:82
-msgid "must be see as"
+msgid "must be seen as"
 msgstr ""
 
@@ -846,5 +846,5 @@
 
 #: root/templates/admin/validate.tt:12
-msgid "needing validation"
+msgid "need validation"
 msgstr ""
 
@@ -889,4 +889,8 @@
 msgstr ""
 
+#: root/mail/voting_passwd.tt:13
+msgid "to"
+msgstr ""
+
 #: root/templates/admin/validate.tt:16
 msgid "valid"
Index: /trunk/root/mail/ballot_confirm.tt
===================================================================
--- /trunk/root/mail/ballot_confirm.tt	(revision 322)
+++ /trunk/root/mail/ballot_confirm.tt	(revision 323)
@@ -1,4 +1,4 @@
 [% poll = c.model('Vote').poll(voteid) %]
-[% l('You just particiapted to the poll:') %]
+[% l('You have just particiapted in the poll:') %]
 
 --------
@@ -7,9 +7,9 @@
 
 [% IF NOT poll.info.no_mail_ballot_id %]
-[% l('Your ballot is identified by ID') %]:
+[% l('Your ballot ID') %]:
 [% ballotid %]
 [% END %]
 
-[% l('Results will be availlable here') %]:
+[% l('Results will be available here') %]:
 [% c.uri_for('/vote', poll.uid) %]
 
Index: /trunk/root/mail/poll_reminder_voting.tt
===================================================================
--- /trunk/root/mail/poll_reminder_voting.tt	(revision 322)
+++ /trunk/root/mail/poll_reminder_voting.tt	(revision 323)
@@ -2,10 +2,10 @@
 [%- vote = c.model('Vote') -%]
 
-[% l('You ask for a reminder about poll you're participating') %]
+[% l('You\'ve asked for a reminder about the poll(s) you're participating in') %]
 
 
 [%- FOREACH p = polls_voting -%]
 [% IF loop.first %]
-[% l('You are list as voting on polls') %]:
+[% l('You are listed as a voter on these polls') %]:
 [% END %]
 [%- poll = vote.poll(p.poll) -%]
@@ -18,5 +18,5 @@
 [%- FOREACH p = polls_owner -%]
 [% IF loop.first %]
-[% l('You are administrator for these poll') %]:
+[% l('You are the administrator for these poll') %]:
 [% END %]
 [%- poll = vote.poll(p.id) -%]
Index: /trunk/root/mail/poll_request.tt
===================================================================
--- /trunk/root/mail/poll_request.tt	(revision 322)
+++ /trunk/root/mail/poll_request.tt	(revision 323)
@@ -1,3 +1,3 @@
-[% l('You asked the creation of a new poll') %]:
+[% l('You\'ve requested to create a new poll') %]:
 [% label %]
 
Index: /trunk/root/mail/voting_passwd.tt
===================================================================
--- /trunk/root/mail/voting_passwd.tt	(revision 322)
+++ /trunk/root/mail/voting_passwd.tt	(revision 323)
@@ -1,4 +1,4 @@
 [% poll = c.model('Vote').poll(voteid) %]
-[% l('You are invited to participate to this poll') %]
+[% l('You are invited to participate in this poll') %]
 
 [% poll.info.label %]
@@ -10,9 +10,9 @@
 
 [% IF poll.info.dstart && poll.info.dstart -%]
-[% l('You will be able to submit your choice between') %] [% poll.info.dstart %] [% poll.info.hstart %]
-[% l('and') %] [% poll.info.dend %] [% poll.info.hend %]
+[% l('You will be able to submit your vote from') %] [% poll.info.dstart %] [% poll.info.hstart %]
+[% l('to') %] [% poll.info.dend %] [% poll.info.hend %]
 [%- END %]
 
-[% l('Keep this information preciously, they won\'t be retransmit again.') %]
+[% l('Keep this information in a safe place, it won\'t be sent to you again.') %]
 
 [% l('About this poll') %]:
Index: /trunk/root/templates/admin/ballot.tt
===================================================================
--- /trunk/root/templates/admin/ballot.tt	(revision 322)
+++ /trunk/root/templates/admin/ballot.tt	(revision 323)
@@ -9,5 +9,5 @@
 
 [% IF ! poll.choices_keys.size %]
-<p class="alert">[% l('No choice are configured') %]</p>
+<p class="alert">[% l('No choices are configured') %]</p>
 [% ELSE %]
 [% FOREACH choicek = poll.choices_keys %]
Index: /trunk/root/templates/admin/delete.tt
===================================================================
--- /trunk/root/templates/admin/delete.tt	(revision 322)
+++ /trunk/root/templates/admin/delete.tt	(revision 323)
@@ -8,6 +8,6 @@
 <p>[% l('Delete ballots') %]</p>
 
-<p>[% l('This will delete sensible data from database, results will be computed
-definitively. Notice voting people will not be able to check ballots anymore')
+<p>[% l('This will delete sensitive data from database and results will be finally
+computed. Note that voters won\'t be able to check their ballots anymore')
 %]</p>
 
@@ -22,6 +22,6 @@
 <p>[% l('Delete this poll') %]</p>
 
-<p>[% l('This will definitely delete all data about this poll (configuration,
-voting list, ballots.') %]</p>
+<p>[% l('This will completely delete all data about this poll (configuration,
+list of voters, ballots.') %]</p>
 
 <form action="[% c.uri_for(poll.uid, 'delete') %]" method="post">
Index: /trunk/root/templates/admin/delete_poll_confirm.tt
===================================================================
--- /trunk/root/templates/admin/delete_poll_confirm.tt	(revision 322)
+++ /trunk/root/templates/admin/delete_poll_confirm.tt	(revision 323)
@@ -9,4 +9,4 @@
 
 <form action="[% c.uri_for(poll.uid, 'delete') %]" method="post">
-<input type="submit" value="[% l('Yes, destroy this poll') %]" name="delete_poll_confirm">
+<input type="submit" value="[% l('Yes, delete this poll') %]" name="delete_poll_confirm">
 </form>
Index: /trunk/root/templates/admin/denied.tt
===================================================================
--- /trunk/root/templates/admin/denied.tt	(revision 322)
+++ /trunk/root/templates/admin/denied.tt	(revision 323)
@@ -2,4 +2,4 @@
 
 <div class="alert">
-<p>[% l('Cannot modify a started or finish poll') %]</p>
+<p>[% l('Cannot modify a running or a finished poll') %]</p>
 </div>
Index: /trunk/root/templates/admin/includes/poll_extra_settings.tt
===================================================================
--- /trunk/root/templates/admin/includes/poll_extra_settings.tt	(revision 322)
+++ /trunk/root/templates/admin/includes/poll_extra_settings.tt	(revision 323)
@@ -2,10 +2,10 @@
 
 <ul>
-  <li>[% l('Do not send receipt by mail') %]
+  <li>[% l('Don\'t send receipt by email') %]
     <span style="float:right"><input type="checkbox" name="no_mail_confirm_vote"
 [% "checked" IF pollsettings.no_mail_confirm_vote %]></span>
 [% IF NOT pollsettings.no_mail_confirm_vote %]
   <ul>
-    <li style="clear: both">[% l('Mail include ballot id') %]
+    <li style="clear: both">[% l('Email includes ballot id') %]
       <span style="float:right"><input type="checkbox" name="no_mail_ballot_id"
 [% "checked" IF pollsettings.no_mail_ballot_id %]></span>
@@ -14,5 +14,5 @@
 [% END %]
   </li>
-  <li style="clear: both">[% l('Do not give ballot id after poll') %]
+  <li style="clear: both">[% l('Don\'t show ballot id after poll') %]
     <span style="float:right"><input type="checkbox" name="no_ballot_id_voting"
 [% "checked" IF pollsettings.no_ballot_id_voting %]></span>
Index: /trunk/root/templates/admin/includes/poll_settings.tt
===================================================================
--- /trunk/root/templates/admin/includes/poll_settings.tt	(revision 322)
+++ /trunk/root/templates/admin/includes/poll_settings.tt	(revision 323)
@@ -41,5 +41,5 @@
 <hr>
 <form action="[% c.uri_for(poll.uid) %]" method="POST">
-<input type="submit" name="notcrypted" value="[% l('Do not crypt ballot') %]">
+<input type="submit" name="notcrypted" value="[% l('Don\'t encrypt ballot') %]">
 </form>
 [% ELSE %]
@@ -47,5 +47,5 @@
 [% l('You can choose a passphrase to protect the key:') %]<br>
 <input type="password" name="passphrase"><br>
-<input type="submit" name="encrypted" value="[% l('crypt the poll') %]">
+<input type="submit" name="encrypted" value="[% l('encrypt the poll') %]">
 </form>
 [% END %]
Index: /trunk/root/templates/admin/validate.tt
===================================================================
--- /trunk/root/templates/admin/validate.tt	(revision 322)
+++ /trunk/root/templates/admin/validate.tt	(revision 323)
@@ -10,5 +10,5 @@
 <select name="ballotvalue">
 <option value="s:needvalid"[% " selected" IF c.req.param('ballotvalue') ==
-'s:needvalid' %]>[% l('needing validation') %]</option>
+'s:needvalid' %]>[% l('need validation') %]</option>
 <option value="s:invalid"[% " selected" IF c.req.param('ballotvalue') ==
 's:invalid' %]>[% l('invalid') %]</option>
@@ -54,5 +54,5 @@
 '0' %]>[% l('is valid') %]<br>
 <input type="radio" name="[% bid %]" value="invalid"[% " checked" IF invalid ==
-'1' %]>[% l('is not valid') %]<br>
+'1' %]>[% l('isn\'t valid') %]<br>
 </td>
 </tr>
@@ -80,5 +80,5 @@
 <p>[% l('map ballot value') %]</p>
 <table border="1">
-<tr><th>[% l('input value') %]</th><th>[% l('must be see as') %]</th></tr>
+<tr><th>[% l('input value') %]</th><th>[% l('must be seen as') %]</th></tr>
 [% END %]
 <tr>
Index: /trunk/root/templates/admin/voters.tt
===================================================================
--- /trunk/root/templates/admin/voters.tt	(revision 322)
+++ /trunk/root/templates/admin/voters.tt	(revision 323)
@@ -6,8 +6,8 @@
 [% IF poll.status() != 'AFTER' %]
 <div style="float: left; width: 30%;" class="box">
-<p>[% l('add a voting') %]</p>
+<p>[% l('add a vote') %]</p>
 <form action="[% c.uri_for(poll.uid, 'voters') %]" method="POST">
 [% l('Name:') _ ' ' %]<input type="text" name="id"><br>
-[% l('Mail:') _ ' ' %]<input type="text" name="mail"><br>
+[% l('Email address:') _ ' ' %]<input type="text" name="mail"><br>
 <input type="submit" value="[% l('Add') %]">
 </form>
@@ -21,5 +21,5 @@
 
 [% IF poll.status == 'BEFORE' %]
-<input type="checkbox" name="delete">[% l('delete voters list') %]<br>
+<input type="checkbox" name="delete">[% l('delete the list of voters') %]<br>
 [% END %]
 <input type="submit" value="[% l('Add') %]">
@@ -28,5 +28,5 @@
 <p>[% l('Send password to voters') %]</p>
 <form action="[% c.uri_for(poll.uid, 'voters') %]" method="POST">
-[% l('Mail language') %]: [% INCLUDE 'includes/locale_select.tt' %]<br>
+[% l('Email language') %]: [% INCLUDE 'includes/locale_select.tt' %]<br>
 <input type="submit" name="mailpasswd" value="[% l('send password') %]">
 </form>
@@ -38,5 +38,5 @@
 
 [% IF NOT poll.voting_count %]
-<p class="alert">[% l('No subscribed voter') %]</p>
+<p class="alert">[% l('No subscribed voters') %]</p>
 [% ELSE %]
 
Index: /trunk/root/templates/admin/votersimport.tt
===================================================================
--- /trunk/root/templates/admin/votersimport.tt	(revision 322)
+++ /trunk/root/templates/admin/votersimport.tt	(revision 323)
@@ -46,5 +46,5 @@
 [% IF import_handle.can_authenticate %]
 [% l('Use external authentication') %]<input type="checkbox" name="ext_auth"><br>
-[% l('Enter here a comment to explain the password to use') %]<br>
+[% l('Enter a hint for the password here') %]<br>
 <textarea rows="3" cols="50" name="desc"></textarea><br>
 [% END %]
Index: /trunk/root/templates/ballot/closed.tt
===================================================================
--- /trunk/root/templates/ballot/closed.tt	(revision 322)
+++ /trunk/root/templates/ballot/closed.tt	(revision 323)
@@ -8,5 +8,5 @@
 Ce Vote n'est pas encore ouvert
 [% ELSIF poll.status == 'AFTER' %]
-[% l('This poll is over, results are available') %]
+[% l('This poll is over, results are now available') %]
 <a href="[% c.uri_for('/vote', poll.uid) %]">[% l('here') %]</a>.
 [% END %]
Index: /trunk/root/templates/ballot/default.tt
===================================================================
--- /trunk/root/templates/ballot/default.tt	(revision 322)
+++ /trunk/root/templates/ballot/default.tt	(revision 323)
@@ -40,5 +40,5 @@
 <hr>
 
-<p class="warning">[% l('Your vote will be definitive after validation') %]</p>
+<p class="warning">[% l('Your vote will be final after validation') %]</p>
 <p><input type="submit" name="confirm" value="[% l('Valid') %]">
 <input type="submit" name="Modify" value="[% l('modify my vote') %]"></p>
@@ -53,5 +53,5 @@
 [% INCLUDE infoip %]
 
-<p>[% l('Your vote will be registered only after confirm') %]</p>
+<p>[% l('Your vote will be registered only after validation') %]</p>
 [% END %]
 </div>
Index: /trunk/root/templates/ballot/done.tt
===================================================================
--- /trunk/root/templates/ballot/done.tt	(revision 322)
+++ /trunk/root/templates/ballot/done.tt	(revision 323)
@@ -5,5 +5,5 @@
 
 <div id="ballot" class="page_box">
-<p>[% l('You just submitted your ballot') %]
+<p>[% l('You\'ve just submitted your ballot') %]
 [% IF NOT poll.info.no_ballot_id_voting %]
 , [% l('your ballot id is:') _ ' ' %]<b>[% ballotid %]</b>
Index: /trunk/root/templates/ballot/index.tt
===================================================================
--- /trunk/root/templates/ballot/index.tt	(revision 322)
+++ /trunk/root/templates/ballot/index.tt	(revision 323)
@@ -13,4 +13,4 @@
 
 [% ELSE %]
-Pas de vote en cours
+[% l('No polls currently running') %]
 [% END %]
Index: /trunk/root/templates/ballot/signed.tt
===================================================================
--- /trunk/root/templates/ballot/signed.tt	(revision 322)
+++ /trunk/root/templates/ballot/signed.tt	(revision 323)
@@ -3,5 +3,5 @@
 
 <div id="vote_done">
-<p>[% mail | html %][% l('already participated to this poll the [_1]', signed_date) | html %]</p>
+<p>[% mail | html %][% l('already participated in this poll the [_1]', signed_date) | html %]</p>
 <p>[% l('Results will be available') _ ' ' %]
 <a href="[% c.uri_for('/vote', c.model('Vote').poll(voteid).uid) %]">[% l('here') %]</a>.</p>
Index: /trunk/root/templates/default.tt
===================================================================
--- /trunk/root/templates/default.tt	(revision 322)
+++ /trunk/root/templates/default.tt	(revision 323)
@@ -5,8 +5,8 @@
 <form action="[% c.uri_for %]" method="POST">
 [% IF novoting %]
-<p class="warning">[% l('You own no poll') %] [% novoting | html %].</p>
+<p class="warning">[% l('You don\'t own any polls') %] [% novoting | html %].</p>
 [% END %]
 [% IF sendvoting %]
-[% l('A mail has been sent to [_1]', sendvoting) %]
+[% l('An email has been sent to [_1]', sendvoting) %]
 [% END %]
 
Index: /trunk/root/templates/importv/ldap.tt
===================================================================
--- /trunk/root/templates/importv/ldap.tt	(revision 322)
+++ /trunk/root/templates/importv/ldap.tt	(revision 323)
@@ -5,5 +5,5 @@
 [% l('UID attributes:') | html %]
 <input type="text" name="uid" value="[% c.req.param('uid') | html %]"><br>
-[% l('Mail attributes:') | html %]
+[% l('Email attributes:') | html %]
 <input type="text" name="mail" value="[% c.req.param('mail') | html %]"><br>
 [% l('Display Name attributes:') | html %]
Index: /trunk/root/templates/includes/poll.tt
===================================================================
--- /trunk/root/templates/includes/poll.tt	(revision 322)
+++ /trunk/root/templates/includes/poll.tt	(revision 323)
@@ -20,8 +20,8 @@
 [% END %]
 [% l('Participated') _ ' ' %] [% poll.signing_count %] / [% poll.voting_count %]<br>
-[% l('Ballot:') _ ' ' %] [% poll.ballot_count %]
+[% l('Ballots:') _ ' ' %] [% poll.ballot_count %]
 [% IF poll.signing_count != poll.ballot_count %]
 <p class="alert">
-[% l('The number of ballot and people having voted differ') %]
+[% l('The number of ballots doesn\'t match the number of voters') %]
 </p>
 [% END %]
@@ -30,5 +30,5 @@
 [% IF loop.first %]
 <div style="float: right; width: 20%; top: 0px;" class="box">
-<p>[% l('Ballot:') %]</p>
+<p>[% l('Ballots:') %]</p>
 <ol style="padding-left:15px; margin:5px;">
 [% END %]
Index: /trunk/root/templates/includes/poll_results.tt
===================================================================
--- /trunk/root/templates/includes/poll_results.tt	(revision 322)
+++ /trunk/root/templates/includes/poll_results.tt	(revision 323)
@@ -6,14 +6,14 @@
 <div id="results" class="box">
 <div style="float: right">
-<p><a href="[% c.uri_for('/vote', poll.uid, 'results.pdf') %]">RÃ©sultat en PDF</a></p>
-<p><a href="[% c.uri_for('/vote', poll.uid, 'report.pdf') %]">Rapport en PDF</a></p>
+<p><a href="[% c.uri_for('/vote', poll.uid, 'results.pdf') %]">Result in PDF</a></p>
+<p><a href="[% c.uri_for('/vote', poll.uid, 'report.pdf') %]">Report in PDF</a></p>
 </div>
 [% IF poll.list_ballot_needvalid.size %]
 <p>[% l('Temporary results') %]</p>
-<p class="alert">[% l('Poll administrator must validate some ballot') %]</p>
+<p class="alert">[% l('Poll administrator must validate some ballots') %]</p>
 [% ELSE %]
 <p>[% l('Results:') %]</p>
 [% END %]
-<p>[% l('Number of choice to retain:') _ ' ' %][% poll.info('choice_count') %]</p>
+<p>[% l('Number of choices to retain:') _ ' ' %][% poll.info('choice_count') %]</p>
 
 <table border="1">
@@ -28,10 +28,10 @@
     <td></td></tr>
 <tr>
-    <td>[% l('Number of empty ballot') %]</td>
+    <td>[% l('Number of empty ballots') %]</td>
     <td>[% poll.empty_ballot_count %]</td>
     <td>[% poll.empty_ballot_count / poll.ballot_count * 100 | format('%.2f %%') IF poll.ballot_count %]</td>
 </tr>
 <tr>
-    <td>[% l('Number of nul ballot') %]</td>
+    <td>[% l('Number of null ballots') %]</td>
     <td>[% poll.invalid_ballot_count %]</td>
     <td>[% poll.invalid_ballot_count / poll.ballots_count * 100 | format('%.2f %%') IF poll.ballots_count %]</td>
@@ -45,5 +45,5 @@
 [% IF loop.first %]
 <div id="ballot_list" class="box">
-<p>[% l('Ballot list:') %]</p>
+<p>[% l('Ballots list:') %]</p>
 <table border="1">
 <tr><th>[% l('number') %]</th><th>[% l('Id') %]</th>
@@ -74,5 +74,5 @@
 [% invalid = '#' _ poll.ballot(id).info.invalid %]
 [% IF invalid == '#1' %]
-<span class="alert">[% l('invalided') %]</span>
+<span class="alert">[% l('invalid') %]</span>
 [% ELSIF invalid  == '#' %]
 <i>[% l('must be validated') %]</i>
@@ -88,5 +88,5 @@
 [% ELSE %][% # can show result %]
 <div class="page_box">
-<p>[% l('Results are not yet published') %]<p>
+<p>[% l('Results haven\'t been published yet') %]<p>
 </div>
 [% END %]
Index: /trunk/root/templates/includes/signing_list.tt
===================================================================
--- /trunk/root/templates/includes/signing_list.tt	(revision 322)
+++ /trunk/root/templates/includes/signing_list.tt	(revision 323)
@@ -9,5 +9,5 @@
 [% IF loop.first %]
 <div id="voting_list" class="box">
-<p>[% l('Voting list') %]</p>
+<p>[% l('List of voters') %]</p>
 <table border="1">
 <tr><th>[% l('Number') %]</th><th>[% l('voting') %]</th>
Index: /trunk/root/templates/newpoll/index.tt
===================================================================
--- /trunk/root/templates/newpoll/index.tt	(revision 322)
+++ /trunk/root/templates/newpoll/index.tt	(revision 323)
@@ -7,5 +7,5 @@
 <table border="0">
 <tbody align="center">
-<tr><th>[% l('Your mail:') %]</th><td>
+<tr><th>[% l('Your email address:') %]</th><td>
   <input type="text" name="mail" value="[% c.req.param('mail') | html %]" tabindex="1" size="45" maxlength="150">
 </td></tr>
Index: /trunk/root/templates/newpoll/norequest.tt
===================================================================
--- /trunk/root/templates/newpoll/norequest.tt	(revision 322)
+++ /trunk/root/templates/newpoll/norequest.tt	(revision 323)
@@ -4,5 +4,5 @@
 <p class="alert">[% l('No such request found') %]</p>
 
-[% l('Enter the request ID received by mail') %]
+[% l('Enter the request ID you received by email') %]
 <form action="[% c.uri_for('/newpoll', 'confirm') %]" method="POST">
 <input type="text" name="id"><br>
Index: /trunk/root/templates/newpoll/request.tt
===================================================================
--- /trunk/root/templates/newpoll/request.tt	(revision 322)
+++ /trunk/root/templates/newpoll/request.tt	(revision 323)
@@ -2,5 +2,5 @@
 <div id="poll_request" class="box">
 <p>
-[% l('A mail has been sent to [_1], follow the procedure to complete poll
+[% l('An email has been sent to [_1], follow the instructions to complete poll
 creation', c.req.param('mail')) %]</p>
 
Index: /trunk/root/templates/pollinc/binary/ballot.tt
===================================================================
--- /trunk/root/templates/pollinc/binary/ballot.tt	(revision 322)
+++ /trunk/root/templates/pollinc/binary/ballot.tt	(revision 323)
@@ -7,5 +7,5 @@
 
 [% FOREACH key = poll.choices() %]
-[% "<p>Candidats:</p>" IF loop.first %]
+[% "<p>Candidates:</p>" IF loop.first %]
 [% choice = poll.choice(key) %]
 <input type="checkbox" name="sbal" value="[% key %]"[% " checked" IF sbal.$key %]>
@@ -17,5 +17,5 @@
 [% WHILE count < (poll.info('elected_choice') || 0) %]
 [% IF count == 0 %]
-<p>[% l('From voting list') %]</p>
+<p>[% l('From the list of voters') %]</p>
 [% END %]
 [% FOREACH vkey = poll.voting_keys %]
@@ -31,5 +31,5 @@
 [% END %]
 [% ELSE %]
-<p>[% l('No voter to show') %]</p>
+<p>[% l('No voters to show') %]</p>
 [% END %]
 
Index: /trunk/root/templates/pollinc/binary/ballot_settings.tt
===================================================================
--- /trunk/root/templates/pollinc/binary/ballot_settings.tt	(revision 322)
+++ /trunk/root/templates/pollinc/binary/ballot_settings.tt	(revision 323)
@@ -4,11 +4,11 @@
 <table border=1>
 <tr>
-<td>[% l('Number of possible choice:') %]</td>
+<td>[% l('Number of possible choices:') %]</td>
 <td><input type="text" size="3" name="choice_count" value="[% c.req.param('choice_count') || poll.info('choice_count') | html %]"></td>
 </tr>
 
 <tr>
-<td>[% l('Number of people to elect') %]<br>
-    ([% l('if different of number of choice') %])
+<td>[% l('Possible number of people to elect') %]<br>
+    ([% l('if you want to vote for more than one person') %])
 </td>
 <td><input type="text" size="3" name="elected_count" value="[% c.req.param('elected_count') || poll.raw_info('elected_count') | html %]"></td>
@@ -21,5 +21,5 @@
 
 <tr>
-<td>[% l('Number of people to elect, taken from voting list') %]</td>
+<td>[% l('Number of people to elect, taken from the list of voters') %]</td>
 <td><input type="text" size="3" name="elected_choice" value="[% c.req.param('elected_choice') || poll.info('elected_choice') || 0 | html %]"></td>
 </tr>
Index: /trunk/root/templates/pollinc/binary/results.tt
===================================================================
--- /trunk/root/templates/pollinc/binary/results.tt	(revision 322)
+++ /trunk/root/templates/pollinc/binary/results.tt	(revision 323)
@@ -14,5 +14,5 @@
 <table border="1">
 <tr><th>Score</th><th>[% l('Line nÂ°') %]</th><th>[% l('choice') %]</th><th>[%
-l('Number of voice') %]</th><th>[% l('%') %]</th><th></th></tr>
+l('Number of votes') %]</th><th>[% l('%') %]</th><th></th></tr>
 [% END %]
 
Index: /trunk/root/templates/vote/default.tt
===================================================================
--- /trunk/root/templates/vote/default.tt	(revision 322)
+++ /trunk/root/templates/vote/default.tt	(revision 323)
@@ -14,5 +14,5 @@
 [% CASE 'BEFORE' %]
 <div class="page_box">
-<p>[% l('This poll is not opened yet') %]</p>
+<p>[% l('This poll is not open for voting yet') %]</p>
 </div>
 [% INCLUDE 'includes/signing_list.tt' %]
