Fix french i18n for auth and configure views

app/i18n/en/admin.php

@@ -2,8 +2,19 @@
 
 return array(
 	'auth' => array(
+		'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
+		'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
+		'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
+		'form' => 'Web form (traditional, requires JavaScript)',
+		'http' => 'HTTP (for advanced users with HTTPS)',
+		'none' => 'None (dangerous)',
+		'persona' => 'Mozilla Persona (modern, requires JavaScript)',
 		'title' => 'Authentication',
 		'title_reset' => 'Authentication reset',
+		'token' => 'Authentication token',
+		'token_help' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
+		'type' => 'Authentication method',
+		'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	),
 	'check_install' => array(
 		'cache' => array(

app/i18n/en/gen.php

@@ -19,8 +19,16 @@ return array(
 		'truncate' => 'Delete all articles',
 	),
 	'auth' => array(
+		'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
 		'login' => 'Login',
+		'login_persona' => 'Login with Persona',
+		'login_persona_problem' => 'Connection problem with Persona?',
 		'logout' => 'Logout',
+		'password' => 'Password',
+		'reset' => 'Authentication reset',
+		'username' => 'Username',
+		'username_admin' => 'Administrator username',
+		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
 	),
 	'date' => array(
 		'Apr' => '\\A\\p\\r\\i\\l',
@@ -76,6 +84,10 @@ return array(
 		'wed' => 'Wed',
 		'yesterday' => 'Yesterday',
 	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'About FreshRSS',
+	),
 	'js' => array(
 		'category_empty' => 'Empty category',
 		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
@@ -83,6 +95,7 @@ return array(
 		'new_article' => 'There are new available articles, click to refresh the page.',
 		'notif_body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
 		'notif_title_new_articles' => 'FreshRSS: new articles!',
+		'should_be_activated' => 'JavaScript must be enabled',
 	),
 	'menu' => array(
 		'about' => 'About',
@@ -123,12 +136,9 @@ return array(
 		'or' => 'or',
 		'yes' => 'Yes',
 	),
-	'freshrss' => 'FreshRSS',
+
 	'activate_sharing' => 'Activate sharing',
 	'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',
-	'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
 	'archiving_configuration_help' => 'More options are available in the individual stream settings',
 	'article' => 'Article',
 	'article_icons' => 'Article icons',
@@ -139,12 +149,6 @@ return array(
 	'articles' => 'articles',
 	'articles_per_page' => 'Number of articles per page',
 	'articles_to_display' => 'Articles to display',
-	'auth_form' => 'Web form (traditional, requires JavaScript)',
-	'auth_none' => 'None (dangerous)',
-	'auth_persona' => 'Mozilla Persona (modern, requires JavaScript)',
-	'auth_token' => 'Authentication token',
-	'auth_type' => 'Authentication method',
-	'auth_will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
 	'author' => 'Author',
 	'auto_load_more' => 'Load next articles at the page bottom',
 	'auto_read_when' => 'Mark article as read…',
@@ -193,7 +197,6 @@ return array(
 	'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
 	'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',
-	'explain_token' => 'Allows to access RSS output of the default user without authentication.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
 	'feed' => 'Feed',
 	'feeds' => 'Feeds',
@@ -208,7 +211,6 @@ return array(
 	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
 	'host' => 'Host',
 	'html5_notif_timeout' => 'HTML5 notification timeout',
-	'http_auth' => 'HTTP (for advanced users with HTTPS)',
 	'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.',
 	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
@@ -218,16 +220,12 @@ return array(
 	'is_admin' => 'is administrator',
 	'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
 	'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_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_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
-	'login_with_persona' => 'Login with Persona',
 	'mark_cat_read' => 'Mark category as read',
 	'mark_favorite' => 'Mark as favourite',
 	'mark_feed_read' => 'Mark feed as read',
@@ -250,7 +248,6 @@ return array(
 	'number_feeds' => '%d feeds',
 	'optimize_bdd' => 'Optimize database',
 	'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
-	'password' => 'Password',
 	'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
 	'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 	'pcre_is_nok' => 'You lack a required library for regular expressions (php-pcre)',
@@ -313,7 +310,6 @@ return array(
 	'theme' => 'Theme',
 	'this_is_the_end' => 'This is the end',
 	'top_line' => 'Top line',
-	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
 	'update_check' => 'Check for new updates',
 	'update_end' => 'Update process is completed, now you can go to the final step.',
@@ -324,8 +320,6 @@ return array(
 	'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.',
-	'username' => 'Username',
-	'username_admin' => 'Administrator username',
 	'users' => 'Users',
 	'users_list' => 'List of users',
 	'version_update' => 'Update',

app/i18n/en/index.php

@@ -47,14 +47,14 @@ return array(
 		'normal_view' => 'Normal view',
 		'older_first' => 'Oldest first',
 		'queries' => 'User queries',
-		'read' => 'Show only unread',
+		'read' => 'Show only read',
 		'reader_view' => 'Reading view',
 		'rss_view' => 'RSS feed',
 		'search_short' => 'Search',
 		'starred' => 'Show only favorites',
 		'stats' => 'Statistics',
 		'subscription' => 'Subscriptions management',
-		'unread' => 'Show only read',
+		'unread' => 'Show only unread',
 	),
 	'share' => array(
 		'_' => 'Share',

app/i18n/fr/admin.php

@@ -2,8 +2,19 @@
 
 return array(
 	'auth' => array(
+		'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
+		'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
+		'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
+		'form' => 'Formulaire (traditionnel, requiert JavaScript)',
+		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
+		'none' => 'Aucune (dangereux)',
+		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
 		'title' => 'Authentification',
 		'title_reset' => 'Réinitialisation de l’authentification',
+		'token' => 'Jeton d’identification',
+		'token_help' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
+		'type' => 'Méthode d’authentification',
+		'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	),
 	'check_install' => array(
 		'cache' => array(

app/i18n/fr/conf.php

@@ -2,28 +2,161 @@
 
 return array(
 	'archiving' => array(
+		'_' => 'Archivage',
+		'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',
+		'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',
 		'title' => 'Archivage',
+		'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
 	),
 	'display' => array(
+		'_' => 'Affichage',
+		'icon' => array(
+			'bottom_line' => 'Ligne du bas',
+			'entry' => 'Icônes d’article',
+			'publication_date' => 'Date de publication',
+			'related_tags' => 'Tags associés',
+			'sharing' => 'Partage',
+			'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',
+		'width' => array(
+			'content' => 'Largeur du contenu',
+			'large' => 'Large',
+			'medium' => 'Moyenne',
+			'no_limit' => 'Pas de limite',
+			'thin' => 'Fine',
+		),
 	),
 	'query' => array(
+		'_' => 'Filtres utilisateurs',
+		'deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
+		'filter' => 'Filtres appliqués :',
+		'get_all' => 'Afficher tous les articles',
+		'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.',
+		'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"',
+		'state_0' => 'Afficher tous les articles',
+		'state_1' => 'Afficher les articles lus',
+		'state_2' => 'Afficher les articles non lus',
+		'state_3' => 'Afficher tous les articles',
+		'state_4' => 'Afficher les articles favoris',
+		'state_5' => 'Afficher les articles lus et favoris',
+		'state_6' => 'Afficher les articles non lus et favoris',
+		'state_7' => 'Afficher les articles favoris',
+		'state_8' => 'Afficher les articles non favoris',
+		'state_9' => 'Afficher les articles lus et non favoris',
+		'state_10' => 'Afficher les articles non lus et non favoris',
+		'state_11' => 'Afficher les articles non favoris',
+		'state_12' => 'Afficher tous les articles',
+		'state_13' => 'Afficher les articles lus',
+		'state_14' => 'Afficher les articles non lus',
+		'state_15' => 'Afficher tous les articles',
 		'title' => 'Filtres utilisateurs',
 	),
 	'profile' => array(
 		'title' => 'Profil',
 	),
 	'reading' => array(
+		'_' => 'Lecture',
+		'after_onread' => 'Après “marquer tout comme lu”,',
+		'articles_per_page' => 'Nombre d’articles par page',
+		'auto_load_more' => 'Charger les articles suivants en bas de page',
+		'auto_remove_article' => 'Cacher les articles après lecture',
+		'confirm_enabled' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
+		'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
+		'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
+		'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
+		'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
+		'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
+		'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
+		'read' => array(
+			'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
+			'article_viewed' => 'lorsque l’article est affiché',
+			'scroll' => 'au défilement de la page',
+			'upon_reception' => 'dès la réception du nouvel article',
+			'when' => 'Marquer un article comme lu…',
+		),
+		'show' => array(
+			'_' => 'Articles à afficher',
+			'adaptive' => 'Adapter l’affichage',
+			'all_articles' => 'Afficher tous les articles',
+			'unread' => 'Afficher les non lus',
+		),
+		'sort' => array(
+			'_' => 'Ordre de tri',
+			'newer_first' => 'Plus récents en premier',
+			'older_first' => 'Plus anciens en premier',
+		),
+		'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
 		'title' => 'Lecture',
+		'view' => array(
+			'default' => 'Vue par défaut',
+			'global' => 'Vue globale',
+			'normal' => 'Vue normale',
+			'reader' => 'Vue lecture',
+		),
 	),
 	'sharing' => array(
+		'_' => 'Partage',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Plus d’informations',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Nom du partage à afficher',
+		'share_url' => 'URL du partage à utiliser',
 		'title' => 'Partage',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
+		'_' => 'Raccourcis',
+		'article_action' => 'Actions associées à l’article courant',
+		'auto_share' => 'Partager',
+		'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
+		'close_dropdown' => 'Fermer les menus',
+		'collapse_article' => 'Refermer',
+		'first_article' => 'Passer au premier article',
+		'focus_search' => 'Accéder à la recherche',
+		'help' => 'Afficher la documentation',
+		'last_article' => 'Passer au dernier article',
+		'load_more' => 'Charger plus d’articles',
+		'mark_read' => 'Marquer comme lu',
+		'mark_favorite' => 'Mettre en favori',
+		'navigation' => 'Navigation',
+		'navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
+		'next_article' => 'Passer à l’article suivant',
+		'other_action' => 'Autres actions',
+		'previous_article' => 'Passer à l’article précédent',
+		'see_on_website' => 'Voir sur le site d’origine',
+		'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
 		'title' => 'Raccourcis',
+		'user_filter' => 'Accéder aux filtres utilisateur',
+		'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
+		'current' => 'Utilisateur actuel',
+		'users' => 'Utilisateurs',
 	),
 );

app/i18n/fr/gen.php

@@ -13,14 +13,23 @@ return array(
 		'import' => 'Importer',
 		'manage' => 'Gérer',
 		'mark_read' => 'Marquer comme lu',
+		'mark_favorite' => 'Mettre en favori',
 		'remove' => 'Supprimer',
 		'see_website' => 'Voir le site',
 		'submit' => 'Valider',
 		'truncate' => 'Supprimer tous les articles',
 	),
 	'auth' => array(
+		'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
 		'login' => 'Connexion',
+		'login_persona' => 'Connexion avec Persona',
+		'login_persona_problem' => 'Problème de connexion à Persona ?',
 		'logout' => 'Déconnexion',
+		'password' => 'Mot de passe',
+		'reset' => 'Réinitialisation de l’authentification',
+		'username' => 'Nom d’utilisateur',
+		'username_admin' => 'Nom d’utilisateur administrateur',
+		'will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
 	),
 	'date' => array(
 		'Apr' => '\\a\\v\\r\\i\\l',
@@ -62,6 +71,7 @@ return array(
 		'march' => 'mars',
 		'may' => 'mai.',
 		'mon' => 'lun.',
+		'month' => 'mois',
 		'nov' => 'nov.',
 		'november' => 'novembre',
 		'oct' => 'oct.',
@@ -76,6 +86,10 @@ return array(
 		'wed' => 'mer.',
 		'yesterday' => 'Hier',
 	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'À propos de FreshRSS',
+	),
 	'js' => array(
 		'category_empty' => 'Catégorie vide',
 		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
@@ -83,6 +97,7 @@ return array(
 		'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
 		'notif_body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
 		'notif_title_new_articles' => 'FreshRSS : nouveaux articles !',
+		'should_be_activated' => 'Le JavaScript doit être activé.',
 	),
 	'menu' => array(
 		'about' => 'À propos',
@@ -115,6 +130,7 @@ return array(
 	'short' => array(
 		'attention' => 'Attention !',
 		'blank_to_disable' => 'Laissez vide pour désactiver',
+		'by_author' => 'Par <em>%s</em>',
 		'by_default' => 'Par défaut',
 		'damn' => 'Arf !',
 		'no' => 'Non',
@@ -123,34 +139,13 @@ return array(
 		'or' => 'ou',
 		'yes' => 'Oui',
 	),
-	'freshrss' => 'FreshRSS',
+
 	'activate_sharing' => 'Activer le partage',
-	'after_onread' => 'Après “marquer tout comme lu”,',
-	'allow_anonymous' => 'Autoriser la lecture anonyme des articles de l’utilisateur par défaut (%s)',
-	'allow_anonymous_refresh' => 'Autoriser le rafraîchissement anonyme des flux',
-	'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-	'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 	'article' => 'Article',
-	'article_icons' => 'Icônes d’article',
-	'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine',
 	'article_published_on' => 'Article publié initialement sur <a href="%s">%s</a>',
 	'article_published_on_author' => 'Article publié initialement sur <a href="%s">%s</a> par %s',
-	'article_viewed' => 'lorsque l’article est affiché',
 	'articles' => 'articles',
-	'articles_per_page' => 'Nombre d’articles par page',
-	'articles_to_display' => 'Articles à afficher',
-	'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
-	'auth_none' => 'Aucune (dangereux)',
-	'auth_persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
-	'auth_token' => 'Jeton d’identification',
-	'auth_type' => 'Méthode d’authentification',
-	'auth_will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
 	'author' => 'Auteur',
-	'auto_load_more' => 'Charger les articles suivants en bas de page',
-	'auto_read_when' => 'Marquer un article comme lu…',
-	'auto_remove_article' => 'Cacher les articles après lecture',
-	'auto_share' => 'Partager',
-	'auto_share_help' => 'S’il n’y a qu’un mode de partage, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
 	'bad_opml_file' => 'Votre fichier OPML n’est pas valide.',
 	'base_url' => 'Base de l’URL',
 	'bdd' => 'Base de données',
@@ -158,7 +153,6 @@ return array(
 	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
 	'bdd_configuration' => 'Base de données',
 	'bdd_type' => 'Type de base de données',
-	'bottom_line' => 'Ligne du bas',
 	'by' => 'par',
 	'by_email' => 'Par courriel',
 	'by_feed' => 'par flux',
@@ -172,85 +166,51 @@ return array(
 	'change_value' => 'Vous devriez changer cette valeur par n’importe quelle autre',
 	'checks' => 'Vérifications',
 	'choose_language' => 'Choisissez la langue pour FreshRSS',
-	'collapse_article' => 'Refermer',
 	'congratulations' => 'Félicitations !',
-	'content_width' => 'Largeur du contenu',
 	'create' => 'Créer',
 	'create_user' => 'Créer un nouvel utilisateur',
 	'ctype_is_nok' => 'Il manque une librairie pour la vérification des types de caractères (php-ctype)',
 	'ctype_is_ok' => 'Vous disposez du nécessaire pour la vérification des types de caractères (ctype)',
 	'curl_is_nok' => 'Vous ne disposez pas de cURL (paquet php5-curl)',
 	'curl_is_ok' => 'Vous disposez de cURL dans sa version %s',
-	'current_user' => 'Utilisateur actuel',
 	'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
 	'default_category' => 'Sans catégorie',
 	'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
-	'default_view' => 'Vue par défaut',
-	'delete_articles_every' => 'Supprimer les articles après',
 	'display' => 'Affichage',
-	'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
-	'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
 	'do_not_change_if_doubt' => 'Laissez tel quel dans le doute',
 	'dom_is_nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml)',
 	'dom_is_ok' => 'Vous disposez du nécessaire pour parcourir le DOM',
-	'explain_token' => 'Permet d’accéder à la sortie RSS de l’utilisateur par défaut sans besoin de s’authentifier.<br /><kbd>%s?output=rss&token=%s</kbd>',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
 	'feed' => 'Flux',
 	'feeds' => 'Flux',
 	'finish_installation' => 'Terminer l’installation',
-	'first_article' => 'Passer au premier article',
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
-	'focus_search' => 'Accéder à la recherche',
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
-	'help' => 'Afficher la documentation',
-	'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
 	'host' => 'Hôte',
-	'html5_notif_timeout' => 'Temps d’affichage de la notification HTML5',
-	'http_auth' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
 	'http_referer_is_nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
 	'http_referer_is_ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
-	'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
 	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
 	'installation_step' => 'Installation — étape %d · FreshRSS',
 	'is_admin' => 'est administrateur',
 	'javascript_for_shortcuts' => 'Le JavaScript doit être activé pour pouvoir profiter des raccourcis.',
 	'javascript_is_better' => 'FreshRSS est plus agréable à utiliser avec JavaScript activé',
-	'javascript_should_be_activated' => 'Le JavaScript doit être activé.',
-	'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-	'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
-	'language' => 'Langue',
 	'language_defined' => 'La langue a bien été définie.',
-	'last_article' => 'Passer au dernier article',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
-	'login_persona_problem' => 'Problème de connexion à Persona ?',
 	'login_required' => 'Accès protégé par mot de passe :',
-	'login_with_persona' => 'Connexion avec Persona',
-	'mark_cat_read' => 'Marquer la catégorie comme lue',
-	'mark_favorite' => 'Mettre en favori',
-	'mark_feed_read' => 'Marquer le flux comme lu',
 	'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
 	'minz_is_ok' => 'Vous disposez du framework Minz',
-	'month' => 'mois',
-	'more_information' => 'Plus d’informations',
-	'next_article' => 'Passer à l’article suivant',
 	'next_page' => 'Passer à la page suivante',
 	'next_step' => 'Passer à l’étape suivante',
 	'no_feed_actualized' => 'Aucun flux n’a pu être mis à jour.',
-	'no_query' => 'Vous n’avez pas encore créé de filtre.',
-	'no_query_filter' => 'Aucun filtre appliqué',
 	'no_rss_feed' => 'Aucun flux RSS',
 	'no_selected_feed' => 'Aucun flux sélectionné.',
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
-	'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
 	'number_feeds' => '%d flux',
-	'optimize_bdd' => 'Optimiser la base de données',
-	'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD',
-	'password' => 'Mot de passe',
 	'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
 	'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
 	'pcre_is_nok' => 'Il manque une librairie pour les expressions régulières (php-pcre)',
@@ -262,58 +222,12 @@ return array(
 	'php_is_nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s',
 	'php_is_ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS',
 	'prefix' => 'Préfixe des tables',
-	'previous_article' => 'Passer à l’article précédent',
 	'previous_page' => 'Passer à la page précédente',
 	'public' => 'Public',
-	'publication_date' => 'Date de publication',
-	'purge_now' => 'Purger maintenant',
-	'query_deprecated' => 'Ce filtre n’est plus valide. La catégorie ou le flux concerné a été supprimé.',
-	'query_filter' => 'Filtres appliqués :',
-	'query_get_all' => 'Afficher tous les articles',
-	'query_get_category' => 'Afficher la catégorie "%s"',
-	'query_get_favorite' => 'Afficher les articles favoris',
-	'query_get_feed' => 'Afficher le flux "%s"',
-	'query_order_asc' => 'Afficher les articles les plus anciens en premier',
-	'query_order_desc' => 'Afficher les articles les plus récents en premier',
-	'query_search' => 'Recherche de "%s"',
-	'query_state_0' => 'Afficher tous les articles',
-	'query_state_1' => 'Afficher les articles lus',
-	'query_state_2' => 'Afficher les articles non lus',
-	'query_state_3' => 'Afficher tous les articles',
-	'query_state_4' => 'Afficher les articles favoris',
-	'query_state_5' => 'Afficher les articles lus et favoris',
-	'query_state_6' => 'Afficher les articles non lus et favoris',
-	'query_state_7' => 'Afficher les articles favoris',
-	'query_state_8' => 'Afficher les articles non favoris',
-	'query_state_9' => 'Afficher les articles lus et non favoris',
-	'query_state_10' => 'Afficher les articles non lus et non favoris',
-	'query_state_11' => 'Afficher les articles non favoris',
-	'query_state_12' => 'Afficher tous les articles',
-	'query_state_13' => 'Afficher les articles lus',
-	'query_state_14' => 'Afficher les articles non lus',
-	'query_state_15' => 'Afficher tous les articles',
 	'random_string' => 'Chaîne aléatoire',
-	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
-	'scroll' => 'au défilement de la page',
-	'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
-	'see_on_website' => 'Voir sur le site d’origine',
-	'share_name' => 'Nom du partage à afficher',
-	'share_url' => 'URL du partage à utiliser',
 	'sharing_management' => 'Gestion des options de partage',
-	'shift_for_all_read' => '+ <code>shift</code> pour marquer tous les articles comme lus',
-	'shortcuts_article_action' => 'Actions associées à l’article courant',
-	'shortcuts_navigation' => 'Navigation',
-	'shortcuts_navigation_help' => 'Avec le modificateur "Shift", les raccourcis de navigation s’appliquent aux flux.<br/>Avec le modificateur "Alt", les raccourcis de navigation s’appliquent aux catégories.',
-	'shortcuts_other_action' => 'Autres actions',
-	'show_adaptive' => 'Adapter l’affichage',
-	'show_all_articles' => 'Afficher tous les articles',
-	'sort_order' => 'Ordre de tri',
 	'steps' => 'Étapes',
-	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
-	'theme' => 'Thème',
 	'this_is_the_end' => 'This is the end',
-	'top_line' => 'Ligne du haut',
-	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	'update_apply' => 'Appliquer la mise à jour',
 	'update_check' => 'Vérifier les mises à jour',
 	'update_end' => 'La mise à jour est terminée, vous pouvez maintenant passer à l’étape finale.',
@@ -321,18 +235,8 @@ return array(
 	'update_long' => 'Ce processus peut prendre longtemps, selon la taille de votre base de données. Vous aurez peut-être à attendre que cette page dépasse son temps maximum d’exécution (~5 minutes) puis à la recharger.',
 	'update_start' => 'Lancer la mise à jour',
 	'updated' => 'Modifications enregistrées.',
-	'upon_reception' => 'dès la réception du nouvel article',
-	'user_filter' => 'Accéder aux filtres utilisateur',
-	'user_filter_help' => 'S’il n’y a qu’un filtre utilisateur, celui-ci est utilisé automatiquement. Sinon ils sont accessibles par leur numéro.',
-	'username' => 'Nom d’utilisateur',
-	'username_admin' => 'Nom d’utilisateur administrateur',
-	'users' => 'Utilisateurs',
 	'users_list' => 'Liste des utilisateurs',
 	'version_update' => 'Mise à jour',
-	'width_large' => 'Large',
-	'width_medium' => 'Moyenne',
-	'width_no_limit' => 'Pas de limite',
-	'width_thin' => 'Fine',
 	'your_diaspora_pod' => 'Votre pod Diaspora*',
 	'your_shaarli' => 'Votre Shaarli',
 	'your_wallabag' => 'Votre wallabag',

app/i18n/fr/index.php

@@ -16,9 +16,6 @@ return array(
 		'version' => 'Version',
 		'website' => 'Site Internet',
 	),
-	'entry' => array(
-		'by_author' => 'Par <em>%s</em>',
-	),
 	'feed' => array(
 		'add' => 'Vous pouvez ajouter des flux.',
 		'empty' => 'Il n’y a aucun article à afficher.',
@@ -42,19 +39,21 @@ return array(
 		'global_view' => 'Vue globale',
 		'main_stream' => 'Flux principal',
 		'mark_all_read' => 'Tout marquer comme lu',
+		'mark_cat_read' => 'Marquer la catégorie comme lue',
+		'mark_feed_read' => 'Marquer le flux comme lu',
 		'newer_first' => 'Plus récents en premier',
 		'non-starred' => 'Afficher tout sauf les favoris',
 		'normal_view' => 'Vue normale',
 		'older_first' => 'Plus anciens en premier',
 		'queries' => 'Filtres utilisateurs',
-		'read' => 'Afficher les non lus',
+		'read' => 'Afficher les lus',
 		'reader_view' => 'Vue lecture',
 		'rss_view' => 'Flux RSS',
 		'search_short' => 'Rechercher',
 		'starred' => 'Afficher les favoris',
 		'stats' => 'Statistiques',
 		'subscription' => 'Gestion des abonnements',
-		'unread' => 'Afficher les lus',
+		'unread' => 'Afficher les non lus',
 	),
 	'share' => array(
 		'_' => 'Partager',

app/views/auth/formLogin.phtml

@@ -1,28 +1,28 @@
 <div class="prompt">
-	<h1><?php echo _t('login'); ?></h1>
+	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
 		<div>
-			<label for="username"><?php echo _t('username'); ?></label>
+			<label for="username"><?php echo _t('gen.auth.username'); ?></label>
 			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
 		</div>
 		<div>
-			<label for="passwordPlain"><?php echo _t('password'); ?></label>
+			<label for="passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
 				<input type="password" id="passwordPlain" required="required" />
 				<input type="hidden" id="challenge" name="challenge" /><br />
-				<noscript><strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+				<noscript><strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 		</div>
 		<div>
 			<label class="checkbox" for="keep_logged_in">
 				<input type="checkbox" name="keep_logged_in" id="keep_logged_in" value="1" />
-				<?php echo _t('keep_logged_in'); ?>
+				<?php echo _t('gen.auth.keep_logged_in'); ?>
 			</label>
 			<br />
 		</div>
 		<div>
-			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('login'); ?></button>
+			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('gen.auth.login'); ?></button>
 		</div>
 	</form>
 
-	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></p>
+	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
 </div>

app/views/auth/index.phtml

@@ -1,22 +1,22 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('auth', 'index'); ?>">
-		<legend><?php echo _t('auth_type'); ?></legend>
+		<legend><?php echo _t('admin.auth.type'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
+			<label class="group-name" for="auth_type"><?php echo _t('admin.auth.type'); ?></label>
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type" required="required">
 					<?php if (!in_array(Minz_Configuration::authType(), array('form', 'persona', 'http_auth', 'none'))) { ?>
 						<option selected="selected"></option>
 					<?php } ?>
-					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
-					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
+					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('admin.auth.form'); ?></option>
+					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', FreshRSS_Context::$conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.persona'); ?></option>
+					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('admin.auth.http'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('admin.auth.none'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -26,7 +26,7 @@
 				<label class="checkbox" for="anon_access">
 					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
+					<?php echo _t('admin.auth.allow_anonymous', Minz_Configuration::defaultUser()); ?>
 				</label>
 			</div>
 		</div>
@@ -36,7 +36,7 @@
 				<label class="checkbox" for="anon_refresh">
 					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo Minz_Configuration::allowAnonymousRefresh() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('allow_anonymous_refresh'); ?>
+					<?php echo _t('admin.auth.allow_anonymous_refresh'); ?>
 				</label>
 			</div>
 		</div>
@@ -46,7 +46,7 @@
 				<label class="checkbox" for="unsafe_autologin">
 					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo Minz_Configuration::unsafeAutologinEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('unsafe_autologin'); ?>
+					<?php echo _t('admin.auth.unsafe_autologin'); ?>
 					<kbd>p/i/?a=formLogin&amp;u=Alice&amp;p=1234</kbd>
 				</label>
 			</div>
@@ -54,12 +54,12 @@
 
 		<?php if (Minz_Configuration::canLogIn()) { ?>
 		<div class="form-group">
-			<label class="group-name" for="token"><?php echo _t('auth_token'); ?></label>
+			<label class="group-name" for="token"><?php echo _t('admin.auth.token'); ?></label>
 			<?php $token = FreshRSS_Context::$conf->token; ?>
 			<div class="group-controls">
-				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
+				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('gen.short.blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-				<?php echo _i('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
+				<?php echo _i('help'); ?> <?php echo _t('admin.auth.token_help', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
 		</div>
 		<?php } ?>
@@ -69,15 +69,15 @@
 				<label class="checkbox" for="api_enabled">
 					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo Minz_Configuration::apiEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::needsLogin() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo _t('api_enabled'); ?>
+					<?php echo _t('admin.auth.api_enabled'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>

app/views/auth/personaLogin.phtml

@@ -1,21 +1,21 @@
 <?php if ($this->res === false) { ?>
 <div class="prompt">
-	<h1><?php echo _t('login'); ?></h1>
+	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
 	<p>
 		<a class="signin btn btn-important" href="<?php echo _url('auth', 'login'); ?>">
-			<?php echo _i('login'); ?> <?php echo _t('login_with_persona'); ?>
+			<?php echo _i('login'); ?> <?php echo _t('gen.auth.login_persona'); ?>
 		</a>
 
 		<br /><br />
 
 		<?php echo _i('help'); ?>
 		<small>
-			<a href="<?php echo _url('auth', 'reset'); ?>"><?php echo _t('login_persona_problem'); ?></a>
+			<a href="<?php echo _url('auth', 'reset'); ?>"><?php echo _t('gen.auth.login_persona_problem'); ?></a>
 		</small>
 	</p>
 
-	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></p>
+	<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.freshrss.about'); ?></a></p>
 </div>
 <?php
 } else {

app/views/auth/reset.phtml

@@ -1,5 +1,5 @@
 <div class="prompt">
-	<h1><?php echo _t('auth_reset'); ?></h1>
+	<h1><?php echo _t('gen.auth.reset'); ?></h1>
 
 	<?php if (!empty($this->message)) { ?>
 	<p class="alert <?php echo $this->message['status'] === 'bad' ? 'alert-error' : 'alert-warn'; ?>">
@@ -11,22 +11,22 @@
 	<?php if (!$this->no_form) { ?>
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'reset'); ?>">
 		<p class="alert alert-warn">
-			<span class="alert-head"><?php echo _t('attention'); ?></span><br />
-			<?php echo _t('auth_will_reset'); ?>
+			<span class="alert-head"><?php echo _t('gen.short.attention'); ?></span><br />
+			<?php echo _t('gen.auth.will_reset'); ?>
 		</p>
 
 		<div>
-			<label for="username"><?php echo _t('username_admin'); ?></label>
+			<label for="username"><?php echo _t('gen.auth.username_admin'); ?></label>
 			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
 		</div>
 		<div>
-			<label for="passwordPlain"><?php echo _t('password'); ?></label>
+			<label for="passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
 				<input type="password" id="passwordPlain" required="required" />
 				<input type="hidden" id="challenge" name="challenge" /><br />
-				<noscript><strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+				<noscript><strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 		</div>
 		<div>
-			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('submit'); ?></button>
+			<button id="loginButton" type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
 		</div>
 	</form>
 	<?php } ?>

app/views/configure/archiving.phtml

@@ -1,31 +1,31 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'archiving'); ?>">
-		<legend><?php echo _t('archiving_configuration'); ?></legend>
-		<p><?php echo _i('help'); ?> <?php echo _t('archiving_configuration_help'); ?></p>
+		<legend><?php echo _t('conf.archiving'); ?></legend>
+		<p><?php echo _i('help'); ?> <?php echo _t('conf.archiving.help'); ?></p>
 
 		<div class="form-group">
-			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
+			<label class="group-name" for="old_entries"><?php echo _t('conf.archiving.delete_after'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$conf->old_entries; ?>" /> <?php echo _t('month'); ?>
-				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('purge_now'); ?></a>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo FreshRSS_Context::$conf->old_entries; ?>" /> <?php echo _t('gen.date.month'); ?>
+				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('conf.archiving.purge_now'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history_default"><?php echo _t('keep_history'), ' ', _t('by_feed'); ?></label>
+			<label class="group-name" for="keep_history_default"><?php echo _t('conf.archiving.keep_history_by_feed'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
 					foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . (FreshRSS_Context::$conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
-				?></select> (<?php echo _t('by_default'); ?>)
+				?></select> (<?php echo _t('gen.short.by_default'); ?>)
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="ttl_default"><?php echo _t('ttl'); ?></label>
+			<label class="group-name" for="ttl_default"><?php echo _t('conf.archiving.ttl'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
 					$found = false;
@@ -42,31 +42,31 @@
 					if (!$found) {
 						echo '<option value="' . intval(FreshRSS_Context::$conf->ttl_default) . '" selected="selected">' . intval(FreshRSS_Context::$conf->ttl_default) . 's</option>';
 					}
-				?></select> (<?php echo _t('by_default'); ?>)
+				?></select> (<?php echo _t('gen.short.by_default'); ?>)
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('entry', 'optimize'); ?>">
-		<legend><?php echo _t('advanced'); ?></legend>
+		<legend><?php echo _t('conf.archiving.advanced'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('current_user'); ?></label>
+			<label class="group-name"><?php echo _t('conf.user.current'); ?></label>
 			<div class="group-controls">
-				<?php echo _t('conf.users.articles_and_size', format_number($this->nb_total), format_bytes($this->size_user)); ?>
+				<?php echo _t('conf.user.articles_and_size', format_number($this->nb_total), format_bytes($this->size_user)); ?>
 			</div>
 		</div>
 
 		<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('users'); ?></label>
+			<label class="group-name"><?php echo _t('conf.user.users'); ?></label>
 			<div class="group-controls">
 				<?php echo format_bytes($this->size_total); ?>
 			</div>
@@ -75,8 +75,8 @@
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<input type="hidden" name="optimiseDatabase" value="1" />
-				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
-				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
+				<button type="submit" class="btn btn-important"><?php echo _t('conf.archiving.optimize'); ?></button>
+				<?php echo _i('help'); ?> <?php echo _t('conf.archiving.optimize_help'); ?>
 			</div>
 		</div>
 		<?php } ?>

app/views/configure/display.phtml

@@ -1,13 +1,13 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'display'); ?>">
-		<legend><?php echo _t('display_configuration'); ?></legend>
+		<legend><?php echo _t('conf.display'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="language"><?php echo _t('language'); ?></label>
+			<label class="group-name" for="language"><?php echo _t('conf.display.language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
 				<?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?>
@@ -19,7 +19,7 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo _t('theme'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('conf.display.theme'); ?></label>
 			<div class="group-controls">
 				<ul class="slides">
 					<?php $slides = count($this->themes); $i = 1; ?>
@@ -38,7 +38,7 @@
 								<?php } ?>
 							</div>
 							<div class="properties">
-								<div><?php echo sprintf('%s - %s %s', $theme['name'], _t('by'), $theme['author']) ?></div>
+								<div><?php echo sprintf('%s — %s', $theme['name'], _t('gen.short.by_author', $theme['author'])); ?></div>
 								<div><?php echo $theme['description'] ?></div>
 								<div class="page-number"><?php echo sprintf('%d/%d', $i, $slides) ?></div>
 							</div>
@@ -51,42 +51,42 @@
 
 		<?php $width = FreshRSS_Context::$conf->content_width; ?>
 		<div class="form-group">
-			<label class="group-name" for="content_width"><?php echo _t('content_width'); ?></label>
+			<label class="group-name" for="content_width"><?php echo _t('conf.display.width.content'); ?></label>
 			<div class="group-controls">
 				<select name="content_width" id="content_width" required="">
 					<option value="thin" <?php echo $width === 'thin'? 'selected="selected"' : ''; ?>>
-						<?php echo _t('width_thin'); ?>
+						<?php echo _t('conf.display.width.thin'); ?>
 					</option>
 					<option value="medium" <?php echo $width === 'medium'? 'selected="selected"' : ''; ?>>
-						<?php echo _t('width_medium'); ?>
+						<?php echo _t('conf.display.width.medium'); ?>
 					</option>
 					<option value="large" <?php echo $width === 'large'? 'selected="selected"' : ''; ?>>
-						<?php echo _t('width_large'); ?>
+						<?php echo _t('conf.display.width.large'); ?>
 					</option>
 					<option value="no_limit" <?php echo $width === 'no_limit'? 'selected="selected"' : ''; ?>>
-						<?php echo _t('width_no_limit'); ?>
+						<?php echo _t('conf.display.width.no_limit'); ?>
 					</option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo _t('article_icons'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('conf.display.icon.entry'); ?></label>
 			<table>
 				<thead>
 					<tr>
 						<th> </th>
-						<th title="<?php echo _t('mark_read'); ?>"><?php echo _i('read'); ?></th>
-						<th title="<?php echo _t('mark_favorite'); ?>"><?php echo _i('bookmark'); ?></th>
-						<th><?php echo _t('sharing'); ?></th>
-						<th><?php echo _t('related_tags'); ?></th>
-						<th><?php echo _t('publication_date'); ?></th>
+						<th title="<?php echo _t('gen.action.mark_read'); ?>"><?php echo _i('read'); ?></th>
+						<th title="<?php echo _t('gen.action.mark_favorite'); ?>"><?php echo _i('bookmark'); ?></th>
+						<th><?php echo _t('conf.display.icon.sharing'); ?></th>
+						<th><?php echo _t('conf.display.icon.related_tags'); ?></th>
+						<th><?php echo _t('conf.display.icon.publication_date'); ?></th>
 						<th><?php echo _i('link'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
-						<th><?php echo _t('top_line'); ?></th>
+						<th><?php echo _t('conf.display.icon.top_line'); ?></th>
 						<td><input type="checkbox" name="topline_read" value="1"<?php echo FreshRSS_Context::$conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
@@ -94,7 +94,7 @@
 						<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr><tr>
-						<th><?php echo _t('bottom_line'); ?></th>
+						<th><?php echo _t('conf.display.icon.bottom_line'); ?></th>
 						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo FreshRSS_Context::$conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
@@ -107,16 +107,16 @@
 		</div>
 		
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo _t('html5_notif_timeout'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('conf.display.notif_html5.timeout'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$conf->html5_notif_timeout; ?>" /> <?php echo _t('seconds_(0_means_no_timeout)'); ?>
+				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo FreshRSS_Context::$conf->html5_notif_timeout; ?>" /> <?php echo _t('conf.display.notif_html5.seconds'); ?>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>

app/views/configure/queries.phtml

@@ -1,15 +1,15 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'queries'); ?>">
-		<legend><?php echo _t('queries'); ?></legend>
+		<legend><?php echo _t('conf.query'); ?></legend>
 
 		<?php foreach (FreshRSS_Context::$conf->queries as $key => $query) { ?>
 		<div class="form-group" id="query-group-<?php echo $key; ?>">
 			<label class="group-name" for="queries_<?php echo $key; ?>_name">
-				<?php echo _t('query_number', $key + 1); ?>
+				<?php echo _t('conf.query.number', $key + 1); ?>
 			</label>
 
 			<div class="group-controls">
@@ -49,31 +49,31 @@
 
 				<?php if ($exist === 0) { ?>
 				<div class="alert alert-warn">
-					<div class="alert-head"><?php echo _t('no_query_filter'); ?></div>
+					<div class="alert-head"><?php echo _t('conf.query.no_filter'); ?></div>
 				</div>
 				<?php } elseif ($deprecated) { ?>
 				<div class="alert alert-error">
-					<div class="alert-head"><?php echo _t('query_deprecated'); ?></div>
+					<div class="alert-head"><?php echo _t('conf.query.deprecated'); ?></div>
 				</div>
 				<?php } else { ?>
 				<div class="alert alert-success">
-					<div class="alert-head"><?php echo _t('query_filter'); ?></div>
+					<div class="alert-head"><?php echo _t('conf.query.filter'); ?></div>
 
 					<ul>
 						<?php if (isset($query['search'])) { ?>
-						<li class="item"><?php echo _t('query_search', $query['search']); ?></li>
+						<li class="item"><?php echo _t('conf.query.search', $query['search']); ?></li>
 						<?php } ?>
 
 						<?php if (isset($query['state'])) { ?>
-						<li class="item"><?php echo _t('query_state_' . $query['state']); ?></li>
+						<li class="item"><?php echo _t('conf.query.state_' . $query['state']); ?></li>
 						<?php } ?>
 
 						<?php if (isset($query['order'])) { ?>
-						<li class="item"><?php echo _t('query_order_' . strtolower($query['order'])); ?></li>
+						<li class="item"><?php echo _t('conf.query.order_' . strtolower($query['order'])); ?></li>
 						<?php } ?>
 
 						<?php if (isset($query['get'])) { ?>
-						<li class="item"><?php echo _t('query_get_' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
+						<li class="item"><?php echo _t('conf.query.get_' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
 						<?php } ?>
 					</ul>
 				</div>
@@ -85,12 +85,12 @@
 		<?php if (count(FreshRSS_Context::$conf->queries) > 0) { ?>
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 		<?php } else { ?>
-		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('no_query'); ?></p>
+		<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('conf.query.none'); ?></p>
 		<?php } ?>
 	</form>
 

app/views/configure/reading.phtml

@@ -1,47 +1,47 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'reading'); ?>">
-		<legend><?php echo _t('reading_configuration'); ?></legend>
+		<legend><?php echo _t('conf.reading'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo _t('articles_per_page'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('conf.reading.articles_per_page'); ?></label>
 			<div class="group-controls">
 				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo FreshRSS_Context::$conf->posts_per_page; ?>" min="5" max="50" />
-				<?php echo _i('help'); ?> <?php echo _t('number_divided_when_reader'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('conf.reading.number_divided_when_reader'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="sort_order"><?php echo _t('sort_order'); ?></label>
+			<label class="group-name" for="sort_order"><?php echo _t('conf.reading.sort'); ?></label>
 			<div class="group-controls">
 				<select name="sort_order" id="sort_order">
-					<option value="DESC"<?php echo FreshRSS_Context::$conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('newer_first'); ?></option>
-					<option value="ASC"<?php echo FreshRSS_Context::$conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('older_first'); ?></option>
+					<option value="DESC"<?php echo FreshRSS_Context::$conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.sort.newer_first'); ?></option>
+					<option value="ASC"<?php echo FreshRSS_Context::$conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.sort.older_first'); ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="view_mode"><?php echo _t('default_view'); ?></label>
+			<label class="group-name" for="view_mode"><?php echo _t('conf.reading.view.default'); ?></label>
 			<div class="group-controls">
 				<select name="view_mode" id="view_mode">
-					<option value="normal"<?php echo FreshRSS_Context::$conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('normal_view'); ?></option>
-					<option value="reader"<?php echo FreshRSS_Context::$conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('reader_view'); ?></option>
-					<option value="global"<?php echo FreshRSS_Context::$conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('global_view'); ?></option>
+					<option value="normal"<?php echo FreshRSS_Context::$conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.normal'); ?></option>
+					<option value="reader"<?php echo FreshRSS_Context::$conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.reader'); ?></option>
+					<option value="global"<?php echo FreshRSS_Context::$conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.view.global'); ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="view_mode"><?php echo _t('articles_to_display'); ?></label>
+			<label class="group-name" for="view_mode"><?php echo _t('conf.reading.show'); ?></label>
 			<div class="group-controls">
 				<select name="default_view" id="default_view">
-					<option value="adaptive"<?php echo FreshRSS_Context::$conf->default_view === 'adaptive' ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
-					<option value="all"<?php echo FreshRSS_Context::$conf->default_view === 'all' ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
-					<option value="unread"<?php echo FreshRSS_Context::$conf->default_view === 'unread' ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
+					<option value="adaptive"<?php echo FreshRSS_Context::$conf->default_view === 'adaptive' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.adaptive'); ?></option>
+					<option value="all"<?php echo FreshRSS_Context::$conf->default_view === 'all' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.all_articles'); ?></option>
+					<option value="unread"<?php echo FreshRSS_Context::$conf->default_view === 'unread' ? ' selected="selected"' : ''; ?>><?php echo _t('conf.reading.show.unread'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -50,7 +50,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="hide_read_feeds">
 					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo FreshRSS_Context::$conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('hide_read_feeds'); ?>
+					<?php echo _t('conf.reading.hide_read_feeds'); ?>
 				</label>
 			</div>
 		</div>
@@ -59,8 +59,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="display_posts">
 					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo FreshRSS_Context::$conf->display_posts ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('display_articles_unfolded'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.display_articles_unfolded'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -69,8 +69,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="display_categories">
 					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo FreshRSS_Context::$conf->display_categories ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('display_categories_unfolded'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.display_categories_unfolded'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -79,8 +79,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="sticky_post">
 					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo FreshRSS_Context::$conf->sticky_post ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('sticky_post'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.sticky_post'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -89,8 +89,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="auto_load_more">
 					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo FreshRSS_Context::$conf->auto_load_more ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('auto_load_more'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.auto_load_more'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -99,8 +99,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="lazyload">
 					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo FreshRSS_Context::$conf->lazyload ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('img_with_lazyload'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.img_with_lazyload'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -109,8 +109,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="reading_confirm">
 					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo FreshRSS_Context::$conf->reading_confirm ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('reading_confirm'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.confirm_enabled'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -119,48 +119,48 @@
 			<div class="group-controls">
 				<label class="checkbox" for="auto_remove_article">
 					<input type="checkbox" name="auto_remove_article" id="auto_remove_article" value="1"<?php echo FreshRSS_Context::$conf->auto_remove_article ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('auto_remove_article'); ?>
-					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('conf.reading.auto_remove_article'); ?>
+					<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('auto_read_when'); ?></label>
+			<label class="group-name"><?php echo _t('conf.reading.read.when'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="check_open_article">
 					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo FreshRSS_Context::$conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('article_viewed'); ?>
+					<?php echo _t('conf.reading.read.article_viewed'); ?>
 				</label>
 				<label class="checkbox" for="check_open_site">
 					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo FreshRSS_Context::$conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('article_open_on_website'); ?>
+					<?php echo _t('conf.reading.read.article_open_on_website'); ?>
 				</label>
 				<label class="checkbox" for="check_scroll">
 					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo FreshRSS_Context::$conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('scroll'); ?>
+					<?php echo _t('conf.reading.read.scroll'); ?>
 				</label>
 				<label class="checkbox" for="check_reception">
 					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo FreshRSS_Context::$conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('upon_reception'); ?>
+					<?php echo _t('conf.reading.read.upon_reception'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo _t('after_onread'); ?></label>
+			<label class="group-name"><?php echo _t('conf.reading.after_onread'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="onread_jump_next">
 					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo FreshRSS_Context::$conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
-					<?php echo _t('jump_next'); ?>
+					<?php echo _t('conf.reading.jump_next'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 

app/views/configure/sharing.phtml

@@ -1,7 +1,7 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'sharing'); ?>"
 		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a>
@@ -9,28 +9,28 @@
 		data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" />
 			<div class="stick">
-			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo _t('share_name'); ?>" size="64" />
-			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo _t('share_url'); ?>" size="64" />
+			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo _t('conf.sharing.share_name'); ?>" size="64" />
+			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo _t('conf.sharing.share_url'); ?>" size="64" />
 			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a></div>
-			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
+			<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
-		<legend><?php echo _t('sharing'); ?></legend>
+		<legend><?php echo _t('conf.sharing'); ?></legend>
 		<?php foreach (FreshRSS_Context::$conf->sharing as $key => $sharing): ?>
 			<?php $share = FreshRSS_Context::$conf->shares[$sharing['type']]; ?>
 			<div class="form-group" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
-					<?php echo _t($sharing['type']); ?>
+					<?php echo _t('conf.sharing.' . $sharing['type']); ?>
 				</label>
 				<div class="group-controls">
 					<input type='hidden' id='share_<?php echo $key;?>_type' name="share[<?php echo $key;?>][type]" value='<?php echo $sharing['type']?>' />
 					<?php if ($share['form'] === 'advanced') { ?>
 						<div class="stick">
-							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('share_name'); ?>" size="64" />
-							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('share_url'); ?>" size="64" />
+							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('conf.sharing.share_name'); ?>" size="64" />
+							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('conf.sharing.share_url'); ?>" size="64" />
 							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 						</div>
 
-						<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo _i('help'); ?></a>
+						<a target="_blank" class="btn" title="<?php echo _t('conf.sharing.more_information'); ?>" href="<?php echo $share['help']?>"><?php echo _i('help'); ?></a>
 					<?php } else { ?>
 					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 					<?php } ?>
@@ -42,7 +42,7 @@
 			<div class="group-controls">
 				<select>
 					<?php foreach(FreshRSS_Context::$conf->shares as $key => $params):?>
-						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t($key) ?></option>
+						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t('conf.sharing.' . $key) ?></option>
 					<?php endforeach; ?>
 				</select>
 				<a href='#' class='share add btn'><?php echo _i('add'); ?></a>
@@ -51,8 +51,8 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>

app/views/configure/shortcut.phtml

@@ -1,7 +1,7 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
 
 	<datalist id="keys">
 		<?php foreach ($this->list_keys as $key) { ?>
@@ -12,114 +12,114 @@
 	<?php $s = FreshRSS_Context::$conf->shortcuts; ?>
 
 	<form method="post" action="<?php echo _url('configure', 'shortcut'); ?>">
-		<legend><?php echo _t('shortcuts'); ?></legend>
+		<legend><?php echo _t('conf.shortcut'); ?></legend>
 
-		<noscript><p class="alert alert-error"><?php echo _t('javascript_for_shortcuts'); ?></p></noscript>
+		<noscript><p class="alert alert-error"><?php echo _t('conf.shortcut.javascript'); ?></p></noscript>
 
-		<legend><?php echo _t('shortcuts_navigation'); ?></legend>
+		<legend><?php echo _t('conf.shortcut.navigation'); ?></legend>
 
-		<p class="alert alert-warn"><?php echo _t('shortcuts_navigation_help');?></p>
+		<p class="alert alert-warn"><?php echo _t('conf.shortcut.navigation_help');?></p>
 
 		<div class="form-group">
-			<label class="group-name" for="next_entry"><?php echo _t('next_article'); ?></label>
+			<label class="group-name" for="next_entry"><?php echo _t('conf.shortcut.next_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?php echo $s['next_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="prev_entry"><?php echo _t('previous_article'); ?></label>
+			<label class="group-name" for="prev_entry"><?php echo _t('conf.shortcut.previous_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?php echo $s['prev_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="first_entry"><?php echo _t('first_article'); ?></label>
+			<label class="group-name" for="first_entry"><?php echo _t('conf.shortcut.first_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="first_entry" name="shortcuts[first_entry]" list="keys" value="<?php echo $s['first_entry']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="last_entry"><?php echo _t('last_article'); ?></label>
+			<label class="group-name" for="last_entry"><?php echo _t('conf.shortcut.last_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="last_entry" name="shortcuts[last_entry]" list="keys" value="<?php echo $s['last_entry']; ?>" />
 			</div>
 		</div>
 
-		<legend><?php echo _t('shortcuts_article_action');?></legend>
+		<legend><?php echo _t('conf.shortcut.article_action');?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="mark_read"><?php echo _t('mark_read'); ?></label>
+			<label class="group-name" for="mark_read"><?php echo _t('conf.shortcut.mark_read'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?php echo $s['mark_read']; ?>" />
-				<?php echo _t('shift_for_all_read'); ?>
+				<?php echo _t('conf.shortcut.shift_for_all_read'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="mark_favorite"><?php echo _t('mark_favorite'); ?></label>
+			<label class="group-name" for="mark_favorite"><?php echo _t('conf.shortcut.mark_favorite'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?php echo $s['mark_favorite']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="go_website"><?php echo _t('see_on_website'); ?></label>
+			<label class="group-name" for="go_website"><?php echo _t('conf.shortcut.see_on_website'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?php echo $s['go_website']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="auto_share_shortcut"><?php echo _t('auto_share'); ?></label>
+			<label class="group-name" for="auto_share_shortcut"><?php echo _t('conf.shortcut.auto_share'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?php echo $s['auto_share']; ?>" />
-				<?php echo _t('auto_share_help'); ?>
+				<?php echo _t('conf.shortcut.auto_share_help'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="collapse_entry"><?php echo _t('collapse_article'); ?></label>
+			<label class="group-name" for="collapse_entry"><?php echo _t('conf.shortcut.collapse_article'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?php echo $s['collapse_entry']; ?>" />
 			</div>
 		</div>
 
-		<legend><?php echo _t('shortcuts_other_action');?></legend>
+		<legend><?php echo _t('conf.shortcut.other_action');?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="load_more_shortcut"><?php echo _t('load_more'); ?></label>
+			<label class="group-name" for="load_more_shortcut"><?php echo _t('conf.shortcut.load_more'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="load_more_shortcut" name="shortcuts[load_more]" list="keys" value="<?php echo $s['load_more']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="focus_search_shortcut"><?php echo _t('focus_search'); ?></label>
+			<label class="group-name" for="focus_search_shortcut"><?php echo _t('conf.shortcut.focus_search'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="focus_search_shortcut" name="shortcuts[focus_search]" list="keys" value="<?php echo $s['focus_search']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="user_filter_shortcut"><?php echo _t('user_filter'); ?></label>
+			<label class="group-name" for="user_filter_shortcut"><?php echo _t('conf.shortcut.user_filter'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="user_filter_shortcut" name="shortcuts[user_filter]" list="keys" value="<?php echo $s['user_filter']; ?>" />
-				<?php echo _t('user_filter_help'); ?>
+				<?php echo _t('conf.shortcut.user_filter_help'); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="close_dropdown_shortcut"><?php echo _t('close_dropdown'); ?></label>
+			<label class="group-name" for="close_dropdown_shortcut"><?php echo _t('conf.shortcut.close_dropdown'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="help_shortcut" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="help_shortcut"><?php echo _t('help'); ?></label>
+			<label class="group-name" for="help_shortcut"><?php echo _t('conf.shortcut.help'); ?></label>
 			<div class="group-controls">
 				<input type="text" id="help_shortcut" name="shortcuts[help]" list="keys" value="<?php echo $s['help']; ?>" />
 			</div>
@@ -127,8 +127,8 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
 			</div>
 		</div>
 	</form>

app/views/index/normal.phtml

@@ -100,7 +100,7 @@ if (!empty($this->entries)) {
 				<h1 class="title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></h1>
 				<?php
 					$author = $item->author();
-					echo $author != '' ? '<div class="author">' . _t('index.entry.by_author', $author) . '</div>' : '',
+					echo $author != '' ? '<div class="author">' . _t('gen.short.by_author', $author) . '</div>' : '',
 						$lazyload && $hidePosts ? lazyimg($item->content()) : $item->content();
 				?>
 			</div>

app/views/index/reader.phtml

@@ -23,7 +23,7 @@ if (!empty($this->entries)) {
 
 				<div class="author"><?php
 					$author = $item->author();
-					echo $author != '' ? _t('index.entry.by_author', $author) . ' — ' : '',
+					echo $author != '' ? _t('gen.short.by_author', $author) . ' — ' : '',
 						$item->date();
 				?></div>