Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

application/models/QuestionBaseDataSet.php

@@ -374,7 +374,7 @@ protected function getRelevanceEquationInput()
                 'title' => gT('Condition'),
                 'formElementId' => 'relevance',
                 'formElementName' => false,
-                'formElementHelp' => (count($this->oQuestion->conditions)>0 ? '' :gT("A condition can be used to add branching logic using ExpressionScript. Either add it directly here or use the Condition designer.")),
+                'formElementHelp' => (count($this->oQuestion->conditions)>0 ? '' :gT("A condition can be used to add branching logic using ExpressionScript. Either edit it directly here or use the Condition designer.")),
                 'inputtype' => 'textarea',
                 'formElementValue' => $this->oQuestion->relevance,
                 'formElementOptions' => [

application/models/UserParser.php

@@ -83,7 +83,7 @@ public static function getDataFromJSON($FILES)
         foreach($decoded as $data){
             if(!isset($data["email"]) || !isset($data["users_name"]) || !isset($data["full_name"]) || !isset($data["lang"]) || !isset($data["password"])){
                 Yii::app()->setFlashMessage(
-                    sprintf(gT("Wrong offset definition!!! Please make sure that your JSON Arrays contains the offsets '%s' as well as '%s' , '%s' , '%s' and  '%s'"), '<b>users_name</b>','<b>full_name</b>','<b>email</b>','<b>lang</b>','<b>password</b>'),
+                    sprintf(gT("Wrong definition! Please make sure that your JSON arrays contains the fields '%s' as well as '%s' , '%s' , '%s' and  '%s'"), '<b>users_name</b>','<b>full_name</b>','<b>email</b>','<b>lang</b>','<b>password</b>'),
                     'error'
                     );
                 Yii::app()->getController()->redirect(array('/admin/usermanagement'));

application/views/admin/globalsettings/surveySettings.php

@@ -43,7 +43,7 @@
                 <div id="pjax-content" class="tab-content col-md-10">
                     <div class="row">
                         <div class="alert alert-info controls col-sm-12" role="alert">
-                            <?php eT('All changes of global survey settings will have immediate effect on all related survey groups and surveys that use inherited values.'); ?>
+                            <?php eT('All changes of global survey settings will immediately affect all related survey groups and surveys that use inherited values.'); ?>
                         </div>
                     </div>
                     <?php if($partial == '_generaloptions_panel') { ?> 

application/views/admin/participants/attributeMap_view.php

@@ -21,7 +21,7 @@
 
 <div class='header ui-widget-header'>
     <div class='pagetitle h3'>
-        <?php eT("Map your central participant attributes to an existing survey participant attribute or create a new one"); ?>
+        <?php eT("Map your central participant attributes to existing survey participant attributes or create new ones"); ?>
     </div>
 </div>
 <?php

application/views/admin/permissiontemplates/massiveAction/_selector.php

@@ -28,7 +28,7 @@
             'action' => 'batchExport',
             'url' => App()->createUrl('/admin/roles/sa/batchExport/sItems').'/',
             'iconClasses' => 'fa fa-download',
-            'text' => gT('Batch export roles'),
+            'text' => gT('Bulk export roles'),
             'grid-reload' => 'no',
             'actionType'    => 'window-location-href',
         ),

application/views/admin/survey/Question/editQuestion_view.php

@@ -384,8 +384,8 @@
                                     </label>
                                     <div class="help-block collapse" id="help_relevance">
                                         <p>
-                                            <?php eT("The relevance equation can be used to add branching logic. This is a rather advanced topic. If you are unsure, just leave it be."); ?><br>
-                                            <a href="https://manual.limesurvey.org/Expression_Manager" rel="help"><?php eT("More on relevance and the ExpressionScript Engine."); ?></a>
+                                            <?php eT("A condition can be used to add branching logic using ExpressionScript. Either edit it directly here or use the Condition designer."); ?><br>
+                                            <a href="https://manual.limesurvey.org/Expression_Manager" rel="help"><?php eT("More about conditions and the ExpressionScript engine."); ?></a>
                                         </p>
                                     </div>
                                     <div class="input-group">

application/views/admin/survey/Question/neditQuestion_view.php

@@ -332,8 +332,8 @@
                                     </label>
                                     <div class="help-block collapse" id="help_relevance">
                                         <p>
-                                            <?php eT("The relevance equation can be used to add branching logic. This is a rather advanced topic. If you are unsure, just leave it be."); ?><br>
-                                            <a href="https://manual.limesurvey.org/Expression_Manager" rel="help"><?php eT("More on relevance and the ExpressionScript Engine."); ?></a>
+                                            <?php eT("A condition can be used to add branching logic using ExpressionScript. Either edit it directly here or use the Condition designer."); ?><br>
+                                            <a href="https://manual.limesurvey.org/Expression_Manager" rel="help"><?php eT("More about conditions and the ExpressionScript engine."); ?></a>
                                         </p>
                                     </div> 
                                         <div class="input-group">