Merged branch master into development

assets/js/default/directory.js

@@ -694,9 +694,9 @@ function initPageTable(number){
             mylog.log(".openCoopPanelHtml vote");
             afterLoad = function() { 
                 setTimeout(function(){
-                  $("#coop-container").animate({
-                        scrollTop: $("#podVote").offset().top
-                    }, 1000);
+                  // $("#coop-container").animate({
+                  //       scrollTop: $("#podVote").offset().top
+                  //   }, 1000);
                 }, 1000);
             };
         }
@@ -752,6 +752,7 @@ function initPageTable(number){
       mylog.log("send vote",voteValue);
       uiCoop.sendVote("proposal", idParentProposal, voteValue, idParentRoom, null, true);
     });
+    
   }
 
   function initBtnShare(){

views/translation/trad.php

@@ -565,6 +565,7 @@ var trad = {
 	"isupport":"<?php echo Yii::t("common","I support") ?>",
 	"cool":"<?php echo Yii::t("common","Cool") ?>",
 	"answer":"<?php echo Yii::t("comment","answer") ?>",
+	"answerOn":"<?php echo Yii::t("common","Answer") ?>",
 	"answers":"<?php echo Yii::t("comment","answers") ?>",
 	"burk":"<?php echo Yii::t("common", "Buuurk") ?>",
 	"what":"<?php echo Yii::t("common", "What ?") ?>",