fix capitalization for server-side encryption and email server, fix #15642

diff --git a/settings/admin.php b/settings/admin.php
index 08b114b6d9e2ba67bf8a347ca00422ad45585de5..773e82765344a17036a9a70887eed258027b9207 100644 (file)
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -190,9 +190,9 @@ $formsMap = array_map(function ($form) {
 $formsAndMore = array_merge($formsAndMore, $formsMap);
 
 // add bottom hardcoded forms from the template
-$formsAndMore[] = ['anchor' => 'encryptionAPI', 'section-name' => $l->t('Server Side Encryption')];
+$formsAndMore[] = ['anchor' => 'encryptionAPI', 'section-name' => $l->t('Server-side encryption')];
 $formsAndMore[] = ['anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')];
-$formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server')];
+$formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email server')];
 $formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')];
 $formsAndMore[] = ['anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks')];
 if ($updaterAppPanel) {

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 55c0018e5af798a08257095e4ee5e252a3399504..4f60f7c16d950aa78f229522fb8aadbbd9234264 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -300,14 +300,14 @@ if ($_['cronErrors']) {
 </div>
 
 <div class="section" id='encryptionAPI'>
-       <h2><?php p($l->t('Server Side Encryption')); ?> </h2>
+       <h2><?php p($l->t('Server-side encryption')); ?> </h2>
 
        <p id="enable">
                <input type="checkbox" name="encryption_enabled"
                           id="encryptionEnabled"
                           value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked"'); ?> />
                <label
-                       for="encryptionEnabled"><?php p($l->t('Enable Server-Side-Encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
+                       for="encryptionEnabled"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
        </p>
 
        <div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
@@ -348,7 +348,7 @@ if ($_['cronErrors']) {
 
 <div class="section" id="mail_general_settings">
        <form id="mail_general_settings_form" class="mail_settings">
-               <h2><?php p($l->t('Email Server'));?></h2>
+               <h2><?php p($l->t('Email server'));?></h2>
 
                <p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>