[Pkg-owncloud-commits] [owncloud] 40/165: fix capitalization for server-side encryption and email server, fix #15642

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit b083b65894ca8d13606218525df08575a5fdff06
Author: Jan-Christoph Borchardt <hey at jancborchardt.net>
Date:   Fri Apr 17 17:57:25 2015 +0200

    fix capitalization for server-side encryption and email server, fix #15642
---
 settings/admin.php           | 4 ++--
 settings/templates/admin.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index 08b114b..773e827 100644
--- 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 55c0018..4f60f7c 100644
--- 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>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git