Merge branch 'Fix/119-Translations-change' into 'develop'

119 - Amélioration des traductions pour les permissions d'édition d'un sondage.

Changement des libellés visibles par le créateur d'un sondage concernant les permissions d'édition d'un vote.

Fix #119 

See merge request !107
This commit is contained in:
Olivier Perez 2016-03-23 22:40:14 +01:00
commit 28381f18a6
8 changed files with 16 additions and 34 deletions

View File

@ -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",
@ -219,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",

View File

@ -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",
@ -219,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",

View File

@ -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",
@ -219,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",

View File

@ -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",
@ -219,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é",

View File

@ -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",
@ -219,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",

View File

@ -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.",
@ -207,7 +204,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",

View File

@ -131,7 +131,7 @@
</label>
<label>
<input type="radio" name="editable" {if empty($poll_editable) or $poll_editable==constant("Framadate\Editable::NOT_EDITABLE")}checked{/if} value="{constant("Framadate\Editable::NOT_EDITABLE")}">
{__('Step 1', 'Votes cannot be modified.')}
{__('Step 1', 'Votes cannot be modified')}
</label>
</div>
</div>

View File

@ -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 = '<span class="glyphicon glyphicon-edit"></span>'}
{else}
{$rule_id = 1}
{$rule_icon = '<span class="glyphicon glyphicon-check"></span>'}
{$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 @@
<div class="input-group">
<select class="form-control" id="rules" name="rules">
<option value="0"{if $rule_id==0} selected="selected"{/if}>{__('PollInfo', 'Votes and comments are locked')}</option>
<option value="1"{if $rule_id==1} selected="selected"{/if}>{__('PollInfo', 'Votes and comments are open')}</option>
<option value="2"{if $rule_id==2} selected="selected"{/if}>{__('PollInfo', 'Votes are editable')}</option>
<option value="3"{if $rule_id==3} selected="selected"{/if}>{__('PollInfo', 'Votes are editable solely by their owner.')}</option>
<option value="1"{if $rule_id==1} selected="selected"{/if}>{__('Step 1', 'Votes cannot be modified')}</option>
<option value="3"{if $rule_id==3} selected="selected"{/if}>{__('Step 1', 'Voters can modify their vote themselves')}</option>
<option value="2"{if $rule_id==2} selected="selected"{/if}>{__('Step 1', 'All voters can modify any vote')}</option>
</select>
<span class="input-group-btn">
<button type="submit" name="update_poll_info" value="rules" class="btn btn-success" title="{__('PollInfo', 'Save the new rules')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>