Update EN lang to match the FR one

choix_date.php

@@ -187,7 +187,7 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) ||
                 '. $summary .'
             </div>
             <div class="alert alert-info clearfix">
-                <p>' . __('Step 3\\Your poll will be automatically removed '). $config['default_poll_duration'] . ' ' . __('Generic\\days') . ' ' .__('Step 3\\after the last date of your poll:') . '<br />' . __('Step 3\\You can set a closer removal date for it.') .'</p>
+                <p>' . __('Step 3\\Your poll will be automatically removed after') . ' ' . $config['default_poll_duration'] . ' ' . __('Generic\\days') . ' ' .__('Step 3\\after the last date of your poll:') . '<br />' . __('Step 3\\You can set a closer removal date for it.') .'</p>
                 <div class="form-group">
                     <label for="enddate" class="col-sm-5 control-label">'. __('Step 3\\Removal date:') .'</label>
                     <div class="col-sm-6">

locale/en.json

@@ -17,15 +17,37 @@
     "(in the format name@mail.com)": "(in the format name@mail.com)",
     "Description": "Description",
     "Back to the homepage of": "Back to the homepage of",
-    "Error!": "Error!",
-    "dd/mm/yyyy": "dd/mm/yyyy",
-    "%A, den %e. %B %Y": "%A, den %e. %B %Y",
     "days": "days",
-    "months": "months"
+    "months": "months",
+    "Day": "Day",
+    "Time": "Time",
+    "with": "with",
+    "vote": "vote",
+    "votes": "votes",
+    "for": "for",
+    "Yes": "Yes",
+    "Ifneedbe": "Ifneedbe",
+    "No": "No",
+    "Legend:": "Legend:",
+    "Date": "Date",
+    "Classic": "Classic",
+    "Page generated in": "Page generated in",
+    "secondes": "secondes",
+    "Choice": "Choice",
+    "Link": "Link"
+  },
+  "Date" : {
+    "dd/mm/yyyy": "jj/mm/aaaa",
+    "%A, den %e. %B %Y": "%A %e %B %Y",
+    "FULL": "%A, den %e. %B %Y",
+    "SHORT": "%A %e %B %Y",
+    "DAY": "%a %e",
+    "DATE": "%Y-%m-%d",
+    "MONTH_YEAR": "%B %Y"
   },
   "Language selector": {
-    "Change the language": "Change the language",
+    "Select the language": "Select the language",
-    "Select the language": "Select the language"
+    "Change the language": "Change the language"
   },
   "Homepage": {
     "Schedule an event": "Schedule an event",
@@ -56,16 +78,14 @@
     "the development site": "the development site",
     "If you want to install the software for your own use and thus increase your independence, we help you on:": "If you want to install the software for your own use and thus increase your independence, we help you on:"
   },
