From ebfdf68d15824070d6f435c1e3efec58b1fe84a0 Mon Sep 17 00:00:00 2001 From: Antonin Date: Sat, 5 Mar 2016 18:02:22 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Libell=C3=A9s=20chang=C3=A9s=20pour=20la=20?= =?UTF-8?q?modification=20des=20votes=20du=20sondage.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #119 --- locale/de.json | 3 --- locale/en.json | 3 --- locale/es.json | 3 --- locale/fr.json | 5 +---- locale/it.json | 3 --- locale/oc.json | 3 --- tpl/part/poll_info.tpl | 14 +++++++------- 7 files changed, 8 insertions(+), 26 deletions(-) diff --git a/locale/de.json b/locale/de.json index 06ba521..f4466b1 100644 --- a/locale/de.json +++ b/locale/de.json @@ -119,9 +119,6 @@ "Poll rules": "Regeln der Umfrage", "Edit the poll rules": "Regeln der Umfrage bearbeiten", "Votes and comments are locked": "Wertungen und Kommentare sind gesperrt", - "Votes and comments are open": "Wertungen und Kommentare sind erlaubt", - "Votes are editable": "Die Wertungen können geändert werden", - "Votes are editable solely by their owner.": "Wertungen können nur vom Urheber geändert werden", "Save the new rules": "Neue Regeln speichern", "Cancel the rules edit": "Abbruch, Regeln nicht ändern", "Results are hidden.": "Ergebnisse werden ausgeblendet.", diff --git a/locale/en.json b/locale/en.json index d3bad3b..843b673 100644 --- a/locale/en.json +++ b/locale/en.json @@ -119,9 +119,6 @@ "Poll rules": "Poll rules", "Edit the poll rules": "Edit the poll rules", "Votes and comments are locked": "Votes and comments are locked", - "Votes and comments are open": "Votes and comments are open", - "Votes are editable": "Votes are modifiable", - "Votes are editable solely by their owner.": "Votes can only be edited by their owner", "Save the new rules": "Save the new rules", "Cancel the rules edit": "Cancel the rules edit", "Results are hidden.": "Results are hidden.", diff --git a/locale/es.json b/locale/es.json index a6822af..1830997 100644 --- a/locale/es.json +++ b/locale/es.json @@ -119,9 +119,6 @@ "Poll rules": "ES_Permissions du sondage", "Edit the poll rules": "ES_Modifier les permissions du sondage", "Votes and comments are locked": "ES_Les votes et commentaires sont verrouillés", - "Votes and comments are open": "ES_Les votes et commentaires sont ouverts", - "Votes are editable": "ES_Les votes sont modifiables", - "Votes are editable solely by their owner.": "ES_Les votes sont modifiables uniquement par leur créateur", "Save the new rules": "ES_Enregistrer les nouvelles permissions", "Cancel the rules edit": "ES_Annuler le changement de permissions", "Results are hidden.": "ES_Les résultats sont cachés.", diff --git a/locale/fr.json b/locale/fr.json index 0589acc..0bb7815 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -118,10 +118,7 @@ "Cancel the expiration date edit": "Annuler le changement de date d'expiration", "Poll rules": "Permissions du sondage", "Edit the poll rules": "Modifier les permissions du sondage", - "Votes and comments are locked": "Les votes et commentaires sont verrouillés", - "Votes and comments are open": "Les votes et commentaires sont ouverts", - "Votes are editable": "Les votes sont modifiables", - "Votes are editable solely by their owner.": "Les votes sont modifiables uniquement par leur créateur", + "Votes and comments are locked": "Il n'est plus possible de voter.", "Save the new rules": "Enregistrer les nouvelles permissions", "Cancel the rules edit": "Annuler le changement de permissions", "Results are hidden.": "Les résultats sont cachés.", diff --git a/locale/it.json b/locale/it.json index 73c2078..2c9a3b8 100644 --- a/locale/it.json +++ b/locale/it.json @@ -119,9 +119,6 @@ "Poll rules": "Permessi del sondaggio", "Edit the poll rules": "Modificare i permessi del sondaggio", "Votes and comments are locked": "I voti e i commenti sono bloccati", - "Votes and comments are open": "I voti e i commenti sono permessi", - "Votes are editable": " I voti sono modificabili", - "Votes are editable solely by their owner.": "Voti sono scrivibili solo dal loro creatore", "Save the new rules": "Salvare i nuovi permessi", "Cancel the rules edit": "Annullare le modifica dei permessi", "Results are hidden.": "I risultati sono nascosti.", diff --git a/locale/oc.json b/locale/oc.json index f3660f1..8041655 100644 --- a/locale/oc.json +++ b/locale/oc.json @@ -117,9 +117,6 @@ "Poll rules": "Permissions del sondatge", "Edit the poll rules": "Modificar las permissions del sondatge", "Votes and comments are locked": "Los vòtes e comentaris son clavats", - "Votes and comments are open": "Los vòtes e comentaris son doberts", - "Votes are editable": "Los vòtes son modificables", - "Votes are editable solely by their owner.": "Los vòtes son solament modificables pel creator", "Save the new rules": "Enregistrar las nòvas permissions", "Cancel the rules edit": "Anullar lo cambi de permissions", "Results are hidden.": "Las resultats son amagadas.", diff --git a/tpl/part/poll_info.tpl b/tpl/part/poll_info.tpl index e2e4607..1dc5c03 100644 --- a/tpl/part/poll_info.tpl +++ b/tpl/part/poll_info.tpl @@ -183,16 +183,16 @@ {if $poll->editable} {if $poll->editable == constant("Framadate\Editable::EDITABLE_BY_ALL")} {$rule_id = 2} - {$rule_txt = __('PollInfo', 'Votes are editable')} + {$rule_txt = __('Step 1', 'All voters can modify any vote')} {else} {$rule_id = 3} - {$rule_txt = __('PollInfo', 'Votes are editable solely by their owner.')} + {$rule_txt = __('Step 1', 'Voters can modify their vote themselves')} {/if} {$rule_icon = ''} - {else} + {else} {$rule_id = 1} {$rule_icon = ''} - {$rule_txt = __('PollInfo', 'Votes and comments are open')} + {$rule_txt = __('Step 1', 'Votes cannot be modified.')} {/if} {else} {$rule_id = 0} @@ -206,9 +206,9 @@
From 7da17c4f286dc06ddc99ce3476528d1381477475 Mon Sep 17 00:00:00 2001 From: Antonin Date: Sat, 5 Mar 2016 18:24:07 +0100 Subject: [PATCH 2/3] Suppression d'un point inutile dans une traduction. --- locale/de.json | 2 +- locale/en.json | 2 +- locale/es.json | 2 +- locale/fr.json | 2 +- locale/it.json | 2 +- locale/oc.json | 2 +- tpl/create_poll.tpl | 2 +- tpl/part/poll_info.tpl | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/locale/de.json b/locale/de.json index f4466b1..4272364 100644 --- a/locale/de.json +++ b/locale/de.json @@ -216,7 +216,7 @@ "Poll id": "DE_Identifiant", "Poll id rules": "DE_L'identifiant peut contenir des lettres, des chiffres et des tirets \"-\".", "Poll id warning": "DE_En définissant un identifiant cela peut faciliter l'accès à ce sondage pour des personnes non désirées. Il est recommandé de le protéger par mot de passe.", - "Votes cannot be modified.": "Wertungen können nicht verändert werden.", + "Votes cannot be modified": "Wertungen können nicht verändert werden.", "All voters can modify any vote": "Jeder Teilnehmer kann jede abgegebene Wertung ändern.", "Voters can modify their vote themselves": "Teilnehmer können ihre Wertungen verändern", "To receive an email for each new vote": "Bei jeder neuen Wertung eine E-Mail erhalten", diff --git a/locale/en.json b/locale/en.json index 843b673..2015bd6 100644 --- a/locale/en.json +++ b/locale/en.json @@ -216,7 +216,7 @@ "Poll id": "Identifier", "Poll id rules": "The identifier can contain letters, numbers and dashes \"-\".", "Poll id warning": "By defining an identifier that can facilitate access to the poll for unwanted people. It is recommended to protect it with a password.", - "Votes cannot be modified.": "Votes cannot be modified", + "Votes cannot be modified": "Votes cannot be modified", "All voters can modify any vote": "All voters can modify any vote", "Voters can modify their vote themselves": "Voters can modify their vote themselves", "To receive an email for each new vote": "Receive an email for each new vote", diff --git a/locale/es.json b/locale/es.json index 1830997..aade83a 100644 --- a/locale/es.json +++ b/locale/es.json @@ -216,7 +216,7 @@ "Poll id": "ES_Identifiant", "Poll id rules": "ES_L'identifiant peut contenir des lettres, des chiffres et des tirets \"-\".", "Poll id warning": "ES_En définissant un identifiant cela peut faciliter l'accès à ce sondage pour des personnes non désirées. Il est recommandé de le protéger par mot de passe.", - "Votes cannot be modified.": "ES_Aucun vote ne peut être modifié", + "Votes cannot be modified": "ES_Aucun vote ne peut être modifié", "All voters can modify any vote": "ES_Tous les sondés peuvent modifier tous les votes", "Voters can modify their vote themselves": "Los encuentados pueden cambiar su línea ellos mismos", "To receive an email for each new vote": "Usted quiere recibir un correo electónico cada vez que alguien participe a la encuesta", diff --git a/locale/fr.json b/locale/fr.json index 0bb7815..0a3ade5 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -216,7 +216,7 @@ "Poll id": "Identifiant", "Poll id rules": "L'identifiant peut contenir des lettres, des chiffres et des tirets \"-\".", "Poll id warning": "En définissant un identifiant cela peut faciliter l'accès à ce sondage pour des personnes non désirées. Il est recommandé de le protéger par mot de passe.", - "Votes cannot be modified.": "Aucun vote ne peut être modifié", + "Votes cannot be modified": "Aucun vote ne peut être modifié", "All voters can modify any vote": "Tous les sondés peuvent modifier tous les votes", "Voters can modify their vote themselves": "Chaque sondé peut modifier son propre vote", "To receive an email for each new vote": "Recevoir un courriel à chaque participation d'un sondé", diff --git a/locale/it.json b/locale/it.json index 2c9a3b8..a06bd21 100644 --- a/locale/it.json +++ b/locale/it.json @@ -216,7 +216,7 @@ "Poll id": "IT_Identifiant", "Poll id rules": "IT_L'identifiant peut contenir des lettres, des chiffres et des tirets \"-\".", "Poll id warning": "IT_En définissant un identifiant cela peut faciliter l'accès à ce sondage pour des personnes non désirées. Il est recommandé de le protéger par mot de passe.", - "Votes cannot be modified.": "Nessun voto può essere modificato", + "Votes cannot be modified": "Nessun voto può essere modificato", "All voters can modify any vote": "Tutti i votanti possono cambiare tutti i voti", "Voters can modify their vote themselves": "I partecipanti possono modificare il loro voto in autonomia", "To receive an email for each new vote": "Per ricevere un'email per ogni nuovo voto", diff --git a/locale/oc.json b/locale/oc.json index 8041655..d53ff60 100644 --- a/locale/oc.json +++ b/locale/oc.json @@ -200,7 +200,7 @@ "You are in the poll creation section.": "Avètz causit de crear un nòu sondatge.", "Required fields cannot be left blank.": "Mercés de garnir tots los formularis obligatòris, marcats amb una *.", "Poll title": "Títol del sondatge", - "Votes cannot be modified.": "Cap vòte pòt èsser modificat", + "Votes cannot be modified": "Cap vòte pòt èsser modificat", "All voters can modify any vote": "Tot lo mond pòt modificar sos vòtes", "Voters can modify their vote themselves": "Cadun pòt modificar son pròpi vòte", "To receive an email for each new vote": "Recebre un messatge per cada participacion", diff --git a/tpl/create_poll.tpl b/tpl/create_poll.tpl index e8fba49..5674182 100644 --- a/tpl/create_poll.tpl +++ b/tpl/create_poll.tpl @@ -131,7 +131,7 @@
diff --git a/tpl/part/poll_info.tpl b/tpl/part/poll_info.tpl index 1dc5c03..27c7cde 100644 --- a/tpl/part/poll_info.tpl +++ b/tpl/part/poll_info.tpl @@ -192,7 +192,7 @@ {else} {$rule_id = 1} {$rule_icon = ''} - {$rule_txt = __('Step 1', 'Votes cannot be modified.')} + {$rule_txt = __('Step 1', 'Votes cannot be modified')} {/if} {else} {$rule_id = 0} @@ -206,7 +206,7 @@
From 8909333f090a74f22ac49fece697afc7e7d16018 Mon Sep 17 00:00:00 2001 From: Antonin Date: Sat, 5 Mar 2016 18:35:46 +0100 Subject: [PATCH 3/3] Encore un point en trop... Yurk.~ --- locale/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/de.json b/locale/de.json index 4272364..5397458 100644 --- a/locale/de.json +++ b/locale/de.json @@ -216,8 +216,8 @@ "Poll id": "DE_Identifiant", "Poll id rules": "DE_L'identifiant peut contenir des lettres, des chiffres et des tirets \"-\".", "Poll id warning": "DE_En définissant un identifiant cela peut faciliter l'accès à ce sondage pour des personnes non désirées. Il est recommandé de le protéger par mot de passe.", - "Votes cannot be modified": "Wertungen können nicht verändert werden.", - "All voters can modify any vote": "Jeder Teilnehmer kann jede abgegebene Wertung ändern.", + "Votes cannot be modified": "Wertungen können nicht verändert werden", + "All voters can modify any vote": "Jeder Teilnehmer kann jede abgegebene Wertung ändern", "Voters can modify their vote themselves": "Teilnehmer können ihre Wertungen verändern", "To receive an email for each new vote": "Bei jeder neuen Wertung eine E-Mail erhalten", "To receive an email for each new comment": "Bei jedem neuen Kommentar eine E-Mail erhalten",