Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into 'master'

Browse Source 
Corrections de conjugaison et orthographe anglaises

https://github.com/framasoft/framadate/pull/38

Corrections d'erreurs d'anglais.

Sources:
-------
* Sended : https://en.wiktionary.org/wiki/sended
* pool : https://en.wiktionary.org/wiki/pool
* poll : https://en.wiktionary.org/wiki/poll

Remarques
---------
Je tiens à souligner que mon `sed` de remplacement avait modifié les fichiers binaires `.mo`
Je ne m'y connais pas bien en fichiers de traduction. (J'y connais rien en fait :-D)
Du coup je n'ai pas commité ces modifs, de peur de casser les fichiers binaires.

See merge request !10
This commit is contained in:
JosephK 2014-11-06 11:43:24 +01:00
commit b68b0be4f2
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adminstuds.php
View File

@ -762,11 +762,11 @@ echo '
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-md-5"> <div class="form-group col-md-5">
<label for="public-link"><a class="public-link" href="' . Utils::getUrlSondage($dsondage->id_sondage) . '">'._("Public link of the pool") .' <span class="btn-link glyphicon glyphicon-link"></span></a></label> <label for="public-link"><a class="public-link" href="' . Utils::getUrlSondage($dsondage->id_sondage) . '">'._("Public link of the poll") .' <span class="btn-link glyphicon glyphicon-link"></span></a></label>
<input class="form-control" id="public-link" type="text" readonly="readonly" value="' . Utils::getUrlSondage($dsondage->id_sondage) . '" /> <input class="form-control" id="public-link" type="text" readonly="readonly" value="' . Utils::getUrlSondage($dsondage->id_sondage) . '" />
</div> </div>
<div class="form-group col-md-5"> <div class="form-group col-md-5">
<label for="admin-link"><a class="admin-link" href="' . Utils::getUrlSondage($numsondageadmin, true) . '">'._("Admin link of the pool") .' <span class="btn-link glyphicon glyphicon-link"></span></a></label> <label for="admin-link"><a class="admin-link" href="' . Utils::getUrlSondage($numsondageadmin, true) . '">'._("Admin link of the poll") .' <span class="btn-link glyphicon glyphicon-link"></span></a></label>
<input class="form-control" id="admin-link" type="text" readonly="readonly" value="' . Utils::getUrlSondage($numsondageadmin, true) . '" /> <input class="form-control" id="admin-link" type="text" readonly="readonly" value="' . Utils::getUrlSondage($numsondageadmin, true) . '" />
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">

2
creation_sondage.php
View File

@ -72,7 +72,7 @@ function ajouter_sondage()
$message .= stripslashes(html_entity_decode($_SESSION["nom"],ENT_QUOTES,"UTF-8"))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n"; $message .= stripslashes(html_entity_decode($_SESSION["nom"],ENT_QUOTES,"UTF-8"))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n";
$message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION; $message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION;
$message_admin = _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above"); $message_admin = _("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");
$message_admin .= " :\n\n"."%s \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION; $message_admin .= " :\n\n"."%s \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION;
$message = sprintf($message, Utils::getUrlSondage($sondage)); $message = sprintf($message, Utils::getUrlSondage($sondage));

6
locale/de_DE/LC_MESSAGES/Studs.po
View File

@ -211,10 +211,10 @@ msgstr "Die Beschreibung speichern"
msgid "Cancel the description edit" msgid "Cancel the description edit"
msgstr "Die Änderung der Beschreibung verwerfen" msgstr "Die Änderung der Beschreibung verwerfen"
msgid "Public link of the pool" msgid "Public link of the poll"
msgstr "Öffentlicher Link zur Umfrage" msgstr "Öffentlicher Link zur Umfrage"
msgid "Admin link of the pool" msgid "Admin link of the poll"
msgstr "Administrator Link zur Umfrage" msgstr "Administrator Link zur Umfrage"
msgid "Poll rules" msgid "Poll rules"
@ -653,7 +653,7 @@ msgid "Thanks for filling the poll at the link above"
msgstr "Dankeschön, dass Sie die Umfrage unter dem obrigen Link ausgefüllt haben" msgstr "Dankeschön, dass Sie die Umfrage unter dem obrigen Link ausgefüllt haben"
msgid "" msgid ""
"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" "This message should NOT be sent to the polled people. It is private for the poll's creator.\n"
"\n" "\n"
"You can now modify it at the link above" "You can now modify it at the link above"
msgstr "" msgstr ""

