Finish to update i18n!!

See https://github.com/FreshRSS/FreshRSS/issues/334

3 files changed, 142 insertions, 110 deletions

diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 09f9fa9ce..13efb650b 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -2,28 +2,167 @@
 
 return array(
 	'archiving' => array(
+		'_' => 'Archiving',
+		'advanced' => 'Advanced',
+		'delete_after' => 'Remove articles after',
+		'help' => 'More options are available in the individual stream settings',
+		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'optimize' => 'Optimize database',
+		'optimize_help' => 'To do occasionally to reduce the size of the database',
+		'purge_now' => 'Purge now',
 		'title' => 'Archiving',
+		'ttl' => 'Do not automatically refresh more often than',
 	),
 	'display' => array(
+		'_' => 'Display',
+		'icon' => array(
+			'bottom_line' => 'Bottom line',
+			'entry' => 'Article icons',
+			'publication_date' => 'Date of publication',
+			'related_tags' => 'Related tags',
+			'sharing' => 'Sharing',
+			'top_line' => 'Top line',
+		),
+		'language' => 'Language',
+		'notif_html5' => array(
+			'seconds' => 'seconds (0 means no timeout)',
+			'timeout' => 'HTML5 notification timeout',
+		),
+		'theme' => 'Theme',
 		'title' => 'Display',
+		'width' => array(
+			'content' => 'Content width',
+			'large' => 'Large',
+			'medium' => 'Medium',
+			'no_limit' => 'No limit',
+			'thin' => 'Thin',
+		),
 	),
 	'query' => array(
+		'_' => 'User queries',
+		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
+		'filter' => 'Filter applied:',
+		'get_all' => 'Display all articles',
+		'get_category' => 'Display "%s" category',
+		'get_favorite' => 'Display favorite articles',
+		'get_feed' => 'Display "%s" feed',
+		'no_filter' => 'No filter',
+		'none' => 'You haven’t created any user query yet.',
 		'number' => 'Query n°%d',
+		'order_asc' => 'Display oldest articles first',
+		'order_desc' => 'Display newest articles first',
+		'search' => 'Search for "%s"',
+		'state_0' => 'Display all articles',
+		'state_1' => 'Display read articles',
+		'state_2' => 'Display unread articles',
+		'state_3' => 'Display all articles',
+		'state_4' => 'Display favorite articles',
+		'state_5' => 'Display read favorite articles',
+		'state_6' => 'Display unread favorite articles',
+		'state_7' => 'Display favorite articles',
+		'state_8' => 'Display not favorite articles',
+		'state_9' => 'Display read not favorite articles',
+		'state_10' => 'Display unread not favorite articles',
+		'state_11' => 'Display not favorite articles',
+		'state_12' => 'Display all articles',
+		'state_13' => 'Display read articles',
+		'state_14' => 'Display unread articles',
+		'state_15' => 'Display all articles',
 		'title' => 'User queries',
 	),
 	'profile' => array(
+		'_' => 'Profile management',
+		'email_persona' => 'Login mail 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>',
 		'title' => 'Profile',
 	),
 	'reading' => array(
+		'_' => 'Reading',
+		'after_onread' => 'After “mark all as read”,',
+		'articles_per_page' => 'Number of articles per page',
+		'auto_load_more' => 'Load next articles at the page bottom',
+		'auto_remove_article' => 'Hide articles after reading',
+		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',
+		'display_articles_unfolded' => 'Show articles unfolded by default',
+		'display_categories_unfolded' => 'Show categories folded by default',
+		'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
+		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
+		'jump_next' => 'jump to next unread sibling (feed or category)',
+		'number_divided_when_reader' => 'Divided by 2 in the reading view.',
+		'read' => array(
+			'article_open_on_website' => 'when article is opened on its original website',
+			'article_viewed' => 'when article is viewed',
+			'scroll' => 'while scrolling',
+			'upon_reception' => 'upon reception of the article',
+			'when' => 'Mark article as read…',
+		),
+		'show' => array(
+			'_' => 	'Articles to display',
+			'adaptive' => 'Adjust showing',
+			'all_articles' => 'Show all articles',
+			'unread' => 'Show only unread',
+		),
+		'sort' => array(
+			'_' => 'Sort order',
+			'newer_first' => 'Newer first',
+			'older_first' => 'Oldest first',
+		),
+		'sticky_post' => 'Stick the article to the top when opened',
 		'title' => 'Reading',
+		'view' => array(
+			'default' => 'Default view',
+			'global' => 'Global view',
+			'normal' => 'Normal view',
+			'reader' => 'Reading view',
+		),
 	),
 	'sharing' => array(
+		'_' => 'Sharing',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'More information',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Share name to display',
+		'share_url' => 'Share URL to use',
 		'title' => 'Sharing',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
+		'_' => 'Shortcuts',
+		'article_action' => 'Article actions',
+		'auto_share' => 'Share',
+		'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
+		'close_dropdown' => 'Close menus',
+		'collapse_article' => 'Collapse',
+		'first_article' => 'Skip to the first article',
+		'focus_search' => 'Access search box',
+		'help' => 'Display documentation',
+		'javascript' => 'JavaScript must be enabled in order to use shortcuts',
+		'last_article' => 'Skip to the last article',
+		'load_more' => 'Load more articles',
+		'mark_read' => 'Mark as read',
+		'mark_favorite' => 'Mark as favourite',
+		'navigation' => 'Navigation',
+		'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
+		'next_article' => 'Skip to the next article',
+		'other_action' => 'Other actions',
+		'previous_article' => 'Skip to the previous article',
+		'see_on_website' => 'See on original website',
+		'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
 		'title' => 'Shortcuts',
+		'user_filter' => 'Access user filters',
+		'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'current' => 'Current user',
+		'is_admin' => 'is administrator',
+		'users' => 'Users',
 	),
 );
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 5459b83e1..43f94f1bc 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -140,111 +140,4 @@ return array(
 		'or' => 'or',
 		'yes' => 'Yes',
 	),
