branch feature/198-DuelsNotCombats created (now 7e590b78)
This is an automated email from the git hooks/post-receive script. New change to branch feature/198-DuelsNotCombats in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 7e590b78 Fixes #198 - Vote de Condorcet : Duels et non Combats This branch includes the following new commits: new 7e590b78 Fixes #198 - Vote de Condorcet : Duels et non Combats The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7e590b782148328a5954189171a90a0e1b221480 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Apr 6 16:56:21 2018 +0200 Fixes #198 - Vote de Condorcet : Duels et non Combats -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/198-DuelsNotCombats in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 7e590b782148328a5954189171a90a0e1b221480 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Apr 6 16:56:21 2018 +0200 Fixes #198 - Vote de Condorcet : Duels et non Combats --- pollen-ui-riot-js/src/main/web/i18n/fr.json | 10 +++++----- .../i18n/pollen-votecounting-condorcet_en_GB.properties | 2 +- .../i18n/pollen-votecounting-condorcet_fr_FR.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index a4349e52..d402264e 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -83,8 +83,8 @@ "poll_results_unit_1_many": "votes", "poll_results_unit_2_one": "point", "poll_results_unit_2_many": "points", - "poll_results_unit_3_one": "combat", - "poll_results_unit_3_many": "combats", + "poll_results_unit_3_one": "duel", + "poll_results_unit_3_many": "duels", "poll_results_unit_4_one": "", "poll_results_unit_4_many": "", "poll_results_unit_5_one": "point", @@ -97,7 +97,7 @@ "poll_results_borda_rank": "Rang", "poll_results_borda_points": "Points", "poll_results_borda_total": "Totaux", - "poll_results_condorcet_title": "Tableau des combats", + "poll_results_condorcet_title": "Tableau des duels", "poll_results_condorcet_total": "Totaux", "poll_results_instantRunoff_title": "Tableau des éliminations", "poll_results_instantRunoff_rounds": "Tours", @@ -145,8 +145,8 @@ "poll_votes_results_unit_1_many": "votes", "poll_votes_results_unit_2_one": "point", "poll_votes_results_unit_2_many": "points", - "poll_votes_results_unit_3_one": "combat", - "poll_votes_results_unit_3_many": "combats", + "poll_votes_results_unit_3_one": "duel", + "poll_votes_results_unit_3_many": "duels", "poll_votes_results_unit_4_one": "", "poll_votes_results_unit_4_many": "", "poll_votes_results_unit_5_one": "point", diff --git a/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_en_GB.properties b/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_en_GB.properties index 18a9cbc4..ab5c4add 100644 --- a/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_en_GB.properties +++ b/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_en_GB.properties @@ -1,4 +1,4 @@ pollen.error.vote.invalidCondorcetVoteValue=The value '%2$s' of vote for choice %1$s is not valid, only integer values are authorized. pollen.voteCountingType.condorcet=Condorcet -pollen.voteCountingType.condorcet.help=Rank choices by preference order from 1 to N (1\=favorite).<br/>Only the rank is taken into account, not the values. Two choices can have the same value.<br/>In this method, the winner is the choice which wins the most fights against the other choices.<br/>More about this method\: <a href\='http\://en.wikipedia.org/wiki/Condorcet_method' target\='\#doc'>http\://en.wikipedia.org/wiki/Condorcet_method</a> +pollen.voteCountingType.condorcet.help=Rank choices by preference order from 1 to N (1\=favorite).<br/>Only the rank is taken into account, not the values. Two choices can have the same value.<br/>In this method, the winner is the choice which wins the most duels against the other choices.<br/>More about this method\: <a href\='http\://en.wikipedia.org/wiki/Condorcet_method' target\='\#doc'>http\://en.wikipedia.org/wiki/Condorcet_method</a> pollen.voteCountingType.condorcet.shortHelp=Rank choices by preference order from 1 to N (1\=favorite). diff --git a/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_fr_FR.properties b/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_fr_FR.properties index 0452c805..1327db72 100644 --- a/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_fr_FR.properties +++ b/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_fr_FR.properties @@ -1,4 +1,4 @@ pollen.error.vote.invalidCondorcetVoteValue=La valeur du vote '%2$s' pour le choix %1$s n'est pas correcte, seul des valeurs entières sont autorisées. pollen.voteCountingType.condorcet=Condorcet -pollen.voteCountingType.condorcet.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré).<br/>Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur.<br/>Dans cette méthode, le gagnant est celui qui remporte le plus de combats par rapport aux autres choix.<br/>Pour en savoir plus \: <a href\='http\://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet' target\='\#doc'>http\://fr.wikipedia.org/wiki/Méthode_Condorcet</a> +pollen.voteCountingType.condorcet.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré).<br/>Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur.<br/>Dans cette méthode, le gagnant est celui qui remporte le plus de duels par rapport aux autres choix.<br/>Pour en savoir plus \: <a href\='http\://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet' target\='\#doc'>http\://fr.wikipedia.org/wiki/Méthode_Condorcet</a> pollen.voteCountingType.condorcet.shortHelp=Classer les choix par ordre de préférence de 1 à N (1\=préféré). -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm