Changeset 321

Timestamp:

10/02/10 01:35:17 (14 years ago)

Author:

nanardon

Message:

• more translations

Location:

trunk

Files:

• MANIFEST (modified) (4 diffs)
• lib/Epoll/I18N/fr.po (modified) (37 diffs)
• lib/Epoll/I18N/messages.pot (modified) (31 diffs)
• root/mail/ballot_confirm.tt (modified) (2 diffs)
• root/mail/poll_reminder_voting.tt (modified) (3 diffs)
• root/mail/poll_request.tt (modified) (1 diff)
• root/mail/voting_passwd.tt (modified) (2 diffs)
• root/templates/admin/voters.tt (modified) (1 diff)
• root/templates/includes/header.tt (modified) (1 diff)
• root/templates/includes/locale_select.tt (added)
• root/templates/vote/default.tt (modified) (1 diff)

trunk/MANIFEST

@@ -18 +18 @@
 lib/Epoll/DB/ImportV/Csv.pm
 lib/Epoll/DB/ImportV/Dummy.pm
+lib/Epoll/DB/ImportV/Ldap.pm
 lib/Epoll/DB/ImportV.pm
+lib/Epoll/DB/Poll/BSubmit.pm
 lib/Epoll/DB/Poll/Bdata.pm
+lib/Epoll/DB/Poll/Type/Binary.pm
 lib/Epoll/DB/Poll.pm
 lib/Epoll/DB/Voting.pm
@@ -152 +155 @@
 root/templates/importv/csv.tt
 root/templates/importv/dummy.tt
+root/templates/importv/ldap.tt
 root/templates/includes/admin_menu.tt
 root/templates/includes/ballot_form.tt
+root/templates/includes/ballot_settings.tt
 root/templates/includes/footer.tt
 root/templates/includes/header.tt
@@ -165 +170 @@
 root/templates/newpoll/norequest.tt
 root/templates/newpoll/request.tt
+root/templates/pollinc/binary/ballot.tt
+root/templates/pollinc/binary/ballot_settings.tt
+root/templates/pollinc/binary/results.tt
 root/templates/vote/default.tt
 script/epoll_cgi.pl
@@ -179 +187 @@
 t/15ImportV.t
 t/20Epoll_Web.t
-t/controller_Admin-Voters.t
 t/controller_Admin.t
 t/controller_Ajax.t

trunk/lib/Epoll/I18N/fr.po

@@ -11 +11 @@
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -18 +19 @@
 msgid "\"S\", \"M\", \"T\", \"W\", \"T\", \"F\", \"S\""
 msgstr "\"D\", \"L\", \"M\", \"M\", \"J\", \"V\", \"S\""
+
+#: root/templates/pollinc/binary/results.tt:16
+msgid "%"
+msgstr ""
 
 #. (poll.list_ballot_need_dec.size)
@@ -46 +51 @@
 msgstr ""
 "Un mail a été envoyé à %1, suivez la procédure pour finir\n"
-"la création du sondage"
+"la création du vote"
+
+#: root/mail/voting_passwd.tt:18
+#, fuzzy
+msgid "About this poll"
+msgstr "Effacer ce vote"
+
+#: root/templates/pollinc/binary/results.tt:10
+msgid "Absolute Majority"
+msgstr ""
 
 #: root/templates/admin/login.tt:6
@@ -52 +66 @@
 msgstr "Accéder à l'administration du vote:"
 
-#: root/templates/admin/ballot.tt:53 root/templates/admin/voters.tt:12
+#: root/templates/admin/ballot.tt:26 root/templates/admin/voters.tt:12
 #: root/templates/admin/voters.tt:25
 msgid "Add"
 msgstr "Ajouter"
 
-#: root/templates/admin/ballot.tt:51
+#: root/templates/admin/ballot.tt:24
 msgid "Add a choice"
 msgstr "Ajouter un choix"
