diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-18 17:49:40 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-18 17:49:40 +0200 |
| commit | 6c2bebaff2de459dc6861d6427cf4f4ac2d55872 (patch) | |
| tree | 785748f239d1160ee933d67a5ad99f9ad7d9416a /app/i18n/en/conf.php | |
| parent | 98773aca590fb105e6c112417a6e7786331c5a86 (diff) | |
| parent | 9b69ec4b3194a82f9c3b0d5ee513a2acdcea74eb (diff) | |
Merge branch 'FreshRSS/dev' into PubSubHubbub
Diffstat (limited to 'app/i18n/en/conf.php')
| -rw-r--r-- | app/i18n/en/conf.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index 683781696..42a06906d 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -5,9 +5,9 @@ return array( '_' => 'Archiving', 'advanced' => 'Advanced', 'delete_after' => 'Remove articles after', - 'help' => 'More options are available in the individual stream settings', + 'help' => 'More options are available in the individual feed settings', 'keep_history_by_feed' => 'Minimum number of articles to keep by feed', - 'optimize' => 'Optimize database', + 'optimize' => 'Optimise database', 'optimize_help' => 'To do occasionally to reduce the size of the database', 'purge_now' => 'Purge now', 'title' => 'Archiving', @@ -72,7 +72,7 @@ return array( ), 'profile' => array( '_' => 'Profile management', - 'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>', + 'email_persona' => 'Login email address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>', 'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>', 'password_form' => 'Password<br /><small>(for the Web-form login method)</small>', 'password_format' => 'At least 7 characters', |