-  "Poll": {
+  "PollInfo": {
-    "Poll administration": "Poll administration",
+    "Remove the poll": "Remove the poll",
-    "Legend:": "Legend:"
+    "Remove all the comments": "Remove all the comments",
-  },
+    "Remove all the votes": "Remove all the votes",
-  "Jumbotron adminstuds.php (+ studs.php)": {
-    "Back to the poll": "Back to the poll",
     "Print": "Print",
     "Export to CSV": "Export to CSV",
     "Remove the poll": "Remove the poll",
-    "Title of the poll": "Title of the poll",
+    "Title": "Title of the poll",
     "Edit the title": "Edit the title",
     "Save the new title": "Save the new title",
     "Cancel the title edit": "Cancel the title edit",
@@ -82,10 +102,10 @@
     "Cancel the description edit": "Cancel the description edit",
     "Public link of the poll": "Public link of the poll",
     "Admin link of the poll": "Admin link of the poll",
-    "Expiration's date": "Expiration's date",
+    "Expiration date": "Expiration's date",
-    "Edit the expiration's date": "Edit the expiration's date",
+    "Edit the expiration date": "Edit the expiration's date",
-    "Save the new expiration's date": "Save the new expiration's date",
+    "Save the new expiration date": "Save the new expiration's date",
-    "Cancel the expiration's date edit": "Cancel the expiration's date edit",
+    "Cancel the expiration date edit": "Cancel the expiration's date edit",
     "Poll rules": "Poll rules",
     "Edit the poll rules": "Edit the poll rules",
     "Votes and comments are locked": "Votes and comments are locked",
@@ -93,92 +113,91 @@
     "Votes are editable": "Votes are editable",
     "Save the new rules": "Save the new rules",
     "Cancel the rules edit": "Cancel the rules edit",
-    "The name is invalid.": "Le nom n'est pas valide.",
+    "The name is invalid.": "The name is invalid."
-    "Keep votes": "Keep votes",
-    "Remove all votes!": "Remove all votes!",
-    "Keep comments": "Keep comments",
-    "Remove all comments!": "Remove all comments!",
-    "Keep this poll": "Keep this poll"
-  },
-  "Help text adminstuds.php": {
-    "As poll administrator, you can change all the lines of this poll with this button": "As poll administrator, you can change all the lines of this poll with this button",
-    "remove a column or a line with": "remove a column or a line with",
-    "and add a new column with": "and add a new column with",
-    "Finally, you can change the informations of this poll like the title, the comments or your email address.": "Finally, you can change the informations of this poll like the title, the comments or your email address."
-  },
-  "Help text studs.php": {
-    "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.": "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line."
   },
   "Poll results": {
-    "Votes of the poll ": "Votes of the poll ",
+    "Votes of the poll": "Votes of the poll",
-    "Remove the column": "Remove the column",
-    "Add a column": "Add a column",
     "Edit the line:": "Edit the line:",
     "Remove the line:": "Remove the line:",
-    "Yes": "Yes",
+    "Vote no for": "Vote \"no\" for",
-    "Ifneedbe": "Ifneedbe",
+    "Vote yes for": "Vote \"yes\" for",
-    ", ifneedbe": ", ifneedbe",
+    "Vote ifneedbe for": "Vote \"ifneedbe\" for",
-    "No": "No",
-    "Vote \\\u0022no\\\u0022 for ": "Vote \\\u0022no\\\u0022 for ",
-    "Vote \\\u0022yes\\\u0022 for ": "Vote \\\u0022yes\\\u0022 for ",
-    "Vote \\\u0022ifneedbe\\\u0022 for ": "Vote \\\u0022ifneedbe\\\u0022 for ",
     "Save the choices": "Save the choices",
     "Addition": "Addition",
     "Best choice": "Best choices",
     "Best choices": "Best choices",
     "The best choice at this time is:": "The best choice at this time is:",
     "The bests choices at this time are:": "The bests choices at this time are:",
-    "with": "with",
-    "vote": "vote",
-    "votes": "votes",
-    "for": "for",
-    "Remove all the votes": "Remove all the votes",
     "Scroll to the left": "Scroll to the left",
     "Scroll to the right": "Scroll to the right"
   },
   "Comments": {
     "Comments of polled people": "Comments of polled people",
     "Remove the comment": "Remove the comment",
-    "Add a comment in the poll": "Add a comment in the poll",
+    "Add a comment to the poll": "Add a comment to the poll",
     "Your comment": "Your comment",
     "Send the comment": "Send the comment",
     "anonyme": "anonyme",
-    "Remove all the comments": "Remove all the comments"
+    "Comment added": "Comment added"
   },
-  "Add a colum adminstuds.php": {
+  "studs": {
+    "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.": "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.",
+    "POLL_LOCKED_WARNING": "The administration locked this poll. Votes and comments are frozen, it is no longer possible to participate",
+    "The poll is expired, it will be deleted soon.":  "The poll is expired, it will be deleted soon.",
+    "Deletion date:": "Deletion date:"
+  },
+  "adminstuds": {
+    "As poll administrator, you can change all the lines of this poll with this button": "As poll administrator, you can change all the lines of this poll with this button",
+    "remove a column or a line with": "remove a column or a line with",
+    "and add a new column with": "and add a new column with",
+    "Finally, you can change the informations of this poll like the title, the comments or your email address.": "Finally, you can change the informations of this poll like the title, the comments or your email address.",
     "Column's adding": "Column's adding",
     "You can add a new scheduling date to your poll.": "You can add a new scheduling date to your poll.",
-    "If you just want to add a new hour to an existant date, put the same date and choose a new hour.": "If you just want to add a new hour to an existant date, put the same date and choose a new hour."
+    "If you just want to add a new hour to an existant date, put the same date and choose a new hour.": "If you just want to add a new hour to an existant date, put the same date and choose a new hour.",
+    "Confirm removal of the poll": "Confirm removal of your poll",
+    "Delete the poll": "Delete the poll",
+    "Keep the poll": "Keep the poll",
+    "Your poll has been removed!": "Your poll has been removed!",
+    "Poll saved": "Poll saved",
+    "Vote added": "Vote added",
+    "Vote updated": "Vote updated",
+    "Vote deleted": "Vote deleted",
+    "All votes deleted": "All votes deleted",
+    "Back to the poll": "Back to the poll",
+    "Add a column": "Add a column",
+    "Remove the column": "Remove the column",
+    "Choice added": "Choice added",
+    "Confirm removal of all votes of the poll": "Confirm removal of all votes of the poll",
+    "Keep the votes": "Keep the votes",
+    "Remove the votes": "Remove the votes",
+    "Confirm removal of all comments of the poll": "Confirm removal of all comments of the poll",
+    "Keep the comments": "Keep the comments",
+    "Remove the comments": "Remove the comments",
+    "The poll has been deleted": "The poll has been deleted",
+    "Keep votes": "Keep votes",
+    "Keep comments": "Keep comments",
+    "Keep this poll": "Keep this poll"
   },
-  "Remove poll adminstuds.php": {
+  "Step 1": {
-    "Confirm removal of your poll": "Confirm removal of your poll",
-    "Remove this poll!": "Remove this poll!",
-    "Keep this poll!": "Keep this poll!",
-    "Your poll has been removed!": "Your poll has been removed!"
-  },
-  "Step 1": {},
-  "Step 1 info_sondage.php": {
     "Poll creation (1 on 3)": "Poll creation (1 on 3)",
-    "Framadate is not properly installed, please check the 'INSTALL' to setup the database before continuing.": "Framadate is not properly installed, please check the 'INSTALL' to setup the database before continuing.",
     "You are in the poll creation section.": "You are in the poll creation section.",
     "Required fields cannot be left blank.": "Required fields cannot be left blank.",
     "Poll title": "Poll title",
     "Voters can modify their vote themselves.": "Voters can modify their vote themselves.",
     "To receive an email for each new vote.": "To receive an email for each new vote.",
     "To receive an email for each new comment.": "To receive an email for each new comment.",
-    "Go to step 2": "Go to step 2",
+    "Go to step 2": "Go to step 2"
-    "Javascript is disabled on your browser. Its activation is required to create a poll.": "Javascript is disabled on your browser. Its activation is required to create a poll.",
-    "Cookies are disabled on your browser. Theirs activation is required to create a poll.": "Cookies are disabled on your browser. Theirs activation is required to create a poll."
   },
-  "Step 2": {},
+  "Step 2": {
-  "Step 2 choix_date.php": {
+    "Back to step 1": "Revenir à l’étape 1",
+    "Go to step 3": "Aller à l’étape 3"
+  },
+  "Step 2 date": {
     "Poll dates (2 on 3)": "Poll dates (2 on 3)",
     "Choose the dates of your poll": "Choose the dates of your poll",
     "To schedule an event you need to propose at least two choices (two hours for one day or two days).": "To schedule an event you need to propose at least two choices (two hours for one day or two days).",
     "You can add or remove additionnal days and hours with the buttons": "You can add or remove additionnal days and hours with the buttons",
-    "For each selected day, you can choose, or not, meeting hours (e.g.: \\\u00228h\\\u0022, \\\u00228:30\\\u0022, \\\u00228h-10h\\\u0022, \\\u0022evening\\\u0022, etc.)": "For each selected day, you can choose, or not, meeting hours (e.g.: \\\u00228h\\\u0022, \\\u00228:30\\\u0022, \\\u00228h-10h\\\u0022, \\\u0022evening\\\u0022, etc.)",
+    "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)": "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)",
-    "Day": "Day",
-    "Time": "Time",
     "Remove an hour": "Remove an hour",
     "Add an hour": "Add an hour",
     "Copy hours of the first day": "Copy hours of the first day",
@@ -187,55 +206,49 @@
     "Remove all days": "Remove all days",
     "Remove all hours": "Remove all hours"
   },
-  "Step 2 choix_autre.php": {
+  "Step 2 classic": {
     "Poll subjects (2 on 3)": "Poll subjects (2 on 3)",
     "To make a generic poll you need to propose at least two choices between differents subjects.": "To make a generic poll you need to propose at least two choices between differents subjects.",
     "You can add or remove additional choices with the buttons": "You can add or remove additional choices with the buttons",
-    "It's possible to propose links or images by using ": "It's possible to propose links or images by using ",
+    "It's possible to propose links or images by using": "It's possible to propose links or images by using",
     "the Markdown syntax": "the Markdown syntax",
-    "Choice": "Choice",
     "Add a link or an image": "Add a link or an image",
     "These fields are optional. You can add a link, an image or both.": "These fields are optional. You can add a link, an image or both.",
     "URL of the image": "URL of the image",
-    "Link": "Link",
     "Alternative text": "Alternative text",
     "Remove a choice": "Remove a choice",
-    "Add a choice": "Add a choice",
+    "Add a choice": "Add a choice"
-    "Back to step 2": "Back to step 2",
-    "Go to step 3": "Go to step 3"
   },
   "Step 3": {
+    "Back to step 2": "Back to step 2",
     "Removal date and confirmation (3 on 3)": "Removal date and confirmation (3 on 3)",
     "Confirm the creation of your poll": "Confirm the creation of your poll",
     "List of your choices": "List of your choices",
     "Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.": "Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.",
     "Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.": "Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.",
-    "Create the poll": "Create the poll"
+    "Create the poll": "Create the poll",
-  },
+    "Your poll will be automatically removed after": "Your poll will be automatically removed after",
-  "Step 3 choix_date.php": {
+    "after the last date of your poll:": "after the last date of your poll:",
-    "Your poll will be automatically removed ": "Your poll will be automatically removed ",
+    "You can set a closer removal date for it.": "You can set a closer removal date for it.",
-    " after the last date of your poll:": " after the last date of your poll:",
     "Removal date:": "Removal date:"
   },
-  "Step 3 choix_autre.php": {
-    "Your poll will be automatically removed after": "Your poll will be automatically removed after",
-    "You can set a closer removal date for it.": "You can set a closer removal date for it.",
-    "Removal date (optional)": "Removal date (optional)"
-  },
   "Admin": {
+    "Back to administration": "Back to administration",
     "Polls": "Polls",
     "Migration": "Migration",
-    "Confirm removal of the poll ": "Confirm removal of the poll ",
+    "Purge": "Purge",
-    "polls in the database at this time": "polls in the database at this time",
+    "Logs": "Logs",
     "Poll ID": "Poll ID",
     "Format": "Format",
     "Title": "Title",
     "Author": "Author",
+    "Email": "Courriel",
+    "Expiration date": "Date d'expiration",
     "Users": "Users",
     "Actions": "Actions",
     "See the poll": "See the poll",
     "Change the poll": "Change the poll",
-    "Logs": "Logs",
+    "Deleted the poll": "Deleted the poll",
     "Summary": "Summary",
     "Success": "Success",
     "Fail": "Fail",
@@ -243,31 +256,44 @@
     "Succeeded:": "Succeeded:",
     "Failed:": "Failed:",
     "Skipped:": "Skipped:",
-    "Pages:": "Pages:"
+    "Pages:": "Pages:",
+    "Confirm removal of the poll": "Confirm removal of the poll ",
+    "polls in the database at this time": "polls in the database at this time",
+    "Purge the polls": "Purge the polls"
   },
   "Mail" : {
+    "Poll's participation": "Poll's participation",
+    "filled a vote.\nYou can find your poll at the link": "filled a vote.\nYou can find your poll at the link",
+    "updated a vote.\nYou can find your poll at the link": "updated a vote.\nYou can find your poll at the link",
+    "wrote a comment.\nYou can find your poll at the link": "wrote a comment.\nYou can find your poll at the link",
+    "Thanks for your confidence.": "Thanks for your confidence.",
+    "\n--\n\n« La route est longue, mais la voie est libre… »\nFramasoft ne vit que par vos dons (déductibles des impôts).\nMerci d'avance pour votre soutien http://soutenir.framasoft.org.": "\n\n\n\n",
+    "[ADMINISTRATOR] New settings for your poll": "[ADMINISTRATOR] New settings for your poll",
+    "You have changed the settings of your poll. \nYou can modify this poll with this link": "You have changed the settings of your poll. \nYou can modify this poll with this link",
+    "This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.":"This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.",
     "hast just created a poll called": "has just created a poll called",
     "Thanks for filling the poll at the link above": "Thanks for filling the poll at the link above",
+    "This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above": "This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above",
     "Author's message": "Author's message",
-    "For sending to the polled users": "For sending to the polled users",
+    "For sending to the polled users": "For sending to the polled users"
-    "Poll's participation": "Poll's participation",
-    "Thanks for your confidence.": "Thanks for your confidence.",
-    "This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.":"",
-    "[ADMINISTRATOR] New settings for your poll": "[ADMINISTRATOR] New settings for your poll"
   },
   "Error": {
+    "Error!": "Error!",
     "Enter a title": "Enter a title",
     "Something is wrong with the format": "Something is wrong with the format",
     "Enter an email address": "Enter an email address",
     "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll.": "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll.",
     "You haven't filled the first section of the poll creation.": "You haven't filled the first section of the poll creation.",
-    "Back to step 1": "Back to step 1",
+    "Javascript is disabled on your browser. Its activation is required to create a poll.": "Javascript is disabled on your browser. Its activation is required to create a poll.",
+    "Cookies are disabled on your browser. Theirs activation is required to create a poll.": "Cookies are disabled on your browser. Theirs activation is required to create a poll.",
     "This poll doesn't exist !": "This poll doesn't exist !",
     "Enter a name": "Enter a name",
     "The name you've chosen already exist in this poll!": "The name you've chosen already exist in this poll!",
     "Enter a name and a comment!": "Enter a name and a comment!",
     "Failed to insert the comment!": "Failed to insert the comment!",
-    "Characters \\\u0022  '  < et > are not permitted": "Characters \\\u0022  '  < et > are not permitted",
+    "Framadate is not properly installed, please check the \"INSTALL\" to setup the database before continuing.": "Framadate is not properly installed, please check the 'INSTALL' to setup the database before continuing.",
-    "The date is not correct !": "The date is not correct !"
+    "Failed to save poll": "Failed to save poll",
+    "Update vote failed": "Update vote failed",
+    "Adding vote failed": "Adding vote failed"
   }
 }

locale/fr.json

@@ -36,7 +36,7 @@
     "Choice": "Choix",
     "Link": "Lien"
   },
-  "Date" : {
+  "Date": {
     "dd/mm/yyyy": "jj/mm/aaaa",
     "%A, den %e. %B %Y": "%A %e %B %Y",
     "FULL": "%A, den %e. %B %Y",
@@ -78,9 +78,6 @@
     "the development site": "le site de développement",
     "If you want to install the software for your own use and thus increase your independence, we help you on:": "Si vous souhaitez installer ce logiciel pour votre propre usage et ainsi gagner en autonomie, nous vous aidons sur :"
   },
-  "": {
-    "Poll administration": "Administration du sondage"
-  },
   "PollInfo": {
     "Remove the poll": "Supprimer le sondage",
     "Remove all the comments": "Supprimer tous les commentaires",
@@ -104,8 +101,8 @@
     "Cancel the description edit": "Annuler le changement de description",
     "Public link of the poll": "Lien public du sondage",
     "Admin link of the poll": "Lien d'administration du sondage",
-    "Expiration's date": "Date d'expiration",
+    "Expiration date": "Date d'expiration",
-    "Edit the expiration's date": "Modifier la date d'expiration",
+    "Edit the expiration date": "Modifier la date d'expiration",
     "Save the new expiration date": "Enregistrer la date d'expiration",
     "Cancel the expiration date edit": "Annuler le changement de date d'expiration",
     "Poll rules": "Permissions du sondage",
@@ -115,10 +112,7 @@
     "Votes are editable": "Les votes sont modifiables",
     "Save the new rules": "Enregistrer les nouvelles permissions",
     "Cancel the rules edit": "Annuler le changement de permissions",
-    "The name is invalid.": "Le nom n'est pas valide.",
+    "The name is invalid.": "Le nom n'est pas valide."
-    "Keep votes": "Garder les votes",
-    "Keep comments": "Garder les commentaires",
-    "Keep this poll": "Garder ce sondage"
   },
   "Poll results": {
     "Votes of the poll": "Votes du sondage",
@@ -147,7 +141,7 @@
   },
   "studs": {
     "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.": "Pour participer à ce sondage, veuillez entrer votre nom, choisir toutes les valeurs qui vous conviennent et valider votre choix avec le bouton en bout de ligne.",
-    "POLL_LOCKED_WARNING":"L'administrateur a verrouillé ce sondage. Les votes et commentaires sont gelés, il n'est plus possible de participer",
+    "POLL_LOCKED_WARNING": "L'administrateur a verrouillé ce sondage. Les votes et commentaires sont gelés, il n'est plus possible de participer",
     "The poll is expired, it will be deleted soon.": "Le sondage a expiré, il sera bientôt supprimé.",
     "Deletion date:": "Date de suppression :"
   },
@@ -178,7 +172,10 @@
     "Confirm removal of all comments of the poll": "Confirmer la suppression de tous les commentaires de ce sondage",
     "Keep the comments": "Garder les commentaires",
     "Remove the comments": "Supprimer les commentaires",
-    "The poll has been deleted": "Le sondage a été supprimé"
+    "The poll has been deleted": "Le sondage a été supprimé",
+    "Keep votes": "Garder les votes",
+    "Keep comments": "Garder les commentaires",
+    "Keep this poll": "Garder ce sondage"
   },
   "Step 1": {
     "Poll creation (1 on 3)": "Création de sondage (1 sur 3)",
@@ -267,7 +264,7 @@
     "Poll's participation": "Participation au sondage",
     "filled a vote.\nYou can find your poll at the link": "vient de voter.\nVous pouvez retrouver votre sondage avec le lien suivant",
     "updated a vote.\nYou can find your poll at the link": "vient de mettre à jour un vote.\nVous pouvez retrouver votre sondage avec le lien suivant",
-    "vient de rédiger un commentaire.\nYou can find your poll at the link": "wrote a comment.\nVous pouvez retrouver votre sondage avec le lien suivant",
+    "wrote a comment.\nYou can find your poll at the link": "vient de rédiger un commentaire.\nVous pouvez retrouver votre sondage avec le lien suivant",
     "Thanks for your confidence.": "Merci de votre confiance.",
     "\n--\n\n« La route est longue, mais la voie est libre… »\nFramasoft ne vit que par vos dons (déductibles des impôts).\nMerci d'avance pour votre soutien http://soutenir.framasoft.org.": "\n--\n\n« La route est longue, mais la voie est libre… »\nFramasoft ne vit que par vos dons (déductibles des impôts).\nMerci d'avance pour votre soutien http://soutenir.framasoft.org.",
     "[ADMINISTRATOR] New settings for your poll": "[ADMINISTRATEUR] Changement de configuration du sondage",
@@ -293,8 +290,6 @@
     "The name you've chosen already exist in this poll!": "Le nom que vous avez choisi existe déjà !",
     "Enter a name and a comment!": "Merci de remplir les deux champs !",
     "Failed to insert the comment!": "Échec à l'insertion du commentaire !",
-    "Characters \\u0022  '  < et > are not permitted": "Les caractères \\u0022  '  < et > ne sont pas autorisés !",
-    "The date is not correct !": "La date choisie n'est pas correcte !",
     "Framadate is not properly installed, please check the \"INSTALL\" to setup the database before continuing.": "Framadate n'est pas installé correctement, lisez le fichier INSTALL pour configurer la base de données avant de continuer.",
     "Failed to save poll": "Echèc de la sauvegarde du sondage",
     "Update vote failed": "Mise à jour du vote échoué",

tpl/confirm/delete_poll.tpl

@@ -5,7 +5,7 @@
     <div class="alert alert-danger text-center">
         <h2>{__('adminstuds\\Confirm removal of the poll')}</h2>
         <p><button class="btn btn-default" type="submit" name="cancel">{__('adminstuds\\Keep the poll')}</button>
-            <button type="submit" name="confirm_delete_poll" class="btn btn-danger">{__('adminstuds\\Remove the poll')}</button></p>
+            <button type="submit" name="confirm_delete_poll" class="btn btn-danger">{__('PollInfo\\Remove the poll')}</button></p>
     </div>
 </form>
 {/block}

tpl/part/vote_table_date.tpl

@@ -96,19 +96,19 @@
                                 <ul class="list-unstyled choice">
                                     <li class="yes">
                                         <input type="radio" id="y-choice-{$k}" name="choices[{$k}]" value="2" {if $choice==2}checked {/if}/>
-                                        <label class="btn btn-default btn-xs" for="y-choice-{$k}" title="{__('Poll results\\Vote yes for')} {$slots_raw[$k]}">
+                                        <label class="btn btn-default btn-xs" for="y-choice-{$k}" title="{__('Poll results\\Vote yes for')|html} {$slots_raw[$k]}">
                                             <span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic\\Yes')}</span>
                                         </label>
                                     </li>
                                     <li class="ifneedbe">
                                         <input type="radio" id="i-choice-{$k}" name="choices[{$k}]" value="1" {if $choice==1}checked {/if}/>
-                                        <label class="btn btn-default btn-xs" for="i-choice-{$k}" title="{__('Poll results\\Vote ifneedbe for')} {$slots_raw[$k]}">
+                                        <label class="btn btn-default btn-xs" for="i-choice-{$k}" title="{__('Poll results\\Vote ifneedbe for')|html} {$slots_raw[$k]}">
                                             (<span class="glyphicon glyphicon-ok"></span>)<span class="sr-only">{__('Generic\\Ifneedbe')}</span>
                                         </label>
                                     </li>
                                     <li class="no">
                                         <input type="radio" id="n-choice-{$k}" name="choices[{$k}]" value="0" {if $choice==0}checked {/if}/>
-                                        <label class="btn btn-default btn-xs" for="n-choice-{$k}" title="{__('Poll results\\Vote no for')} {$slots_raw[$k]}">
+                                        <label class="btn btn-default btn-xs" for="n-choice-{$k}" title="{__('Poll results\\Vote no for')|html} {$slots_raw[$k]}">
                                             <span class="glyphicon glyphicon-ban-circle"></span><span class="sr-only">{__('Generic\\No')}</span>
                                         </label>
                                     </li>
@@ -169,19 +169,19 @@
                                 <ul class="list-unstyled choice">
                                     <li class="yes">
                                         <input type="radio" id="y-choice-{$i}" name="choices[{$i}]" value="2" />
-                                        <label class="btn btn-default btn-xs" for="y-choice-{$i}" title="{__('Poll results\\Vote yes for')} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
+                                        <label class="btn btn-default btn-xs" for="y-choice-{$i}" title="{__('Poll results\\Vote yes for')|html} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
                                             <span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic\\Yes')}</span>
                                         </label>
                                     </li>
                                     <li class="ifneedbe">
                                         <input type="radio" id="i-choice-{$i}" name="choices[{$i}]" value="1" />
-                                        <label class="btn btn-default btn-xs" for="i-choice-{$i}" title="{__('Poll results\\Vote ifneedbe for')} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
+                                        <label class="btn btn-default btn-xs" for="i-choice-{$i}" title="{__('Poll results\\Vote ifneedbe for')|html} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
                                             (<span class="glyphicon glyphicon-ok"></span>)<span class="sr-only">{__('Generic\\Ifneedbe')}</span>
                                         </label>
                                     </li>
                                     <li class="no">
                                         <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value="0" checked/>
-                                        <label class="btn btn-default btn-xs" for="n-choice-{$i}" title="{__('Poll results\\Vote no for')} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
+                                        <label class="btn btn-default btn-xs" for="n-choice-{$i}" title="{__('Poll results\\Vote no for')|html} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
                                             <span class="glyphicon glyphicon-ban-circle"></span><span class="sr-only">{__('Generic\\No')}</span>
                                         </label>
                                     </li>