@@ -69 +83 @@
 msgstr "Avril"
 
+#: root/mail/voting_passwd.tt:7
+msgid "At URL"
+msgstr "A l'URL"
+
 #: root/templates/admin/date.tt:38
 msgid "Aug"
@@ -95 +113 @@
 msgstr "bulletins contenant:"
 
+#: root/templates/importv/ldap.tt:2
+msgid "Base DN:"
+msgstr ""
+
 #: root/templates/admin/votersimport.tt:13
 #: root/templates/admin/votersimport.tt:14
@@ -112 +134 @@
 msgstr "Confirmez votre vote"
 
-#: root/templates/includes/header.tt:40 root/templates/newpoll/index.tt:3
+#: root/templates/includes/header.tt:36 root/templates/newpoll/index.tt:3
 msgid "Create a new poll"
 msgstr "Créer un nouveau vote"
@@ -160 +182 @@
 msgstr "Détruire"
 
+#: root/templates/importv/ldap.tt:9
+msgid "Display Name attributes:"
+msgstr ""
+
 #: root/templates/admin/includes/poll_settings.tt:43
 msgid "Do not crypt ballot"
@@ -181 +207 @@
 msgstr ""
 
-#: root/templates/includes/ballot_form.tt:59
+#: root/templates/pollinc/binary/results.tt:11
+#, fuzzy
+msgid "Elected"
+msgstr "Effacer"
+
+#: root/templates/includes/ballot_form.tt:22
 msgid "Empty ballot"
 msgstr "Bulletin vide"
@@ -221 +252 @@
 msgstr "Février"
 
-#: root/templates/includes/ballot_form.tt:49
+#: root/templates/pollinc/binary/ballot.tt:39
 msgid "Free choice"
 msgstr "Choix libre"
@@ -229 +260 @@
 msgstr "Vendredi"
 
-#: root/templates/includes/ballot_form.tt:28
+#: root/templates/pollinc/binary/ballot.tt:19
 msgid "From voting list"
 msgstr "Depuis la liste des votants"
@@ -278 +309 @@
 msgstr "Juin"
 
+#: 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"
+
 #: root/templates/admin/votersimport.tt:16
 #: root/templates/admin/votersimport.tt:17
@@ -283 +318 @@
 msgstr ""
 
+#: root/templates/pollinc/binary/results.tt:9
+msgid "Legend:"
+msgstr ""
+
+#: root/templates/pollinc/binary/results.tt:15
+msgid "Line n°"
+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
@@ -320 +371 @@
 msgstr "Nom:"
 
-#: root/templates/admin/ballot.tt:38
+#: root/templates/admin/ballot.tt:11
 msgid "No choice are configured"
 msgstr "Aucun choix n'est configuré"
 
-#: root/templates/admin/voters.tt:39
+#: root/templates/pollinc/binary/results.tt:42
+#, fuzzy
+msgid "No results"
+msgstr "RÚglement:"
+
+#: root/templates/admin/voters.tt:40
 msgid "No subscribed voter"
 msgstr "Pas de votants inscrits"
@@ -332 +388 @@
 msgstr "Pas de requête trouvée"
 
-#: root/templates/includes/ballot_form.tt:42
+#: root/templates/pollinc/binary/ballot.tt:33
 msgid "No voter to show"
 msgstr "Pas de votants"
+
+#: root/templates/pollinc/binary/results.tt:12
+#, fuzzy
+msgid "Not elected"
+msgstr "pour %1 à élire"
 
 #: root/templates/admin/date.tt:41
@@ -358 +419 @@
 msgstr "Nombre de personnes à élire"
 
-#: root/templates/admin/ballot.tt:22
+#: root/templates/pollinc/binary/ballot_settings.tt:18
 msgid "Number of free input fields:"
 msgstr "Nombre de champ de saisie libre:"
@@ -367 +428 @@
 msgstr "Nombre de personnes à élire"
 
