From bfff57a3a43fd77bfff1bc868ca5077c40b66070 Mon Sep 17 00:00:00 2001
From: bmagnin <vi>
Date: Tue, 2 Oct 2012 17:13:30 +0200
Subject: [PATCH] Wording in French interactivities

---
 .../Ass images.wgt/js/script.js               |  2 +-
 .../interactivities/Ass sons.wgt/js/script.js |  8 +++----
 .../Ass sons.wgt/locales/fr/js/script.js      | 22 ++++++-------------
 .../Cat images.wgt/js/script.js               |  8 +++----
 .../Cat images.wgt/locales/fr/js/script.js    |  2 +-
 .../interactivities/Cat text.wgt/js/script.js |  8 +++----
 .../locales/fr/scripts/selQuestionApp.js      |  2 +-
 .../Choisir.wgt/scripts/selQuestionApp.js     |  8 +++----
 .../Contraste.wgt/scripts/blackYellow.js      |  2 +-
 9 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/resources/library/interactivities/Ass images.wgt/js/script.js b/resources/library/interactivities/Ass images.wgt/js/script.js
index fb87a54c..d771579c 100644
--- a/resources/library/interactivities/Ass images.wgt/js/script.js	
+++ b/resources/library/interactivities/Ass images.wgt/js/script.js	
@@ -6,7 +6,7 @@ var sankoreLang = {
     enter: "Enter your instruction here ...",
     wgt_name: "Associate images",
     reload: "Reload",
-    slate: "wood",
+    slate: "slate",
     pad: "pad",
     none: "none",
     help: "Help",
diff --git a/resources/library/interactivities/Ass sons.wgt/js/script.js b/resources/library/interactivities/Ass sons.wgt/js/script.js
index 3b8f3efa..7ae359f3 100644
--- a/resources/library/interactivities/Ass sons.wgt/js/script.js	
+++ b/resources/library/interactivities/Ass sons.wgt/js/script.js	
@@ -1,14 +1,14 @@
 var sankoreLang = {
-    display: "Close", 
+    display: "Display", 
     edit: "Edit", 
     short_desc: "How many signals do you hear?", 
     add: "Add new block",
     enter: "Enter your instruction here ...",
     wgt_name: "Associate to the audio",
     reload: "Reload",
-    slate: "Wood",
-    pad: "Pad",
-    none: "None",
+    slate: "slate",
+    pad: "pad",
+    none: "none",
     help: "Help",
     help_content: "This is an example of help content ...",
     theme: "Theme"
diff --git a/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
index 441069a9..1b3c594d 100644
--- a/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js	
+++ b/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js	
@@ -1,14 +1,14 @@
 var sankoreLang = {
-    display: "Fermer", 
+    display: "Afficher", 
     edit: "Modifier", 
     short_desc: "Combien de signaux entendez-vous?", 
     add: "Nouveau bloc",
     enter: "Saisir votre description ici ...",
     wgt_name: "Associer aux sons",
     reload: "Recharger",
-    slate: "Bois",
-    pad: "Pad",
-    none: "Aucun",
+    slate: "ardoise",
+    pad: "tablette",
+    none: "aucun",
     help: "Aide",
     help_content: "<p><h2>Associer aux sons</h2></p>"+
     "<p><h3>Faire correspondre une image à un son.</h3></p>"+
@@ -21,7 +21,7 @@ var sankoreLang = {
     "<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
     "<li>de modifier un exercice ou d’en créer de nouveaux dans la même activité.</li></ul>"+
 
-<<<<<<< HEAD
+
 "<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis </p>"+
 "<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+
 "<li>insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,</li>"+
@@ -30,16 +30,8 @@ var sankoreLang = {
 "<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+
 "<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+ 
 "<p>Pour remplacer un son, glissez-déposez simplement un nouveau son.</p>"+
-=======
-    "<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis </p>"+
-    "<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+
-    "<li>insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,</li>"+
-    "<li>ajoutez des zones image en cliquant sur le gros signe + en dessous,</li>"+
-    "<li>insérez des images par glisser-déposer des images à partir de votre bibliothèque,</li>"+
-    "<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+
-    "<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+ 
-    "<p>Pour remplacer un son, glissez-déposez simplement un nouveau son.</p>"+
->>>>>>> 986e8e8f3435c5208d294c97db33e0cf54790514
+
+
 
     "<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+
 
diff --git a/resources/library/interactivities/Cat images.wgt/js/script.js b/resources/library/interactivities/Cat images.wgt/js/script.js
index cf2f6d0c..9c4358b4 100644
--- a/resources/library/interactivities/Cat images.wgt/js/script.js	
+++ b/resources/library/interactivities/Cat images.wgt/js/script.js	
@@ -1,5 +1,5 @@
 var sankoreLang = {
-    display: "Close", 
+    display: "Display", 
     edit: "Edit", 
     first_desc: "Odd numbers", 
     second_desc: "Even numbers", 
@@ -7,9 +7,9 @@ var sankoreLang = {
     add: "Add new block",
     wgt_name: "Categorize images",
     reload: "Reload",
-    slate: "Wood",
-    pad: "Pad",
-    none: "None",
+    slate: "slate",
+    pad: "pad",
+    none: "none",
     help: "Help",
     help_content: "This is an example of help content ...",
     theme: "Theme"
diff --git a/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js
index 5b20fcd1..a23d77b7 100644
--- a/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js	
+++ b/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js	
@@ -1,5 +1,5 @@
 var sankoreLang = {
-    display: "Fermer", 
+    display: "Afficher", 
     edit: "Modifier",
     first_desc: "Les nombres impairs", 
     second_desc: "Les nombres pairs", 
diff --git a/resources/library/interactivities/Cat text.wgt/js/script.js b/resources/library/interactivities/Cat text.wgt/js/script.js
index a53fc178..5744ce0a 100644
--- a/resources/library/interactivities/Cat text.wgt/js/script.js	
+++ b/resources/library/interactivities/Cat text.wgt/js/script.js	
@@ -1,5 +1,5 @@
 var sankoreLang = {
-    display: "Close", 
+    display: "Display", 
     edit: "Edit", 
     first_desc: "Fruits", 
     second_desc: "Vegetables",
@@ -13,9 +13,9 @@ var sankoreLang = {
     text: "Some text",
     wgt_name: "Categorize text",
     reload: "Reload",
-    slate: "Wood",
-    pad: "Pad",
-    none: "None",
+    slate: "slate",
+    pad: "pad",
+    none: "none",
     help: "Help",
     help_content: "This is an example of help content ...",
     theme: "Theme"
diff --git a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js
index 36b0c319..720c3b5f 100644
--- a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js
+++ b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js
@@ -15,7 +15,7 @@
 
 var sankoreLang = {
     edit: "Modifier",
-    display:"Fermer",
+    display:"Afficher",
     question:"La question",
     example_question:"Ceci est un exemple de question",
     answer:"Ceci est une réponse possible",
diff --git a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
index e04f2e83..8bb552c3 100644
--- a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
+++ b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
@@ -15,7 +15,7 @@
 
 var sankoreLang = {
     edit: "Edit",
-    display:"Close",
+    display:"Display",
     question:"Question",
     example_question:"This is an example of the question",
     answer:"This is one possible answer",
@@ -37,9 +37,9 @@ var sankoreLang = {
     a:"A",
     wgt_name: "Choose the right answer",
     reload: "Reload",
-    slate: "Wood",
-    pad: "Pad",
-    none: "None",
+    slate: "slate",
+    pad: "pad",
+    none: "none",
     help: "Help",
     help_content: "This is an example of help content ...",
     theme: "Theme"
diff --git a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
index 89e6df3f..26746d70 100644
--- a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
+++ b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
@@ -23,7 +23,7 @@ var sankoreLang = {
     cancel: "Cancel",
     wgt_name: "Contrast",
     reload: "Reload",
-    slate: "wood",
+    slate: "slate",
     pad: "pad",
     none: "none",
     help: "Help",