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

resources/library/interactivities/Ass images.wgt/css/basic.css

@@ -274,7 +274,7 @@ body{
 
 #wgt_name{
     height: 44px;
-    width: 200px;
+    width: 300px;
     margin: 10px 10px 0 10px;
     padding: 0;
     float: left;

resources/library/interactivities/Ass images.wgt/js/script.js

@@ -3,7 +3,7 @@ var sankoreLang = {
     edit: "Edit", 
     short_desc: "Select the number \"three\".", 
     add: "Add new block",
-    enter: "Enter your condition here ...",
+    enter: "Enter your instruction here ...",
     wgt_name: "Associate images",
     reload: "Reload",
     slate: "Wood",

resources/library/interactivities/Cat images.wgt/css/basic.css

@@ -260,7 +260,7 @@ body{
 
 #wgt_name{
     height: 44px;
-    width: 200px;
+    width: 300px;
     margin: 10px 10px 0 10px;
     padding: 0;
     float: left;

resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js

@@ -5,7 +5,7 @@ var sankoreLang = {
     second_desc: "Les nombres pairs", 
     enter: "Saisir le nom de la catégorie ici ...",
     add: "Nouveau bloc",
-    wgt_name: "Categoriser des images",
+    wgt_name: "Catégoriser des images",
     reload: "Recharger",
     slate: "Bois",
     pad: "Pad"

resources/library/interactivities/Cat text.wgt/css/basic.css

@@ -277,7 +277,7 @@ body{
 
 #wgt_name{
     height: 44px;
-    width: 200px;
+    width: 300px;
     margin: 10px 10px 0 10px;
     padding: 0;
     float: left;

resources/library/interactivities/Cat text.wgt/js/script.js

@@ -3,7 +3,7 @@ var sankoreLang = {
     edit: "Edit", 
     first_desc: "Fruits", 
     second_desc: "Vegetables",
-    potatoes: "Potatoes",
+    potatoes: "Potato",
     carrot: "Carrot",
     onion: "Onion",
     apple: "Apple",
@@ -684,4 +684,4 @@ function checkCorrectness(source){
             .removeClass("green_cont")
             .addClass("red_cont");
     }
-}
\ No newline at end of file
+}

resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js

@@ -3,7 +3,7 @@ var sankoreLang = {
     edit: "Modifier", 
     first_desc: "Fruits", 
     second_desc: "Légumes",
-    potatoes: "Pommes de terre",
+    potatoes: "Pomme de terre",
     carrot: "Carotte",
     onion: "Oignon",
     apple: "Pomme",
@@ -11,7 +11,7 @@ var sankoreLang = {
     enter: "Saisir le nom de la catégorie ici ...",
     add: "Nouveau bloc",
     text: "Texte",
-    wgt_name: "Categoriser des images",
+    wgt_name: "Catégoriser des textes",
     reload: "Recharger",
     slate: "Bois",
     pad: "Pad"

resources/library/interactivities/Choisir.wgt/config.xml

@@ -3,7 +3,7 @@
 		xmlns:ub="http://uniboard.mnemis.com/widgets"
         id="http://uniboard.mnemis.com/widgets/webbrowser" 
         version="1.1"
-        width="750"
+        width="900"
         height="400" 
 		ub:resizable="true">   
 		     
@@ -11,6 +11,5 @@
 		<author href="http://www.getuniboard.com"
 	            email="info@mnemis.com">Mnemis SA</author>
 		<description>Choisir widget</description> 
-
  		<content src="index.html"/> 
 </widget>

resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js

@@ -20,7 +20,7 @@ var sankoreLang = {
     example_question:"Ceci est un exemple de question",
     answer:"Ceci est un exemple de réponse",
     q:"Q",
-    add_new_question:"Ajouter une nouvelle question ...",
+    add_new_question:" Ajouter une nouvelle question ...",
     options:"Les options",
     close:"Fermer",
     delete_question:"Supprimer la question",

resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js

@@ -20,7 +20,7 @@ var sankoreLang = {
     example_question:"This is an example of the question",
     answer:"This is an example of the answer",
     q:"Q",
-    add_new_question:"Add new question ...",
+    add_new_question:" Add new question ...",
     options:"Options",
     close:"Close",
     delete_question:"Delete question",
@@ -645,4 +645,4 @@ function changeStyle(val){
         $("#wgt_name").addClass("pad_color");
         $(".style_select").addClass("pad_select");
     }
-}
\ No newline at end of file
+}

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

@@ -19,9 +19,9 @@ var sankoreLang = {
     add: "Ajouter", 
     enter_data: "Saisir la donnée:", 
     enter_result: "Saisir le résultat:", 
-    ok: "Accepter", 
+    ok: "Ok", 
     cancel: "Annuler",
-    wgt_name: "Noir/jaune",
+    wgt_name: "Constraste",
     reload: "Recharger",
     slate: "Bois",
     pad: "Pad"
@@ -409,4 +409,4 @@ function changeStyle(val){
         $("#wgt_name").addClass("pad_color");
         $(".style_select").addClass("pad_select");
     }
-}
\ No newline at end of file
+}

resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js

@@ -21,7 +21,7 @@ var sankoreLang = {
     enter_result: "Enter result:", 
     ok: "Ok", 
     cancel: "Cancel",
-    wgt_name: "Black/yellow",
+    wgt_name: "Contrast",
     reload: "Reload",
     slate: "Wood",
     pad: "Pad"
@@ -410,4 +410,4 @@ function changeStyle(val){
         $("#wgt_name").addClass("pad_color");
         $(".style_select").addClass("pad_select");
     }
-}
\ No newline at end of file
+}

resources/library/interactivities/Ordre images.wgt/css/basic.css

@@ -239,7 +239,7 @@ body{
 
 #wgt_name{
     height: 44px;
-    width: 200px;
+    width: 300px;
     margin: 10px 10px 0 10px;
     padding: 0;
     float: left;

resources/library/interactivities/Ordre images.wgt/js/script.js

@@ -3,7 +3,7 @@ var sankoreLang = {
     edit: "Edit", 
     short_desc: "Place the pictures in ascending order.", 
     add: "Add new block",
-    enter: "Enter your text here ...",
+    enter: "Enter your instruction here ...",
     wgt_name: "Order images",
     reload: "Reload",
     slate: "Wood",

resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js

@@ -2,9 +2,9 @@
 var sankoreLang = {
     display: "Afficher", 
     edit: "Modifier", 
-    short_desc: "Placez les photos dans l'ordre croissant.", 
+    short_desc: "Placez les images dans l'ordre croissant.", 
     add: "Nouveau bloc",
-    enter: "Saisir votre texte ici ...",
+    enter: "Saisir votre consigne ici ...",
     wgt_name: "Ordonner des images",
     reload: "Recharger",
     slate: "Bois",

resources/library/interactivities/Ordre mots.wgt/scripts/template2.js

@@ -27,7 +27,7 @@ function checkResponse()
 */
 
 var sankoreLang = {
-    view: "View", 
+    view: "Display", 
     edit: "Edit",
     example: "a*long*,*long*time*ago*...",
     wgt_name: "Order words",
@@ -316,4 +316,4 @@ if (window.widget) {
         }
         sankore.setPreference("rightOrdWords", word);
     }
-}
\ No newline at end of file
+}

resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css

@@ -133,7 +133,7 @@ body{
 
 #wgt_name{
     height: 44px;
-    width: 200px;
+    width: 300px;
     margin: 10px 10px 0 10px;
     padding: 0;
     float: left;

resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js

@@ -28,7 +28,7 @@ function checkResponse()
 
 var sankoreLang = {
     edit: "Edit",
-    view: "View",
+    view: "Display",
     example: "this is\nan example\nsentence",
     wgt_name: "Order phrases",
     reload: "Reload",
@@ -286,4 +286,4 @@ if (window.widget) {
         }
         sankore.setPreference("rightOrdPhrases", sentence);
     }
-}
\ No newline at end of file
+}

resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css

@@ -139,7 +139,7 @@ body{
 
 #wgt_name{
     height: 44px;
-    width: 200px;
+    width: 300px;
     margin: 10px 10px 0 10px;
     padding: 0;
     float: left;