diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-03-16 19:45:39 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-03-16 19:45:39 +0100 |
| commit | e685b541487b814cbab87ea2b6a6a4d12cd72f06 (patch) | |
| tree | 184cf3d29662b0fa1cc6ea8e0250c972abc25715 /app/i18n/en.php | |
| parent | dbdda1d0c19b48d06b30879e8fe78679f79cc0c4 (diff) | |
| parent | 996c387f50f9b65f271b3cd13b9d63165236b6d2 (diff) | |
Merge branch 'dev' into 163-export
Diffstat (limited to 'app/i18n/en.php')
| -rw-r--r-- | app/i18n/en.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php index 7f812dce6..e9bed39a7 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -89,7 +89,7 @@ return array ( 'already_subscribed' => 'You have already subscribed to <em>%s</em>', 'feed_added' => 'RSS feed <em>%s</em> has been added', 'feed_not_added' => '<em>%s</em> could not be added', - 'internal_problem_feed' => 'The RSS feed could not be added. Check FressRSS logs for details.', + 'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.', 'invalid_url' => 'URL <em>%s</em> is invalid', 'feed_actualized' => '<em>%s</em> has been updated', 'n_feeds_actualized' => '%d feeds have been updated', @@ -180,6 +180,8 @@ return array ( 'persona_connection_email' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>', 'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)', 'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles', + 'unsafe_autologin' => 'Allow unsafe automatic login using the format: ', + 'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>', 'auth_token' => 'Authentication token', 'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>', 'login_configuration' => 'Login', |