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

LimeSurvey · Aug 17, 2021 · f3f7cbc · f3f7cbc
2 parents 3c28d5c + 5cdecc8
commit f3f7cbc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/application/controllers/admin/labels.php b/application/controllers/admin/labels.php
@@ -312,7 +312,7 @@ function ($mixed, $item) {
 
             // Save and Close Button
             $aData['labelbar']['saveandclosebutton']['form'] = 'mainform';
-            $aData['labelbar']['saveandclosebutton']['text'] = gT('Save and Close');
+            $aData['labelbar']['saveandclosebutton']['text'] = gT('Save & close');
 
             // White Close Button
             $aData['labelbar']['white_closebutton']['url'] = Yii::app()->request->getUrlReferrer(Yii::app()->createUrl('admin/labels/sa/view'));;

diff --git a/application/views/admin/super/fullpagebar_view.php b/application/views/admin/super/fullpagebar_view.php
@@ -51,7 +51,7 @@ class='btn btn-default'
                     <a class="btn btn-default tab-dependent-button"
                        id="createnewmenu"
                        data-tab="#surveymenues">
-                        <i class="icon-add text-success"></i>&nbsp;<?php eT('New Menu') ?>
+                        <i class="icon-add text-success"></i>&nbsp;<?php eT('New menu') ?>
                     </a>
                 <?php endif; ?>
             <?php endif; ?>
@@ -63,7 +63,7 @@ class='btn btn-default'
                        id="createnewmenuentry"
                        data-tab="#surveymenuentries"
                        style="display:none;">
-                        <i class="icon-add text-success"></i>&nbsp;<?php eT('New Menu Entry') ?>
+                        <i class="icon-add text-success"></i>&nbsp;<?php eT('New menu entry') ?>
                     </a>
                 <?php endif; ?>
             <?php endif; ?>

diff --git a/application/views/surveyAdministration/activateSurvey_view.php b/application/views/surveyAdministration/activateSurvey_view.php
@@ -99,7 +99,7 @@
         </div>
         <div class="row">
             <div class="col-sm-8 col-sm-offset-2">
-                <h3 class="pagetitle"><?php eT("Notification and Data management");?></h3>
+                <h3 class="pagetitle"><?php eT("Notification & data management");?></h3>
                 <p>
                     <?php eT("Additionally, the following settings cannot be changed once a survey has been activated.");?>
                     <br>