diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-02-15 16:04:18 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-02-21 23:47:56 +0100 |
| commit | 19c5213b53fbddc2a2b61e0ad35cda6ce5002bb5 (patch) | |
| tree | 8f7a54fccdc8a9b5780a541a5a6fbe14142e7a1d /core | |
| parent | 83f161d3f964a48f6dbe92e69233575b1984c547 (diff) | |
| download | nextcloud-server-19c5213b53fbddc2a2b61e0ad35cda6ce5002bb5.tar.gz nextcloud-server-19c5213b53fbddc2a2b61e0ad35cda6ce5002bb5.zip | |
Join split translated strings
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/installation.php | 13 | ||||
| -rw-r--r-- | core/templates/login.php | 3 |
2 files changed, 5 insertions, 11 deletions
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> |