-#: root/templates/admin/ballot.tt:15
+#: root/templates/pollinc/binary/ballot_settings.tt:11
 msgid "Number of people to elect"
 msgstr "Nombre de personnes à élire"
 
-#: root/templates/admin/ballot.tt:27
+#: root/templates/pollinc/binary/ballot_settings.tt:23
 msgid "Number of people to elect, taken from voting list"
 msgstr "Nombre de personnes à élire depuis la liste électorale"
 
-#: root/templates/admin/ballot.tt:10
+#: root/templates/pollinc/binary/ballot_settings.tt:6
 msgid "Number of possible choice:"
+msgstr "Nombre de choix possibles:"
+
+#: root/templates/pollinc/binary/results.tt:15
+#, fuzzy
+msgid "Number of voice"
 msgstr "Nombre de choix possibles:"
 
@@ -448 +514 @@
 msgstr "Début du vote:"
 
-#: root/templates/admin/ballot.tt:58
+#: root/templates/admin/ballot.tt:31
 msgid "Preview of ballot"
 msgstr "Prévisualisation du bulletin"
+
+#: root/mail/ballot_confirm.tt:16 root/mail/voting_passwd.tt:30
+msgid "Regards"
+msgstr "Cordialement"
 
 #: root/templates/includes/poll_results.tt:90
@@ -460 +530 @@
 msgstr "Les résultats seront disponibles"
 
+#: root/mail/ballot_confirm.tt:13
+#, fuzzy
+msgid "Results will be availlable here"
+msgstr "Les résultats seront disponibles"
+
 #: root/templates/includes/poll_results.tt:15
 #, fuzzy
@@ -472 +547 @@
 msgid "Saturday"
 msgstr "Samedi"
+
+#: root/templates/pollinc/binary/results.tt:7
+msgid "Score:"
+msgstr "Score:"
+
+#: root/mail/poll_request.tt:11
+msgid "See you soon !"
+msgstr "A bientot !"
 
 #: root/templates/admin/voters.tt:28
@@ -547 +630 @@
 msgstr "Jeudi"
 
+#: root/mail/poll_request.tt:8
+msgid "To validate the request please go to"
+msgstr "Pour valider la requête aller ici"
+
 #: root/templates/admin/date.tt:56
 msgid "Today"
@@ -555 +642 @@
 msgstr "Mardi"
 
+#: root/templates/importv/ldap.tt:5
+msgid "UID attributes:"
+msgstr ""
+
+#: root/templates/importv/ldap.tt:1
+msgid "Uri:"
+msgstr ""
+
 #: root/templates/admin/votersimport.tt:47
 msgid "Use external authentication"
@@ -567 +662 @@
 msgstr "Valider"
 
-#: root/templates/includes/ballot_form.tt:55
+#: root/templates/includes/ballot_form.tt:18
 #, fuzzy
 msgid "Vote"
@@ -585 +680 @@
 msgstr "SystÚme de vote en ligne"
 
-#: root/templates/includes/header.tt:39
+#: root/templates/includes/header.tt:35
 msgid "Welcome"
 msgstr "Accueil"
@@ -610 +705 @@
 "(indépendement du bulletin)"
 
+#: root/mail/voting_passwd.tt:2
+#, fuzzy
+msgid "You are invited to participate to 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
 msgid "You can"
@@ -622 +726 @@
 msgstr "Vous pouvez saisir le code de la requête ici"
 
+#: root/mail/ballot_confirm.tt:2
+#, fuzzy
+msgid "You just particiapted to the poll:"
+msgstr "a déjà participé au vote le %1"
+
 #: root/templates/ballot/done.tt:7
 msgid "You just submitted your ballot"
@@ -630 +739 @@
 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/ballot_confirm.tt:9
