Fix i18n for subscription pages

1 files changed, 18 insertions, 44 deletions

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 17fef12c7..a3c409c31 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -2,12 +2,19 @@
 
 return array(
 	'action' => array(
+		'actualize' => 'Actualize',
 		'back_to_rss_feeds' => '← Go back to your RSS feeds',
+		'cancel' => 'Cancel',
 		'disable' => 'Disable',
+		'empty' => 'Empty',
 		'enable' => 'Enable',
 		'filter' => 'Filtrer',
 		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
 		'remove' => 'Remove',
+		'see_website' => 'See website',
+		'submit' => 'Submit',
+		'truncate' => 'Delete all articles',
 	),
 	'auth' => array(
 		'login' => 'Login',
@@ -103,8 +110,18 @@ return array(
 		'nothing_to_load' => 'There are no more articles',
 		'previous' => 'Previous',
 	),
+	'short' => array(
+		'attention' => 'Attention!',
+		'blank_to_disable' => 'Leave blank to disable',
+		'by_default' => 'By default',
+		'damn' => 'Damn!',
+		'no' => 'No',
+		'ok' => 'Ok!',
+		'oops' => 'Oops!',
+		'or' => 'or',
+		'yes' => 'Yes',
+	),
 	'title' => array(
-		'_' => 'Title',
 		'authentication' => 'Authentication',
 		'check_install' => 'Installation checking',
 		'user_management' => 'Manage users',
@@ -112,12 +129,7 @@ return array(
 	),
 	'freshrss' => 'FreshRSS',
 	'access_denied' => 'You don’t have permission to access this page',
-	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
 	'activate_sharing' => 'Activate sharing',
-	'add_category' => 'Add a category',
-	'add_rss_feed' => 'Add a RSS feed',
-	'administration' => 'Manage',
-	'advanced' => 'Advanced',
 	'after_onread' => 'After “mark all as read”,',
 	'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
 	'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
@@ -133,8 +145,6 @@ return array(
 	'articles' => 'articles',
 	'articles_per_page' => 'Number of articles per page',
 	'articles_to_display' => 'Articles to display',
-	'ask_empty' => 'Clear?',
-	'attention' => 'Attention!',
 	'auth_form' => 'Web form (traditional, requires JavaScript)',
 	'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
 	'auth_form_set' => 'Form is now your default authentication system.',
@@ -159,20 +169,16 @@ return array(
 	'bdd_conf_is_ok' => 'Database configuration has been saved.',
 	'bdd_configuration' => 'Database configuration',
 	'bdd_type' => 'Type of database',
-	'blank_to_disable' => 'Leave blank to disable',
 	'bottom_line' => 'Bottom line',
 	'by' => 'by',
-	'by_default' => 'By default',
 	'by_email' => 'By email',
 	'by_feed' => 'by feed',
 	'cache_is_ok' => 'Permissions on cache directory are good',
 	'can_not_be_deleted' => 'Cannot be deleted',
-	'cancel' => 'Cancel',
 	'categories' => 'Categories',
 	'categories_management' => 'Categories management',
 	'categories_updated' => 'Categories have been updated',
 	'categorize' => 'Store in a category',
-	'category' => 'Category',
 	'category_created' => 'Category %s has been created.',
 	'category_deleted' => 'Category has been deleted.',
 	'category_emptied' => 'Category has been emptied',
@@ -192,18 +198,15 @@ return array(
 	'content_width' => 'Content width',
 	'create' => 'Create',
 	'create_user' => 'Create new user',
-	'css_path_on_website' => 'Articles CSS path on original website',
 	'ctype_is_nok' => 'You lack a required library for character type checking (php-ctype)',
 	'ctype_is_ok' => 'You have the required library for character type checking (ctype)',
 	'curl_is_nok' => 'You lack cURL (php5-curl package)',
 	'curl_is_ok' => 'You have version %s of cURL',
 	'current_user' => 'Current user',
-	'damn' => 'Damn!',
 	'data_is_ok' => 'Permissions on data directory are good',
 	'default_category' => 'Uncategorized',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
 	'default_view' => 'Default view',
-	'delete' => 'Delete',
 	'delete_articles_every' => 'Remove articles after',
 	'display_articles_unfolded' => 'Show articles unfolded by default',
 	'display_categories_unfolded' => 'Show categories folded by default',
@@ -212,7 +215,6 @@ return array(
 	'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
 	'dom_is_ok' => 'You have the required library to browse the DOM',
 	'error_occurred' => 'An error occurred',
-	'error_occurred_update' => 'Nothing was changed',
 	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'export' => 'Export',
 	'export_no_zip_extension' => 'Zip extension is not present on your server. Please try to export files one by one.',
@@ -223,20 +225,13 @@ return array(
 	'feed_actualized' => '<em>%s</em> has been updated',
 	'feed_added' => 'RSS feed <em>%s</em> has been added',
 	'feed_deleted' => 'Feed has been deleted',
-	'feed_description' => 'Description',
-	'feed_empty' => 'This feed is empty. Please verify that it is still maintained.',
-	'feed_in_error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
 	'feed_list' => 'List of %s articles',
 	'feed_not_added' => '<em>%s</em> could not be added',
-	'feed_updated' => 'Feed has been updated',
-	'feed_url' => 'Feed URL',
-	'feed_validator' => 'Check the validity of the feed',
 	'feeds' => 'Feeds',
 	'feeds_actualized' => 'RSS feeds have been updated',
 	'feeds_imported' => 'Your feeds have been imported and will now be updated',
 	'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',
 	'feeds_marked_read' => 'Feeds have been marked as read',
-	'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
 	'file_cannot_be_uploaded' => 'File cannot be uploaded!',
 	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
@@ -253,14 +248,10 @@ return array(
 	'host' => 'Host',
 	'html5_notif_timeout' => 'HTML5 notification timeout',
 	'http_auth' => 'HTTP (for advanced users with HTTPS)',
-	'http_authentication' => 'HTTP Authentication',
-	'http_password' => 'HTTP password',
 	'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
 	'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
-	'http_username' => 'HTTP username',
 	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
 	'import' => 'Import',
-	'informations' => 'Information',
 	'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
 	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
 	'installation_step' => 'Installation — step %d · FreshRSS',
@@ -272,13 +263,11 @@ return array(
 	'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
 	'javascript_should_be_activated' => 'JavaScript must be enabled',
 	'jump_next' => 'jump to next unread sibling (feed or category)',
-	'keep_history' => 'Minimum number of articles to keep',
 	'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
 	'language' => 'Language',
 	'language_defined' => 'Language has been defined.',
 	'last_article' => 'Skip to the last article',
 	'log_is_ok' => 'Permissions on logs directory are good',
-	'login_configuration' => 'Login',
 	'login_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
@@ -291,11 +280,9 @@ return array(
 	'more_information' => 'More information',
 	'n_entries_deleted' => '%d articles have been deleted',
 	'n_feeds_actualized' => '%d feeds have been updated',
-	'new_category' => 'New category',
 	'next_article' => 'Skip to the next article',
 	'next_page' => 'Skip to the next page',
 	'next_step' => 'Go to the next step',
-	'no' => 'No',
 	'no_feed_actualized' => 'No RSS feed has been updated',
 	'no_feed_to_refresh' => 'There is no feed to refresh…',
 	'no_query' => 'You haven’t created any user query yet.',
@@ -309,12 +296,9 @@ return array(
 	'not_yet_implemented' => 'Not yet implemented',
 	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
 	'number_feeds' => '%d feeds',
-	'ok' => 'Ok!',
-	'oops' => 'Oops!',
 	'optimization_complete' => 'Optimization complete',
 	'optimize_bdd' => 'Optimize database',
 	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
-	'or' => 'or',
 	'page_not_found' => 'You are looking for a page which doesn’t exist',
 	'password' => 'Password',
 	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
@@ -363,10 +347,6 @@ return array(
 	'query_state_15' => 'Display all articles',
 	'random_string' => 'Random string',
 	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
-	'refresh' => 'Refresh',
-	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
-	'rss_feed_management' => 'RSS feeds management',
-	'save' => 'Save',
 	'scroll' => 'while scrolling',
 	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
 	'see_on_website' => 'See on original website',
@@ -381,17 +361,13 @@ return array(
 	'shortcuts_updated' => 'Shortcuts have been updated',
 	'show_adaptive' => 'Adjust showing',
 	'show_all_articles' => 'Show all articles',
-	'show_in_all_flux' => 'Show in main stream',
 	'sort_order' => 'Sort order',
 	'starred_list' => 'List of favourite articles',
 	'steps' => 'Steps',
 	'sticky_post' => 'Stick the article to the top when opened',
-	'submit' => 'Submit',
 	'theme' => 'Theme',
 	'this_is_the_end' => 'This is the end',
 	'top_line' => 'Top line',
-	'truncate' => 'Delete all articles',
-	'ttl' => 'Do not automatically refresh more often than',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
 	'update_can_apply' => 'An update is available.',
@@ -415,12 +391,10 @@ return array(
 	'users' => 'Users',
 	'users_list' => 'List of users',
 	'version_update' => 'Update',
-	'website_url' => 'Website URL',
 	'width_large' => 'Large',
 	'width_medium' => 'Medium',
 	'width_no_limit' => 'No limit',
 	'width_thin' => 'Thin',
-	'yes' => 'Yes',
 	'your_diaspora_pod' => 'Your Diaspora* pod',
 	'your_shaarli' => 'Your Shaarli',
 	'your_wallabag' => 'Your wallabag',