12
locale/en_GB/LC_MESSAGES/Studs.po
View File

@ -211,11 +211,11 @@ msgstr "Save the description"
msgid "Cancel the description edit" msgid "Cancel the description edit"
msgstr "Cancel the description edit" msgstr "Cancel the description edit"
msgid "Public link of the pool" msgid "Public link of the poll"
msgstr "Public link of the pool" msgstr "Public link of the poll"
msgid "Admin link of the pool" msgid "Admin link of the poll"
msgstr "Admin link of the pool" msgstr "Admin link of the poll"
msgid "Poll rules" msgid "Poll rules"
msgstr "Poll rules" msgstr "Poll rules"
@ -653,11 +653,11 @@ msgid "Thanks for filling the poll at the link above"
msgstr "Thanks for filling the poll at the link above" msgstr "Thanks for filling the poll at the link above"
msgid "" msgid ""
"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" "This message should NOT be sent to the polled people. It is private for the poll's creator.\n"
"\n" "\n"
"You can now modify it at the link above" "You can now modify it at the link above"
msgstr "" msgstr ""
"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" "This message should NOT be sent to the polled people. It is private for the poll's creator.\n"
"\n" "\n"
"You can now modify it at the link above" "You can now modify it at the link above"

2
locale/es_ES/LC_MESSAGES/Studs.po
View File

@ -111,7 +111,7 @@ msgstr "Reservado al autor"
#: creation_sondage.php:91 #: creation_sondage.php:91
msgid "" msgid ""
"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" "This message should NOT be sent to the polled people. It is private for the poll's creator.\n"
"\n" "\n"
"You can now modify it at the link above" "You can now modify it at the link above"
msgstr "" msgstr ""

6
locale/fr_FR/LC_MESSAGES/Studs.po
View File

@ -211,10 +211,10 @@ msgstr "Enregistrer la description"
msgid "Cancel the description edit" msgid "Cancel the description edit"
msgstr "Annuler le changement de description" msgstr "Annuler le changement de description"
msgid "Public link of the pool" msgid "Public link of the poll"
msgstr "Lien public du sondage" msgstr "Lien public du sondage"
msgid "Admin link of the pool" msgid "Admin link of the poll"
msgstr "Lien d'administration du sondage" msgstr "Lien d'administration du sondage"
msgid "Poll rules" msgid "Poll rules"
@ -657,7 +657,7 @@ msgid "Thanks for filling the poll at the link above"
msgstr "Merci de bien vouloir participer au sondage à l'adresse suivante" msgstr "Merci de bien vouloir participer au sondage à l'adresse suivante"
msgid "" msgid ""
"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" "This message should NOT be sent to the polled people. It is private for the poll's creator.\n"
"\n" "\n"
"You can now modify it at the link above" "You can now modify it at the link above"
msgstr "" msgstr ""

2
studs.php
View File

@ -233,7 +233,7 @@ echo '
<p class="form-control-static"> '.stripslashes($dsondage->nom_admin).'</p> <p class="form-control-static"> '.stripslashes($dsondage->nom_admin).'</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="public-link"><a class="public-link" href="' . Utils::getUrlSondage($dsondage->id_sondage) . '">'._("Public link of the pool") .' <span class="btn-link glyphicon glyphicon-link"></span></a></label> <label for="public-link"><a class="public-link" href="' . Utils::getUrlSondage($dsondage->id_sondage) . '">'._("Public link of the poll") .' <span class="btn-link glyphicon glyphicon-link"></span></a></label>
<input class="form-control" id="public-link" type="text" readonly="readonly" value="' . Utils::getUrlSondage($dsondage->id_sondage) . '" /> <input class="form-control" id="public-link" type="text" readonly="readonly" value="' . Utils::getUrlSondage($dsondage->id_sondage) . '" />
</div> </div>
</div>'."\n"; </div>'."\n";