+msgid "Your ballot is identified by ID"
+msgstr "Votre bulletin a l'identifiant:"
+
+#: root/mail/voting_passwd.tt:8
+#, fuzzy
+msgid "Your login is"
+msgstr "L'identifiant de vote bulletin est:"
+
 #: root/templates/newpoll/index.tt:9
 msgid "Your mail:"
 msgstr "Votre mail:"
 
-#: root/templates/includes/header.tt:43
+#: root/mail/voting_passwd.tt:9
+#, fuzzy
+msgid "Your password is"
+msgstr "Votre mot de passe est"
+
+#: root/templates/includes/header.tt:39
 msgid "Your poll:"
 msgstr "Votre vote:"
+
+#: root/mail/poll_request.tt:4
+msgid "Your request ID is"
+msgstr "L'identifiant de votre requête est"
 
 #: root/templates/ballot/default.tt:42
@@ -659 +790 @@
 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
 msgid "ballot containing:"
 msgstr "bulletins contenant:"
 
+#: root/templates/pollinc/binary/results.tt:15
+#, fuzzy
+msgid "choice"
+msgstr "Choix libre"
+
 #: root/templates/includes/poll_results.tt:54
 msgid "comment"
@@ -679 +820 @@
 msgstr "date:"
 
-#: root/templates/admin/ballot.tt:45 root/templates/admin/voters.tt:64
+#: root/templates/admin/ballot.tt:18 root/templates/admin/voters.tt:65
 msgid "delete"
 msgstr "effacer"
@@ -706 +847 @@
 msgstr "ici"
 
-#: root/templates/admin/ballot.tt:16
+#: root/templates/pollinc/binary/ballot_settings.tt:12
 msgid "if different of number of choice"
 msgstr "si différent du nombre de choix"
@@ -763 +904 @@
 #, fuzzy
 msgid "number"
-msgstr "Nombre"
-
-#: root/templates/admin/voters.tt:59
+msgstr "nombre"
+
+#: root/templates/admin/voters.tt:60
 msgid "password sent"
 msgstr "mot de passe envoyé"
@@ -771 +912 @@
 #: root/templates/admin/validate.tt:74
 msgid "publish results"
-msgstr ""
-
-#: root/mail/poll_reminder_voting.tt:26
-msgid "running"
-msgstr ""
-
-#: root/templates/admin/ballot.tt:32
+msgstr "publier les résultats"
+
+#: root/templates/includes/ballot_settings.tt:10
 msgid "save"
 msgstr "enregistrer"
@@ -783 +920 @@
 #: root/templates/admin/votersimport.tt:33
 msgid "search..."
-msgstr ""
+msgstr "chercher..."
 
 #: root/templates/admin/votersimport.tt:20
@@ -790 +927 @@
 msgstr "Effacer"
 
-#: root/templates/admin/voters.tt:30
+#: root/templates/admin/voters.tt:31
 msgid "send password"
 msgstr "envoyer les mots de passe"
@@ -798 +935 @@
 msgstr "émargement"
 
-#: root/mail/poll_reminder_voting.tt:27
-msgid "terminated"
-msgstr ""
-
 #: root/templates/admin/date.tt:122 root/templates/admin/date.tt:131
 msgid "time:"
 msgstr "heure:"
 
-#: root/mail/poll_reminder_voting.tt:25
-msgid "to come"
-msgstr ""
-
 #: root/templates/admin/validate.tt:16
 msgid "valid"
@@ -826 +955 @@
 msgstr "L'identifiant de vote bulletin est:"
 
+#~ msgid "to come"
+#~ msgstr "Ã  venir"
+
 #, fuzzy
 #~ msgid "Ballot Number"
@@ -831 +963 @@
 
 #, fuzzy
-#~ msgid "Elected"
-#~ msgstr "Effacer"
-
-#, fuzzy
-#~ msgid "Number of voice"
-#~ msgstr "Nombre de choix possibles:"
-
-#, fuzzy
 #~ msgid "Number of voices"
 #~ msgstr "Nombre de choix possibles:"
 
