diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-21 06:02:53 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-21 06:02:53 -0800 |
| commit | 418a9b11c41c950ed0969ded2b116ac8d75f3fe8 (patch) | |
| tree | 7c206992a44cfe423ef8f42b1204a26d6e204dc2 | |
| parent | a20c6049c396a2d3035dadb1398fe02e8ad43da7 (diff) | |
| parent | f2fe47bc2128ac98a8cc53a2b89f98223fa2f77e (diff) | |
| download | nextcloud-server-418a9b11c41c950ed0969ded2b116ac8d75f3fe8.tar.gz nextcloud-server-418a9b11c41c950ed0969ded2b116ac8d75f3fe8.zip | |
Merge pull request #5983 from owncloud/fixing-l10n-again-master
Fixing l10n again master
| -rw-r--r-- | core/templates/altmail.php | 3 | ||||
| -rw-r--r-- | core/templates/mail.php | 3 | ||||
| -rw-r--r-- | lib/private/files.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/core/templates/altmail.php b/core/templates/altmail.php index 00b67bee456..7776919ea34 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,7 +1,8 @@ <?php print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link']))); if ( isset($_['expiration']) ) { - print_unescaped($l->t("The share will expire on %s.\n\n", array($_['expiration']))); + print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); + print_unescaped('\n\n'); } p($l->t("Cheers!")); ?> diff --git a/core/templates/mail.php b/core/templates/mail.php index 40092f5491f..4fa54aa5283 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -14,7 +14,8 @@ <?php print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); if ( isset($_['expiration']) ) { - print_unescaped($l->t("The share will expire on %s.<br><br>", array($_['expiration']))); + p($l->t("The share will expire on %s.", array($_['expiration']))); + print_unescaped('<br><br>'); } p($l->t('Cheers!')); ?> diff --git a/lib/private/files.php b/lib/private/files.php index e76dd8644c1..8b8ff81ec5e 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -253,7 +253,7 @@ class OC_Files { header("HTTP/1.0 409 Conflict"); OC_Template::printErrorPage( $l->t('Selected files too large to generate zip file.'), - $l->t('Download the files in smaller chunks, seperately or kindly ask your administrator.') + $l->t('Please download the files separately in smaller chunks or kindly ask your administrator.') .'<br/><a href="javascript:history.back()">' . $l->t('Back to Files') . '</a>' ); |