Merge branch 'master' of github.com:Sankore/Sankore-3.1

resources/library/interactivities/BlackYellow.wgt/locales/fr/scripts/blackYellow.js

@@ -13,7 +13,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var sankoreLang = {display: "Afficher", edit: "Modifier", add: "Ajouter", enter_data: "Entrer les données:", enter_result: "Entrez le résultat:", ok: "Ок", cancel: "Annuler"};
+var sankoreLang = {display: "Afficher", edit: "Modifier", add: "Ajouter", enter_data: "Entrer la donnée:", enter_result: "Entrer le résultat:", ok: "Accepter", cancel: "Annuler"};
 
 function init(){
 
@@ -405,4 +405,4 @@ function addTask(expression, result){
     var exprContainer = $("<div class='taskContainer' style='color: yellow;' contenteditable='true'>" + expression + "</div>").appendTo(main);
     var resContainer = $("<div class='taskContainer' style='color: black;' contenteditable='true'>"+ result + "</div>").appendTo(main);
     main.appendTo(editContent);
-}
+}