diff options
| -rw-r--r-- | apps/files/ajax/upload.php | 3 | ||||
| -rw-r--r-- | core/templates/installation.php | 13 | ||||
| -rw-r--r-- | core/templates/login.php | 3 | ||||
| -rw-r--r-- | lib/setup.php | 3 | ||||
| -rw-r--r-- | settings/templates/personal.php | 5 |
5 files changed, 8 insertions, 19 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 9031c729eff..5b697777e47 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -26,8 +26,7 @@ foreach ($_FILES['files']['error'] as $error) { UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'), UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ') . ini_get('upload_max_filesize'), - UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified' - . ' in the HTML form'), + UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'), UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'), UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'), UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'), diff --git a/core/templates/installation.php b/core/templates/installation.php index a7a9bcbc11a..c783a09cba8 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -21,20 +21,15 @@ <?php if(!$_['secureRNG']): ?> <fieldset class="warning"> <legend><strong><?php echo $l->t('Security Warning');?></strong></legend> - <p><?php echo $l->t('No secure random number generator is available,' - .' please enable the PHP OpenSSL extension.');?><br/> - <?php echo $l->t('Without a secure random number generator an attacker may be able to' - .' predict password reset tokens and take over your account.');?></p> + <p><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?><br/> + <?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p> </fieldset> <?php endif; ?> <?php if(!$_['htaccessWorking']): ?> <fieldset class="warning"> <legend><strong><?php echo $l->t('Security Warning');?></strong></legend> - <p><?php echo $l->t('Your data directory and files are probably accessible from the internet' - .' because the .htaccess file does not work.');?><br> - <?php echo $l->t('For information how to properly configure your server,' - .' please see the <a href="http://doc.owncloud.org/server/5.0/admin_manual/installation.html"' - .' target="_blank">documentation</a>.');?></p> + <p><?php echo $l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.');?><br> + <?php echo $l->t('For information how to properly configure your server, please see the <a href="http://doc.owncloud.org/server/5.0/admin_manual/installation.html" target="_blank">documentation</a>.');?></p> </fieldset> <?php endif; ?> <fieldset id="adminaccount"> diff --git a/core/templates/login.php b/core/templates/login.php index ba9a87b7d53..3be2b039b03 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -8,8 +8,7 @@ <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?> <li class="errors"> <?php echo $l->t('Automatic logon rejected!'); ?><br> - <small><?php echo $l->t('If you did not change your password recently,' - .' your account may be compromised!'); ?></small> + <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small> <br> <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small> </li> diff --git a/lib/setup.php b/lib/setup.php index 0c049841b2a..faf011fccb1 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -646,8 +646,7 @@ class OC_Setup { header("Location: ".OC::$WEBROOT.'/'); } else { - $error = $l->t('Your web server is not yet properly setup to allow files' - .' synchronization because the WebDAV interface seems to be broken.'); + $error = $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.'); $hint = $l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html'); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index e6f9e38189e..3a4a6093e77 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -102,10 +102,7 @@ if($_['displayNameChangeSupported']) { <legend><strong><?php echo $l->t('Version');?></strong></legend> <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br /> - <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>,' - .' the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed' - .' under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr' - .' title="Affero General Public License">AGPL</abbr></a>.'); ?> + <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?> </fieldset> |