aboutsummaryrefslogtreecommitdiff
path: root/app/i18n/en/conf.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/i18n/en/conf.php')
-rw-r--r--app/i18n/en/conf.php15
1 files changed, 12 insertions, 3 deletions
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index fde78f5b5..2d4e06550 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -3,13 +3,21 @@
return array(
'archiving' => array(
'_' => 'Archiving',
- 'advanced' => 'Advanced',
'delete_after' => 'Remove articles after',
+ 'exception' => 'Purge exception',
'help' => 'More options are available in the individual feed settings',
- 'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+ 'keep_favourites' => 'Never delete favourites',
+ 'keep_min_by_feed' => 'Minimum number of articles to keep by feed',
+ 'keep_labels' => 'Never delete labels',
+ 'keep_unreads' => 'Never delete unreads',
+ 'maintenance' => 'Maintenance',
'optimize' => 'Optimise database',
'optimize_help' => 'Do occasionally to reduce the size of the database',
+ 'policy' => 'Purge policy',
+ 'policy_warning' => 'If no purge policy is selected, every article will be kept.',
'purge_now' => 'Purge now',
+ 'keep_max' => 'Maximum number of articles to keep',
+ 'keep_period' => 'Maximum age of articles to keep',
'title' => 'Archiving',
'ttl' => 'Do not automatically refresh more often than',
),
@@ -21,6 +29,7 @@ return array(
'publication_date' => 'Date of publication',
'related_tags' => 'Article tags',
'sharing' => 'Sharing',
+ 'display_authors' => 'Authors',
'top_line' => 'Top line',
),
'language' => 'Language',
@@ -45,6 +54,7 @@ return array(
'_' => 'Account deletion',
'warn' => 'Your account and all related data will be deleted.',
),
+ 'email' => 'Email address',
'password_api' => 'API password<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',
@@ -133,7 +143,6 @@ return array(
'diaspora' => 'Diaspora*',
'email' => 'Email',
'facebook' => 'Facebook',
- 'g+' => 'Google+',
'more_information' => 'More information',
'print' => 'Print',
'remove' => 'Remove sharing method',