-#, fuzzy
-#~ msgid "choice"
-#~ msgstr "Choix libre"
-
 #~ msgid "From a csv file"
 #~ msgstr "Depuis un fichier CSV"

trunk/lib/Epoll/I18N/messages.pot

@@ -20 +20 @@
 msgstr ""
 
+#: root/templates/pollinc/binary/results.tt:16
+msgid "%"
+msgstr ""
+
 #. (poll.list_ballot_need_dec.size)
 #: root/templates/admin/includes/ballot_decrypt.tt:5
@@ -47 +51 @@
 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:53 root/templates/admin/voters.tt:12 root/templates/admin/voters.tt:25
+#: 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:51
+#: root/templates/admin/ballot.tt:24
 msgid "Add a choice"
 msgstr ""
@@ -67 +79 @@
 msgstr ""
 
+#: root/mail/voting_passwd.tt:7
+msgid "At URL"
+msgstr ""
+
 #: root/templates/admin/date.tt:38
 msgid "Aug"
@@ -91 +107 @@
 msgstr ""
 
+#: root/templates/importv/ldap.tt:2
+msgid "Base DN:"
+msgstr ""
+
 #: root/templates/admin/votersimport.tt:13 root/templates/admin/votersimport.tt:14
 msgid "CSV file"
@@ -107 +127 @@
 msgstr ""
 
-#: root/templates/includes/header.tt:40 root/templates/newpoll/index.tt:3
+#: root/templates/includes/header.tt:36 root/templates/newpoll/index.tt:3
 msgid "Create a new poll"
 msgstr ""
@@ -155 +175 @@
 msgstr ""
 
+#: root/templates/importv/ldap.tt:9
+msgid "Display Name attributes:"
+msgstr ""
+
 #: root/templates/admin/includes/poll_settings.tt:43
 msgid "Do not crypt ballot"
@@ -175 +199 @@
 msgstr ""
 
-#: root/templates/includes/ballot_form.tt:59
+#: root/templates/pollinc/binary/results.tt:11
+msgid "Elected"
+msgstr ""
+
+#: root/templates/includes/ballot_form.tt:22
 msgid "Empty ballot"
 msgstr ""
@@ -215 +243 @@
 msgstr ""
 
-#: root/templates/includes/ballot_form.tt:49
+#: root/templates/pollinc/binary/ballot.tt:39
 msgid "Free choice"
 msgstr ""
@@ -223 +251 @@
 msgstr ""
 
-#: root/templates/includes/ballot_form.tt:28
+#: root/templates/pollinc/binary/ballot.tt:19
 msgid "From voting list"
 msgstr ""
@@ -269 +297 @@
 msgstr ""
 
+#: root/mail/voting_passwd.tt:16
+msgid "Keep this information preciously, they won't be retransmit again."
+msgstr ""
+
 #: root/templates/admin/votersimport.tt:16 root/templates/admin/votersimport.tt:17
 msgid "LDAP"
 msgstr ""
 
+#: root/templates/pollinc/binary/results.tt:9
+msgid "Legend:"
+msgstr ""
+
+#: root/templates/pollinc/binary/results.tt:15
+msgid "Line n°"
+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
 msgid "Mail:"
@@ -309 +357 @@
 msgstr ""
 
-#: root/templates/admin/ballot.tt:38
+#: root/templates/admin/ballot.tt:11
 msgid "No choice are configured"
 msgstr ""
 
-#: root/templates/admin/voters.tt:39
+#: root/templates/pollinc/binary/results.tt:42
+msgid "No results"
+msgstr ""
+
+#: root/templates/admin/voters.tt:40
 msgid "No subscribed voter"
 msgstr ""
@@ -321 +373 @@
 msgstr ""
 
-#: root/templates/includes/ballot_form.tt:42
+#: root/templates/pollinc/binary/ballot.tt:33
 msgid "No voter to show"
