diff options
| author | rakekniven <mark.ziegler@rakekniven.de> | 2017-05-26 21:32:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 21:32:38 +0200 |
| commit | 829ca8fa359cc1e10713af3bc7a30eb21942d974 (patch) | |
| tree | c1f10b0d76dfa8963b9c6e885be11228f2b663b6 | |
| parent | 2110e7bc053a4582c8f477eb9caa88a2c771f907 (diff) | |
| parent | 2b40b20dccbae909abce50e7de7bf888c075ce96 (diff) | |
Merge pull request #162 from nextcloud/rakekniven-patch-1
Rakekniven patch 1
| -rw-r--r-- | templates/admin.php | 2 | ||||
| -rw-r--r-- | templates/part.content.warnings.php | 4 | ||||
| -rw-r--r-- | templates/part.settings.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/templates/admin.php b/templates/admin.php index bf4d54517..cf69c33de 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -48,7 +48,7 @@ style('news', 'admin'); "feed which won't be deleted by the cleanup job; ". 'if old articles reappear after being read, increase ' . 'this value; negative values such as -1 will turn this ' . - 'feature off completely' + 'feature off' )); ?></em> </p> <p><input type="text" name="news-auto-purge-count" diff --git a/templates/part.content.warnings.php b/templates/part.content.warnings.php index 68f3942c2..50fa1f7f6 100644 --- a/templates/part.content.warnings.php +++ b/templates/part.content.warnings.php @@ -26,7 +26,7 @@ <?php if ($_['warnings']['incorrectDbCharset']) { ?> <news-instant-notification id="cron-warning"> - <p><?php p($l->t('Non UTF-8 charset for MySql/MariaDb database detected!')); ?></p> + <p><?php p($l->t('Non UTF-8 charset for MySQL/MariaDB database detected!')); ?></p> <ul> <li> <a href="https://dba.stackexchange.com/a/21684" @@ -39,4 +39,4 @@ </li> </ul> </news-instant-notification> -<?php }; ?>
\ No newline at end of file +<?php }; ?> diff --git a/templates/part.settings.php b/templates/part.settings.php index fbb2a5b19..b3a1b541e 100644 --- a/templates/part.settings.php +++ b/templates/part.settings.php @@ -92,7 +92,7 @@ <p class="error" ng-show="Settings.opmlImportError"> <?php p( - $l->t('Error when importing: file does not contain valid OPML') + $l->t('Error when importing: File does not contain valid OPML') ); ?> </p> <p class="error" ng-show="Settings.opmlImportEmptyError"> |