-
-	'after_onread' => 'After “mark all as read”,',
-	'archiving_configuration_help' => 'More options are available in the individual stream settings',
-	'article_icons' => 'Article icons',
-	'article_open_on_website' => 'when article is opened on its original website',
-	'article_published_on' => 'This article originally appeared on <a href="%s">%s</a>',
-	'article_published_on_author' => 'This article originally appeared on <a href="%s">%s</a> by %s',
-	'article_viewed' => 'when article is viewed',
-	'articles_per_page' => 'Number of articles per page',
-	'articles_to_display' => 'Articles to display',
-	'auto_load_more' => 'Load next articles at the page bottom',
-	'auto_read_when' => 'Mark article as read…',
-	'auto_remove_article' => 'Hide articles after reading',
-	'auto_share' => 'Share',
-	'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
-	'bottom_line' => 'Bottom line',
-	'categories' => 'Categories',
-	'categories_management' => 'Categories management',
-	'categories_updated' => 'Categories have been updated',
-	'collapse_article' => 'Collapse',
-	'content_width' => 'Content width',
-	'current_user' => 'Current user',
-	'default_view' => 'Default view',
-	'delete_articles_every' => 'Remove articles after',
-	'display_articles_unfolded' => 'Show articles unfolded by default',
-	'display_categories_unfolded' => 'Show categories folded by default',
-	'display_configuration' => 'Display',
-	'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
-	'first_article' => 'Skip to the first article',
-	'focus_search' => 'Access search box',
-	'help' => 'Display documentation',
-	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
-	'html5_notif_timeout' => 'HTML5 notification timeout',
-	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
-	'is_admin' => 'is administrator',
-	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
-	'jump_next' => 'jump to next unread sibling (feed or category)',
-	'last_article' => 'Skip to the last article',
-	'login_required' => 'Login required:',
-	'more_information' => 'More information',
-	'next_article' => 'Skip to the next article',
-	'no_feed_actualized' => 'No RSS feed has been updated',
-	'no_query' => 'You haven’t created any user query yet.',
-	'no_query_filter' => 'No filter',
-	'no_rss_feed' => 'No RSS feed',
-	'not_yet_implemented' => 'Not yet implemented',
-	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
-	'number_feeds' => '%d feeds',
-	'optimize_bdd' => 'Optimize database',
-	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
-	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
-	'previous_article' => 'Skip to the previous article',
-	'previous_page' => 'Skip to the previous page',
-	'public' => 'Public',
-	'publication_date' => 'Date of publication',
-	'purge_now' => 'Purge now',
-	'query_deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
-	'query_filter' => 'Filter applied:',
-	'query_get_all' => 'Display all articles',
-	'query_get_category' => 'Display "%s" category',
-	'query_get_favorite' => 'Display favorite articles',
-	'query_get_feed' => 'Display "%s" feed',
-	'query_order_asc' => 'Display oldest articles first',
-	'query_order_desc' => 'Display newest articles first',
-	'query_search' => 'Search for "%s"',
-	'query_state_0' => 'Display all articles',
-	'query_state_1' => 'Display read articles',
-	'query_state_2' => 'Display unread articles',
-	'query_state_3' => 'Display all articles',
-	'query_state_4' => 'Display favorite articles',
-	'query_state_5' => 'Display read favorite articles',
-	'query_state_6' => 'Display unread favorite articles',
-	'query_state_7' => 'Display favorite articles',
-	'query_state_8' => 'Display not favorite articles',
-	'query_state_9' => 'Display read not favorite articles',
-	'query_state_10' => 'Display unread not favorite articles',
-	'query_state_11' => 'Display not favorite articles',
-	'query_state_12' => 'Display all articles',
-	'query_state_13' => 'Display read articles',
-	'query_state_14' => 'Display unread articles',
-	'query_state_15' => 'Display all articles',
-	'random_string' => 'Random string',
-	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
-	'scroll' => 'while scrolling',
-	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
-	'see_on_website' => 'See on original website',
-	'share_name' => 'Share name to display',
-	'share_url' => 'Share URL to use',
-	'sharing_management' => 'Sharing options management',
-	'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
-	'shortcuts_article_action' => 'Article actions',
-	'shortcuts_navigation' => 'Navigation',
-	'shortcuts_navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
-	'shortcuts_other_action' => 'Other actions',
-	'show_adaptive' => 'Adjust showing',
-	'show_all_articles' => 'Show all articles',
-	'sort_order' => 'Sort order',
-	'sticky_post' => 'Stick the article to the top when opened',
-	'theme' => 'Theme',
-	'top_line' => 'Top line',
-	'upon_reception' => 'upon reception of the article',
-	'user_filter' => 'Access user filters',
-	'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
-	'width_large' => 'Large',
-	'width_medium' => 'Medium',
-	'width_no_limit' => 'No limit',
-	'width_thin' => 'Thin',
 );
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index cf2c542e6..62d6342e9 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -6,7 +6,7 @@ return array(
 		'advanced' => 'Avancé',
 		'delete_after' => 'Supprimer les articles après',
 		'help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
-		'keep_history_by_feed' => 'Nombre minimum d’articles à conserver',
+		'keep_history_by_feed' => 'Nombre minimum d’articles à conserver par flux',
 		'optimize' => 'Optimiser la base de données',
 		'optimize_help' => 'À faire de temps en temps pour réduire la taille de la BDD',
 		'purge_now' => 'Purger maintenant',
@@ -24,12 +24,12 @@ return array(
 			'top_line' => 'Ligne du haut',
 		),
 		'language' => 'Langue',
-		'title' => 'Affichage',
 		'notif_html5' => array(
 			'seconds' => 'secondes (0 signifie aucun timeout)',
 			'timeout' => 'Temps d’affichage de la notification HTML5',
 		),
 		'theme' => 'Thème',
+		'title' => 'Affichage',
 		'width' => array(
 			'content' => 'Largeur du contenu',
 			'large' => 'Large',
@@ -46,9 +46,9 @@ return array(
 		'get_category' => 'Afficher la catégorie "%s"',
 		'get_favorite' => 'Afficher les articles favoris',
 		'get_feed' => 'Afficher le flux "%s"',
-		'number' => 'Filtre n°%d',
 		'no_filter' => 'Aucun filtre appliqué',
 		'none' => 'Vous n’avez pas encore créé de filtre.',
+		'number' => 'Filtre n°%d',
 		'order_asc' => 'Afficher les articles les plus anciens en premier',
 		'order_desc' => 'Afficher les articles les plus récents en premier',
 		'search' => 'Recherche de "%s"',