+msgstr ""
+
+#: root/templates/pollinc/binary/results.tt:12
+msgid "Not elected"
 msgstr ""
 
@@ -345 +401 @@
 msgstr ""
 
-#: root/templates/admin/ballot.tt:22
+#: root/templates/pollinc/binary/ballot_settings.tt:18
 msgid "Number of free input fields:"
 msgstr ""
@@ -353 +409 @@
 msgstr ""
 
-#: root/templates/admin/ballot.tt:15
+#: root/templates/pollinc/binary/ballot_settings.tt:11
 msgid "Number of people to elect"
 msgstr ""
 
-#: root/templates/admin/ballot.tt:27
+#: root/templates/pollinc/binary/ballot_settings.tt:23
 msgid "Number of people to elect, taken from voting list"
 msgstr ""
 
-#: root/templates/admin/ballot.tt:10
+#: root/templates/pollinc/binary/ballot_settings.tt:6
 msgid "Number of possible choice:"
+msgstr ""
+
+#: root/templates/pollinc/binary/results.tt:15
+msgid "Number of voice"
 msgstr ""
 
@@ -432 +492 @@
 msgstr ""
 
-#: root/templates/admin/ballot.tt:58
+#: root/templates/admin/ballot.tt:31
 msgid "Preview of ballot"
+msgstr ""
+
+#: root/mail/ballot_confirm.tt:16 root/mail/voting_passwd.tt:30
+msgid "Regards"
 msgstr ""
 
@@ -444 +508 @@
 msgstr ""
 
+#: root/mail/ballot_confirm.tt:13
+msgid "Results will be availlable here"
+msgstr ""
+
 #: root/templates/includes/poll_results.tt:15
 msgid "Results:"
@@ -454 +522 @@
 #: root/templates/admin/date.tt:50
 msgid "Saturday"
+msgstr ""
+
+#: root/templates/pollinc/binary/results.tt:7
+msgid "Score:"
+msgstr ""
+
+#: root/mail/poll_request.tt:11
+msgid "See you soon !"
 msgstr ""
 
@@ -520 +596 @@
 msgstr ""
 
+#: root/mail/poll_request.tt:8
+msgid "To validate the request please go to"
+msgstr ""
+
 #: root/templates/admin/date.tt:56
 msgid "Today"
@@ -528 +608 @@
 msgstr ""
 
+#: root/templates/importv/ldap.tt:5
+msgid "UID attributes:"
+msgstr ""
+
+#: root/templates/importv/ldap.tt:1
+msgid "Uri:"
+msgstr ""
+
 #: root/templates/admin/votersimport.tt:47
 msgid "Use external authentication"
@@ -540 +628 @@
 msgstr ""
 
-#: root/templates/includes/ballot_form.tt:55
+#: root/templates/includes/ballot_form.tt:18
 msgid "Vote"
 msgstr ""
@@ -556 +644 @@
 msgstr ""
 
-#: root/templates/includes/header.tt:39
+#: root/templates/includes/header.tt:35
 msgid "Welcome"
 msgstr ""
@@ -579 +667 @@
 msgstr ""
 
+#: 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"
+msgstr ""
+
 #: root/templates/includes/poll_running.tt:4
 msgid "You can"
@@ -591 +687 @@
 msgstr ""
 
+#: root/mail/ballot_confirm.tt:2
+msgid "You just particiapted to the poll:"
+msgstr ""
+
 #: root/templates/ballot/done.tt:7
 msgid "You just submitted your ballot"
@@ -599 +699 @@
 msgstr ""
 
+#: root/mail/voting_passwd.tt:12
+msgid "You will be able to submit your choice between"
+msgstr ""
+
+#: root/mail/ballot_confirm.tt:9
+msgid "Your ballot is identified by ID"
+msgstr ""
+
+#: root/mail/voting_passwd.tt:8
+msgid "Your login is"
+msgstr ""
+
 #: root/templates/newpoll/index.tt:9
 msgid "Your mail:"
 msgstr ""
 
-#: root/templates/includes/header.tt:43
+#: root/mail/voting_passwd.tt:9
+msgid "Your password is"
+msgstr ""
+
+#: root/templates/includes/header.tt:39
 msgid "Your poll:"
+msgstr ""
+
+#: root/mail/poll_request.tt:4
+msgid "Your request ID is"
 msgstr ""
 
@@ -628 +748 @@
 msgstr ""
 
+#: root/mail/voting_passwd.tt:13
+msgid "and"
+msgstr ""
+
 #: root/templates/admin/validate.tt:19
 msgid "ballot containing:"
 msgstr ""
 
+#: root/templates/pollinc/binary/results.tt:15
+msgid "choice"
+msgstr ""
+
 #: root/templates/includes/poll_results.tt:54
 msgid "comment"
@@ -648 +776 @@
 msgstr ""
 
-#: root/templates/admin/ballot.tt:45 root/templates/admin/voters.tt:64
+#: root/templates/admin/ballot.tt:18 root/templates/admin/voters.tt:65
 msgid "delete"
 msgstr ""
@@ -673 +801 @@
 msgstr ""
 
-#: root/templates/admin/ballot.tt:16
+#: root/templates/pollinc/binary/ballot_settings.tt:12
 msgid "if different of number of choice"
 msgstr ""
@@ -729 +857 @@
 msgstr ""
 
-#: root/templates/admin/voters.tt:59
+#: root/templates/admin/voters.tt:60
 msgid "password sent"
 msgstr ""
@@ -737 +865 @@
 msgstr ""
 
-#: root/mail/poll_reminder_voting.tt:26
-msgid "running"
-msgstr ""
-
-#: root/templates/admin/ballot.tt:32
+#: root/templates/includes/ballot_settings.tt:10
 msgid "save"
 msgstr ""
@@ -753 +877 @@
 msgstr ""
 
-#: root/templates/admin/voters.tt:30
+#: root/templates/admin/voters.tt:31
 msgid "send password"
 msgstr ""
@@ -761 +885 @@
 msgstr ""
 
-#: root/mail/poll_reminder_voting.tt:27
-msgid "terminated"
-msgstr ""
-
 #: root/templates/admin/date.tt:122 root/templates/admin/date.tt:131
 msgid "time:"
 msgstr ""
 
-#: root/mail/poll_reminder_voting.tt:25
-msgid "to come"
-msgstr ""
-
 #: root/templates/admin/validate.tt:16
 msgid "valid"

trunk/root/mail/ballot_confirm.tt

@@ -1 +1 @@
 [% poll = c.model('Vote').poll(voteid) %]
-Vous venez de participer au vote:
+[% l('You just particiapted to the poll:') %]
 
 --------
@@ -7 +7 @@
 
 [% IF NOT poll.info.no_mail_ballot_id %]
-Votre bulletin est idéntifié sous le numéro:
+[% l('Your ballot is identified by ID') %]:
 [% ballotid %]
 [% END %]
 
-Les résultats seront disponibles à cet url:
+[% l('Results will be availlable here') %]:
 [% c.uri_for('/vote', poll.uid) %]
 
-Cordialement.
+[% l('Regards') %].

trunk/root/mail/poll_reminder_voting.tt

@@ -1 @@
-Bonjour,
+[% l('Hello,') %]
 [%- vote = c.model('Vote') -%]
 
-Vous avez demandé un rappel des votes sur lesquels vous êtes inscrits:
+[% l('You ask for a reminder about poll you're participating') %]
 
 
 [%- FOREACH p = polls_voting -%]
 [% IF loop.first %]
-Vous êtes inscrit sur la liste des votant pour les votes
+[% l('You are list as voting on polls') %]:
 [% END %]
 [%- poll = vote.poll(p.poll) -%]
 [% c.uri_for('/', 'ballot', poll.uid) %]
 [% poll.info('label') %]
-Ce vote se termine le [% poll.info.dend %] [% poll.info.hend %].
+[% l('This poll end') %]: [% poll.info.dend %] [% poll.info.hend %].
 
 [% END %]
@@ -18 +18 @@
 [%- FOREACH p = polls_owner -%]
 [% IF loop.first %]
-Vous administrez les votes suivants:
+[% l('You are administrator for these poll') %]:
 [% END %]
 [%- poll = vote.poll(p.id) -%]
@@ -31 +31 @@
 [% END %]
 
-Cordialement.
+[% l('Regards') %].

trunk/root/mail/poll_request.tt

@@ -1 @@
-Vous avez demandez la création d'un nouveau vote:
+[% l('You asked the creation of a new poll') %]:
 [% label %]
 
-L'identifiant de votre requête est:
+[% l('Your request ID is') %]:
 
 [% reqid %]
 
-Pour valider votre demande, veuiller allez visitez la page:
+[% l('To validate the request please go to') %]
 [% c.uri_for('/newpoll', reqid) %]
 
-A bientÃŽt
+[% l('See you soon !') %]

trunk/root/mail/voting_passwd.tt

@@ -1 +1 @@
 [% poll = c.model('Vote').poll(voteid) %]
-Vous êtes convié à participer a ce vote:
+[% l('You are invited to participate to this poll') %]
 
 [% poll.info.label %]
 
 --
-À l'url: [% c.uri_for('/ballot', poll.uid) %]
-Votre identifiant est: [% mail %]
-Votre mot de passe est: [% passwd %]
+[% l('At URL') %]: [% c.uri_for('/ballot', poll.uid) %]
+[% l('Your login is') %]: [% mail %]
+[% l('Your password is') %]: [% passwd %]
 
 [% IF poll.info.dstart && poll.info.dstart -%]
-Vous pourrez voter entre le [% poll.info.dstart %] [% poll.info.hstart %]
-et le [% poll.info.dend %] [% poll.info.hend %]
+[% l('You will be able to submit your choice between') %] [% poll.info.dstart %] [% poll.info.hstart %]
+[% l('and') %] [% poll.info.dend %] [% poll.info.hend %]
 [%- END %]
 
-Conservez précieusement ces identifiants, il ne vous seront pas retransmits.
+[% l('Keep this information preciously, they won\'t be retransmit again.') %]
 
-Information concernant le vote:
+[% l('About this poll') %]:
 
 [% IF poll.info('description') %]
@@ -28 +28 @@
 
 
-Cordialement.
+[% l('Regards') %].

trunk/root/templates/admin/voters.tt

@@ -28 +28 @@
 <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>
 <input type="submit" name="mailpasswd" value="[% l('send password') %]">
 </form>

trunk/root/templates/includes/header.tt

@@ -29 +29 @@
     <p id="now" style="float: right">[% l('Page generated the [_1]', c.model('Vote').dbtime) | html %]</p>
         <form style="float: right">
-            <select name="locale">
-            <option>C</option>
-            [% FOREACH lang = [ 'fr' ] %]
-            <option[% " selected" IF locale == lang %]>[% lang | html %]</option>
-            [% END %]
-        </select><input type="submit">
+        [% INCLUDE 'includes/locale_select.tt' %]
+        <input type="submit">
         </form>
     <p id="menu" style="clear: both;">

trunk/root/templates/vote/default.tt

@@ -2 +2 @@
 [% poll = c.model('Vote').poll(voteid) %]
 
-<div style="text-align: right;"><a href="[% c.uri_for( '/admin', poll.uid ) %]">Administrer</a></div>
+<div style="text-align: right;"><a href="[% c.uri_for( '/admin', poll.uid ) %]">Administrate</a></div>
 
 [% INCLUDE 'includes/poll.tt' %]