Update i18n for statistics

app/Controllers/statsController.php

@@ -15,7 +15,7 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 			Minz_Error::error(403);
 		}
 
-		Minz_View::prependTitle(_t('stats') . ' · ');
+		Minz_View::prependTitle(_t('admin.stats.title') . ' · ');
 	}
 
 	/**

app/Models/StatsDAO.php

@@ -418,7 +418,7 @@ SQL;
 	 */
 	private function convertToTranslatedJson($data = array()) {
 		$translated = array_map(function($a) {
-			return _t($a);
+			return _t('gen.date.' . $a);
 		}, $data);
 
 		return json_encode($translated);

app/i18n/en/admin.php

@@ -87,9 +87,36 @@ return array(
 		),
 	),
 	'stats' => array(
+		'_' => 'Statistics',
+		'all_feeds' => 'All feeds',
+		'category' => 'Category',
+		'entry_count' => 'Entry count',
+		'entry_per_category' => 'Entries per category',
+		'entry_per_day' => 'Entries per day (last 30 days)',
+		'entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
+		'entry_per_hour' => 'Per hour (average: %.2f messages)',
+		'entry_per_month' => 'Per month (average: %.2f messages)',
+		'entry_repartition' => 'Entries repartition',
+		'feed' => 'Feed',
+		'feed_per_category' => 'Feeds per category',
 		'idle' => 'Idle feeds',
 		'main' => 'Main statistics',
+		'main_stream' => 'Main stream',
+		'menu' => array(
+			'idle' => 'Idle feeds',
+			'main' => 'Main statistics',
+			'repartition' => 'Articles repartition',
+		),
+		'no_idle' => 'There is no idle feed!',
+		'number_articles' => '%d articles',
+		'percent_of_total' => '%% of total',
 		'repartition' => 'Articles repartition',
+		'status_favorites' => 'Favourites',
+		'status_read' => 'Read',
+		'status_total' => 'Total',
+		'status_unread' => 'Unread',
+		'title' => 'Statistics',
+		'top_feed' => 'Top ten feeds',
 	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',

app/i18n/en/gen.php

@@ -5,6 +5,7 @@ return array(
 		'back_to_rss_feeds' => '← Go back to your RSS feeds',
 		'disable' => 'Disable',
 		'enable' => 'Enable',
+		'filter' => 'Filtrer',
 		'manage' => 'Manage',
 		'remove' => 'Remove',
 	),
@@ -25,10 +26,45 @@ return array(
 		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
 		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
+		'apr' => 'apr',
+		'april' => 'Apr',
+		'aug' => 'aug',
+		'august' => 'Aug',
 		'before_yesterday' => 'Before yesterday',
+		'dec' => 'dec',
+		'december' => 'Dec',
+		'feb' => 'feb',
+		'february' => 'Feb',
 		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
 		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+		'fri' => 'Fri',
+		'jan' => 'jan',
+		'january' => 'Jan',
+		'jul' => 'jul',
+		'july' => 'Jul',
+		'jun' => 'jun',
+		'june' => 'Jun',
+		'last_3_month' => 'Last three months',
+		'last_6_month' => 'Last six months',
+		'last_month' => 'Last month',
+		'last_week' => 'Last week',
+		'last_year' => 'Last year',
+		'mar' => 'mar',
+		'march' => 'Mar',
+		'may' => 'May',
+		'mon' => 'Mon',
+		'nov' => 'nov',
+		'november' => 'Nov',
+		'oct' => 'oct',
+		'october' => 'Oct',
+		'sat' => 'Sat',
+		'sep' => 'sep',
+		'september' => 'Sep',
+		'sun' => 'Sun',
+		'thu' => 'Thu',
 		'today' => 'Today',
+		'tue' => 'Tue',
+		'wed' => 'Wed',
 		'yesterday' => 'Yesterday',
 	),
 	'js' => array(
@@ -83,13 +119,10 @@ return array(
 	'administration' => 'Manage',
 	'advanced' => 'Advanced',
 	'after_onread' => 'After “mark all as read”,',
-	'all_feeds' => 'All feeds',
 	'allow_anonymous' => 'Allow anonymous reading of the articles of the default user (%s)',
 	'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles',
 	'already_subscribed' => 'You have already subscribed to <em>%s</em>',
 	'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>',
-	'apr' => 'apr',
-	'april' => 'Apr',
 	'archiving_configuration_help' => 'More options are available in the individual stream settings',
 	'article' => 'Article',
 	'article_icons' => 'Article icons',
@@ -102,8 +135,6 @@ return array(
 	'articles_to_display' => 'Articles to display',
 	'ask_empty' => 'Clear?',
 	'attention' => 'Attention!',
-	'aug' => 'aug',
-	'august' => 'Aug',
 	'auth_form' => 'Web form (traditional, requires JavaScript)',
 	'auth_form_not_set' => 'A problem occured during authentication system configuration. Please retry later.',
 	'auth_form_set' => 'Form is now your default authentication system.',
@@ -169,8 +200,6 @@ return array(
 	'current_user' => 'Current user',
 	'damn' => 'Damn!',
 	'data_is_ok' => 'Permissions on data directory are good',
-	'dec' => 'dec',
-	'december' => 'Dec',
 	'default_category' => 'Uncategorized',
 	'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
 	'default_view' => 'Default view',
@@ -190,8 +219,6 @@ return array(
 	'export_opml' => 'Export list of feeds (OPML)',
 	'export_starred' => 'Export your favourites',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
-	'feb' => 'feb',
-	'february' => 'Feb',
 	'feed' => 'Feed',
 	'feed_actualized' => '<em>%s</em> has been updated',
 	'feed_added' => 'RSS feed <em>%s</em> has been added',
@@ -219,7 +246,6 @@ return array(
 	'fix_errors_before' => 'Fix errors before skip to the next step.',
 	'focus_search' => 'Access search box',
 	'freshrss_installation' => 'Installation · FreshRSS',
-	'fri' => 'Fri',
 	'general_conf_is_ok' => 'General configuration has been saved.',
 	'general_configuration' => 'General configuration',
 	'help' => 'Display documentation',
@@ -242,40 +268,25 @@ return array(
 	'invalid_login' => 'Login is invalid',
 	'invalid_url' => 'URL <em>%s</em> is invalid',
 	'is_admin' => 'is administrator',
-	'jan' => 'jan',
-	'january' => 'Jan',
 	'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',
-	'jul' => 'jul',
-	'july' => 'Jul',
 	'jump_next' => 'jump to next unread sibling (feed or category)',
-	'jun' => 'jun',
-	'june' => 'Jun',
 	'keep_history' => 'Minimum number of articles to keep',
 	'keep_logged_in' => 'Keep me logged in <small>(1 month)</small>',
 	'language' => 'Language',
 	'language_defined' => 'Language has been defined.',
-	'last_3_month' => 'Last three months',
-	'last_6_month' => 'Last six months',
 	'last_article' => 'Skip to the last article',
-	'last_month' => 'Last month',
-	'last_week' => 'Last week',
-	'last_year' => 'Last year',
 	'log_is_ok' => 'Permissions on logs directory are good',
 	'login_configuration' => 'Login',
 	'login_persona_problem' => 'Connection problem with Persona?',
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
-	'mar' => 'mar',
-	'march' => 'Mar',
 	'mark_cat_read' => 'Mark category as read',
 	'mark_favorite' => 'Mark as favourite',
 	'mark_feed_read' => 'Mark feed as read',
-	'may' => 'May',
 	'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
 	'minz_is_ok' => 'You have the Minz framework',
-	'mon' => 'Mon',
 	'month' => 'months',
 	'more_information' => 'More information',
 	'n_entries_deleted' => '%d articles have been deleted',
@@ -296,13 +307,8 @@ return array(
 	'not_read' => '%d unread',
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
-	'nov' => 'nov',
-	'november' => 'Nov',
-	'number_articles' => '%d articles',
 	'number_divided_when_reader' => 'Divided by 2 in the reading view.',
 	'number_feeds' => '%d feeds',
-	'oct' => 'oct',
-	'october' => 'Oct',
 	'ok' => 'Ok!',
 	'oops' => 'Oops!',
 	'optimization_complete' => 'Optimization complete',
@@ -360,13 +366,10 @@ return array(
 	'refresh' => 'Refresh',
 	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
 	'rss_feed_management' => 'RSS feeds management',
-	'sat' => 'Sat',
 	'save' => 'Save',
 	'scroll' => 'while scrolling',
 	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
 	'see_on_website' => 'See on original website',
-	'sep' => 'sep',
-	'september' => 'Sep',
 	'share_name' => 'Share name to display',
 	'share_url' => 'Share URL to use',
 	'sharing_management' => 'Sharing options management',
@@ -381,32 +384,14 @@ return array(
 	'show_in_all_flux' => 'Show in main stream',
 	'sort_order' => 'Sort order',
 	'starred_list' => 'List of favourite articles',
-	'stats_entry_count' => 'Entry count',
-	'stats_entry_per_category' => 'Entries per category',
-	'stats_entry_per_day' => 'Entries per day (last 30 days)',
-	'stats_entry_per_day_of_week' => 'Per day of week (average: %.2f messages)',
-	'stats_entry_per_hour' => 'Per hour (average: %.2f messages)',
-	'stats_entry_per_month' => 'Per month (average: %.2f messages)',
-	'stats_entry_repartition' => 'Entries repartition',
-	'stats_feed_per_category' => 'Feeds per category',
-	'stats_no_idle' => 'There is no idle feed!',
-	'stats_percent_of_total' => '%% of total',
-	'stats_top_feed' => 'Top ten feeds',
-	'status_favorites' => 'Favourites',
-	'status_read' => 'Read',
-	'status_total' => 'Total',
-	'status_unread' => 'Unread',
 	'steps' => 'Steps',
 	'sticky_post' => 'Stick the article to the top when opened',
 	'submit' => 'Submit',
-	'sun' => 'Sun',
 	'theme' => 'Theme',
 	'this_is_the_end' => 'This is the end',
-	'thu' => 'Thu',
 	'top_line' => 'Top line',
 	'truncate' => 'Delete all articles',
 	'ttl' => 'Do not automatically refresh more often than',
-	'tue' => 'Tue',
 	'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
 	'update_apply' => 'Apply',
 	'update_can_apply' => 'An update is available.',
@@ -431,7 +416,6 @@ return array(
 	'users_list' => 'List of users',
 	'version_update' => 'Update',
 	'website_url' => 'Website URL',
-	'wed' => 'Wed',
 	'width_large' => 'Large',
 	'width_medium' => 'Medium',
 	'width_no_limit' => 'No limit',

app/i18n/fr/admin.php

@@ -87,9 +87,36 @@ return array(
 		),
 	),
 	'stats' => array(
+		'_' => 'Statistiques',
+		'all_feeds' => 'Tous les flux',
+		'category' => 'Catégorie',
+		'entry_count' => 'Nombre d’articles',
+		'entry_per_category' => 'Articles par catégorie',
+		'entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
+		'entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
+		'entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
+		'entry_per_month' => 'Par mois (moyenne : %.2f messages)',
+		'entry_repartition' => 'Répartition des articles',
+		'feed' => 'Flux',
+		'feed_per_category' => 'Flux par catégorie',
 		'idle' => 'Flux inactifs',
 		'main' => 'Statistiques principales',
+		'main_stream' => 'Flux principal',
+		'menu' => array(
+			'idle' => 'Flux inactifs',
+			'main' => 'Statistiques principales',
+			'repartition' => 'Répartition des articles',
+		),
+		'no_idle' => 'Il n’y a aucun flux inactif !',
+		'number_articles' => '%d articles',
+		'percent_of_total' => '%% du total',
 		'repartition' => 'Répartition des articles',
+		'status_favorites' => 'favoris',
+		'status_read' => 'lus',
+		'status_total' => 'total',
+		'status_unread' => 'non lus',
+		'title' => 'Statistiques',
+		'top_feed' => 'Les dix plus gros flux',
 	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',

app/i18n/fr/gen.php

@@ -5,6 +5,7 @@ return array(
 		'back_to_rss_feeds' => '← Retour à vos flux RSS',
 		'disable' => 'Désactiver',
 		'enable' => 'Activer',
+		'filter' => 'Filtrer',
 		'manage' => 'Gérer',
 		'remove' => 'Supprimer',
 	),
@@ -25,10 +26,45 @@ return array(
 		'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
 		'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
 		'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
+		'apr' => 'avr.',
+		'april' => 'avril',
+		'aug' => 'août',
+		'august' => 'août',
 		'before_yesterday' => 'À partir d’avant-hier',
+		'dec' => 'déc.',
+		'december' => 'décembre',
+		'feb' => 'fév.',
+		'february' => 'février',
+		'fri' => 'ven.',
+		'jan' => 'jan.',
+		'january' => 'janvier',
+		'jul' => 'jui.',
+		'july' => 'juillet',
+		'jun' => 'juin',
+		'june' => 'juin',
 		'format_date' => 'j %s Y',
 		'format_date_hour' => 'j %s Y \\à H\\:i',
+		'last_3_month' => 'Depuis les trois derniers mois',
+		'last_6_month' => 'Depuis les six derniers mois',
+		'last_month' => 'Depuis le mois dernier',
+		'last_week' => 'Depuis la semaine dernière',
+		'last_year' => 'Depuis l’année dernière',
+		'mar' => 'mar.',
+		'march' => 'mars',
+		'may' => 'mai.',
+		'mon' => 'lun.',
+		'nov' => 'nov.',
+		'november' => 'novembre',
+		'oct' => 'oct.',
+		'october' => 'octobre',
+		'sat' => 'sam.',
+		'sep' => 'sep.',
+		'september' => 'septembre',
+		'sun' => 'dim.',
+		'thu' => 'jeu.',
 		'today' => 'Aujourd’hui',
+		'tue' => 'mar.',
+		'wed' => 'mer.',
 		'yesterday' => 'Hier',
 	),
 	'js' => array(
@@ -71,7 +107,6 @@ return array(
 		'_' => 'Titre',
 		'authentication' => 'Authentification',
 		'check_install' => 'Vérification de l’installation',
-		'global_view' => 'Vue globale',
 		'user_management' => 'Gestion des utilisateurs',
 		'user_profile' => 'Profil',
 	),
@@ -84,13 +119,10 @@ return array(
 	'administration' => 'Gérer',
 	'advanced' => 'Avancé',
 	'after_onread' => 'Après “marquer tout comme lu”,',
-	'all_feeds' => 'Tous les flux',
 	'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',
 	'already_subscribed' => 'Vous êtes déjà abonné à <em>%s</em>',
 	'api_enabled' => 'Autoriser l’accès par <abbr>API</abbr> <small>(nécessaire pour les applis mobiles)</small>',
-	'apr' => 'avr.',
-	'april' => 'avril',
 	'archiving_configuration_help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 	'article' => 'Article',
 	'article_icons' => 'Icônes d’article',
@@ -103,8 +135,6 @@ return array(
 	'articles_to_display' => 'Articles à afficher',
 	'ask_empty' => 'Vider ?',
 	'attention' => 'Attention !',
-	'aug' => 'août',
-	'august' => 'août',
 	'auth_form' => 'Formulaire (traditionnel, requiert JavaScript)',
 	'auth_form_not_set' => 'Un problème est survenu lors de la configuration de votre système d’authentification. Veuillez réessayer plus tard.',
 	'auth_form_set' => 'Le formulaire est désormais votre système d’authentification.',
@@ -170,8 +200,6 @@ return array(
 	'current_user' => 'Utilisateur actuel',
 	'damn' => 'Arf !',
 	'data_is_ok' => 'Les droits sur le répertoire de data sont bons',
-	'dec' => 'déc.',
-	'december' => 'décembre',
 	'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',
@@ -191,8 +219,6 @@ return array(
 	'export_opml' => 'Exporter la liste des flux (OPML)',
 	'export_starred' => 'Exporter les favoris',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
-	'feb' => 'fév.',
-	'february' => 'février',
 	'feed' => 'Flux',
 	'feed_actualized' => '<em>%s</em> a été mis à jour.',
 	'feed_added' => 'Le flux <em>%s</em> a bien été ajouté.',
@@ -220,7 +246,6 @@ return array(
 	'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.',
 	'focus_search' => 'Accéder à la recherche',
 	'freshrss_installation' => 'Installation · FreshRSS',
-	'fri' => 'ven.',
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
 	'help' => 'Afficher la documentation',
@@ -243,40 +268,25 @@ return array(
 	'invalid_login' => 'L’identifiant est invalide !',
 	'invalid_url' => 'L’url <em>%s</em> est invalide.',
 	'is_admin' => 'est administrateur',
-	'jan' => 'jan.',
-	'january' => 'janvier',
 	'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é.',
-	'jul' => 'jui.',
-	'july' => 'juillet',
 	'jump_next' => 'sauter au prochain voisin non lu (flux ou catégorie)',
-	'jun' => 'juin',
-	'june' => 'juin',
 	'keep_history' => 'Nombre minimum d’articles à conserver',
 	'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
 	'language' => 'Langue',
 	'language_defined' => 'La langue a bien été définie.',
-	'last_3_month' => 'Depuis les trois derniers mois',
-	'last_6_month' => 'Depuis les six derniers mois',
 	'last_article' => 'Passer au dernier article',
-	'last_month' => 'Depuis le mois dernier',
-	'last_week' => 'Depuis la semaine dernière',
-	'last_year' => 'Depuis l’année dernière',
 	'log_is_ok' => 'Les droits sur le répertoire des logs sont bons',
 	'login_configuration' => 'Identification',
 	'login_persona_problem' => 'Problème de connexion à Persona ?',
 	'login_required' => 'Accès protégé par mot de passe :',
 	'login_with_persona' => 'Connexion avec Persona',
-	'mar' => 'mar.',
-	'march' => 'mars',
 	'mark_cat_read' => 'Marquer la catégorie comme lue',
 	'mark_favorite' => 'Mettre en favori',
 	'mark_feed_read' => 'Marquer le flux comme lu',
-	'may' => 'mai.',
 	'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',
-	'mon' => 'lun.',
 	'month' => 'mois',
 	'more_information' => 'Plus d’informations',
 	'n_entries_deleted' => '%d articles ont été supprimés.',
@@ -297,13 +307,8 @@ return array(
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
-	'nov' => 'nov.',
-	'november' => 'novembre',
-	'number_articles' => '%d articles',
 	'number_divided_when_reader' => 'Divisé par 2 dans la vue de lecture.',
 	'number_feeds' => '%d flux',
-	'oct' => 'oct.',
-	'october' => 'octobre',
 	'ok' => 'Ok !',
 	'oops' => 'Oups !',
 	'optimization_complete' => 'Optimisation terminée.',
@@ -361,13 +366,10 @@ return array(
 	'refresh' => 'Actualisation',
 	'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
 	'rss_feed_management' => 'Gestion des flux RSS',
-	'sat' => 'sam.',
 	'save' => 'Enregistrer',
 	'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',
-	'sep' => 'sep.',
-	'september' => 'septembre',
 	'share_name' => 'Nom du partage à afficher',
 	'share_url' => 'URL du partage à utiliser',
 	'sharing_management' => 'Gestion des options de partage',
@@ -382,32 +384,14 @@ return array(
 	'show_in_all_flux' => 'Afficher dans le flux principal',
 	'sort_order' => 'Ordre de tri',
 	'starred_list' => 'Liste des articles favoris',
-	'stats_entry_count' => 'Nombre d’articles',
-	'stats_entry_per_category' => 'Articles par catégorie',
-	'stats_entry_per_day' => 'Nombre d’articles par jour (30 derniers jours)',
-	'stats_entry_per_day_of_week' => 'Par jour de la semaine (moyenne : %.2f messages)',
-	'stats_entry_per_hour' => 'Par heure (moyenne : %.2f messages)',
-	'stats_entry_per_month' => 'Par mois (moyenne : %.2f messages)',
-	'stats_entry_repartition' => 'Répartition des articles',
-	'stats_feed_per_category' => 'Flux par catégorie',
-	'stats_no_idle' => 'Il n’y a aucun flux inactif !',
-	'stats_percent_of_total' => '%% du total',
-	'stats_top_feed' => 'Les dix plus gros flux',
-	'status_favorites' => 'favoris',
-	'status_read' => 'lus',
-	'status_total' => 'total',
-	'status_unread' => 'non lus',
 	'steps' => 'Étapes',
 	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
 	'submit' => 'Valider',
-	'sun' => 'dim.',
 	'theme' => 'Thème',
 	'this_is_the_end' => 'This is the end',
-	'thu' => 'jeu.',
 	'top_line' => 'Ligne du haut',
 	'truncate' => 'Supprimer tous les articles',
 	'ttl' => 'Ne pas automatiquement rafraîchir plus souvent que',
-	'tue' => 'mar.',
 	'unsafe_autologin' => 'Autoriser les connexions automatiques non-sûres au format : ',
 	'update_apply' => 'Appliquer la mise à jour',
 	'update_can_apply' => 'Une mise à jour est disponible.',
@@ -432,7 +416,6 @@ return array(
 	'users_list' => 'Liste des utilisateurs',
 	'version_update' => 'Mise à jour',
 	'website_url' => 'URL du site',
-	'wed' => 'mer.',
 	'width_large' => 'Large',
 	'width_medium' => 'Moyenne',
 	'width_no_limit' => 'Pas de limite',

app/layout/aside_stats.phtml

@@ -1,12 +1,12 @@
 <ul class="nav nav-list aside">
 	<li class="nav-header"><?php echo _t('admin.stats'); ?></li>
 	<li class="item<?php echo Minz_Request::actionName() == 'index' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('admin.stats.main'); ?></a>
+		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('admin.stats.menu.main'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() == 'idle' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('admin.stats.idle'); ?></a>
+		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('admin.stats.menu.idle'); ?></a>
 	</li>
 	<li class="item<?php echo Minz_Request::actionName() == 'repartition' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('admin.stats.repartition'); ?></a>
+		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('admin.stats.menu.repartition'); ?></a>
 	</li>
 </ul>

app/views/stats/idle.phtml

@@ -1,9 +1,9 @@
 <?php $this->partial('aside_stats'); ?>
 
 <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>
 
-	<h1><?php echo _t('stats_idle'); ?></h1>
+	<h1><?php echo _t('admin.stats.idle'); ?></h1>
 
 	<?php
 		$current_url = urlencode(Minz_Url::display(
@@ -16,7 +16,7 @@
 				$nothing = false;
 	?>
 		<div class="stat">
-			<h2><?php echo _t($period); ?></h2>
+			<h2><?php echo _t('gen.date.' . $period); ?></h2>
 
 			<form id="form-delete" method="post" style="display: none"></form>
 
@@ -24,13 +24,13 @@
 			<ul class="horizontal-list">
 				<li class="item">
 					<div class="stick">
-						<a class="btn" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed['id']); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
-						<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
-						<button class="btn btn-attention confirm" form="form-delete" formaction="<?php echo _url('feed', 'delete', 'id', $feed['id'], 'r', $current_url); ?>"><?php echo _t('delete'); ?></button>
+						<a class="btn" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed['id']); ?>"><?php echo _i('link'); ?> <?php echo _t('gen.action.filter'); ?></a>
+						<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.action.manage'); ?></a>
+						<button class="btn btn-attention confirm" form="form-delete" formaction="<?php echo _url('feed', 'delete', 'id', $feed['id'], 'r', $current_url); ?>"><?php echo _t('gen.action.remove'); ?></button>
 					</div>
 				</li>
 				<li class="item">
-					<span title="<?php echo timestamptodate($feed['last_date'], false); ?>"><?php echo $feed['name']; ?> (<?php echo _t('number_articles', $feed['nb_articles']); ?>)</span>
+					<span title="<?php echo timestamptodate($feed['last_date'], false); ?>"><?php echo $feed['name']; ?> (<?php echo _t('admin.stats.number_articles', $feed['nb_articles']); ?>)</span>
 				</li>
 			</ul>
 			<?php } ?>
@@ -42,7 +42,7 @@
 		if ($nothing) {
 	?>
 	<p class="alert alert-warn">
-		<span class="alert-head"><?php echo _t('stats_no_idle'); ?></span>
+		<span class="alert-head"><?php echo _t('admin.stats.no_idle'); ?></span>
 	</p>
 	<?php } ?>
 </div>

app/views/stats/index.phtml

@@ -1,38 +1,38 @@
 <?php $this->partial('aside_stats'); ?>
 
 <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>
 
-	<h1><?php echo _t('stats_main'); ?></h1>
+	<h1><?php echo _t('admin.stats.main'); ?></h1>
 
 	<div class="stat half">
-		<h2><?php echo _t('stats_entry_repartition'); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_repartition'); ?></h2>
 		<table>
 			<thead>
 				<tr>
 					<th> </th>
-					<th><?php echo _t('main_stream'); ?></th>
-					<th><?php echo _t('all_feeds'); ?></th>
+					<th><?php echo _t('admin.stats.main_stream'); ?></th>
+					<th><?php echo _t('admin.stats.all_feeds'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr>
-					<th><?php echo _t('status_total'); ?></th>
+					<th><?php echo _t('admin.stats.status_total'); ?></th>
 					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['total']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['total']); ?></td>
 				</tr>
 				<tr>
-					<th><?php echo _t('status_read'); ?></th>
+					<th><?php echo _t('admin.stats.status_read'); ?></th>
 					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['read']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['read']); ?></td>
 				</tr>
 				<tr>
-					<th><?php echo _t('status_unread'); ?></th>
+					<th><?php echo _t('admin.stats.status_unread'); ?></th>
 					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['unread']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['unread']); ?></td>
 				</tr>
 				<tr>
-					<th><?php echo _t('status_favorites'); ?></th>
+					<th><?php echo _t('admin.stats.status_favorites'); ?></th>
 					<td class="numeric"><?php echo format_number($this->repartition['main_stream']['favorite']); ?></td>
 					<td class="numeric"><?php echo format_number($this->repartition['all_feeds']['favorite']); ?></td>
 				</tr>
@@ -41,14 +41,14 @@
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t('stats_top_feed'); ?></h2>
+		<h2><?php echo _t('admin.stats.top_feed'); ?></h2>
 		<table>
 			<thead>
 				<tr>
-					<th><?php echo _t('feed'); ?></th>
-					<th><?php echo _t('category'); ?></th>
-					<th><?php echo _t('stats_entry_count'); ?></th>
-					<th><?php echo _t('stats_percent_of_total'); ?></th>
+					<th><?php echo _t('admin.stats.feed'); ?></th>
+					<th><?php echo _t('admin.stats.category'); ?></th>
+					<th><?php echo _t('admin.stats.entry_count'); ?></th>
+					<th><?php echo _t('admin.stats.percent_of_total'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -65,18 +65,18 @@
 	</div>
 
 	<div class="stat">
-		<h2><?php echo _t('stats_entry_per_day'); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_day'); ?></h2>
 		<div id="statsEntryPerDay" style="height: 300px"></div>
 	</div>
 
 	<div class="stat half">
-		<h2><?php echo _t('stats_feed_per_category'); ?></h2>
+		<h2><?php echo _t('admin.stats.feed_per_category'); ?></h2>
 		<div id="statsFeedPerCategory" style="height: 300px"></div>
 		<div id="statsFeedPerCategoryLegend"></div>
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t('stats_entry_per_category'); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_category'); ?></h2>
 		<div id="statsEntryPerCategory" style="height: 300px"></div>
 		<div id="statsEntryPerCategoryLegend"></div>
 	</div>

app/views/stats/repartition.phtml

@@ -1,12 +1,12 @@
 <?php $this->partial('aside_stats'); ?>
 
 <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>
 
-	<h1><?php echo _t('stats_repartition'); ?></h1>
+	<h1><?php echo _t('admin.stats.repartition'); ?></h1>
 
 	<select id="feed_select" class="select-change">
-		<option data-url="<?php echo _url('stats', 'repartition')?>"><?php echo _t('all_feeds')?></option>
+		<option data-url="<?php echo _url('stats', 'repartition')?>"><?php echo _t('admin.stats.all_feeds')?></option>
 	<?php foreach ($this->categories as $category) {
 		$feeds = $category->feeds();
 		if (!empty($feeds)) {
@@ -25,17 +25,17 @@
 
 	<?php if ($this->feed) {?>
 		<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $this->feed->id()); ?>">
-			<?php echo _i('configure'); ?> <?php echo _t('administration'); ?>
+			<?php echo _i('configure'); ?> <?php echo _t('gen.action.manage'); ?>
 		</a>
 	<?php }?>
 
 	<div class="stat">
 	    <table>
 		<tr>
-		    <th><?php echo _t('status_total'); ?></th>
-		    <th><?php echo _t('status_read'); ?></th>
-		    <th><?php echo _t('status_unread'); ?></th>
-		    <th><?php echo _t('status_favorites'); ?></th>
+		    <th><?php echo _t('admin.stats.status_total'); ?></th>
+		    <th><?php echo _t('admin.stats.status_read'); ?></th>
+		    <th><?php echo _t('admin.stats.status_unread'); ?></th>
+		    <th><?php echo _t('admin.stats.status_favorites'); ?></th>
 		</tr>
 		<tr>
 		    <td class="numeric"><?php echo $this->repartition['total']; ?></td>
@@ -47,17 +47,17 @@
 	</div>
 
 	<div class="stat">
-		<h2><?php echo _t('stats_entry_per_hour', $this->averageHour); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_hour', $this->averageHour); ?></h2>
 		<div id="statsEntryPerHour" style="height: 300px"></div>
 	</div>
 
 	<div class="stat half">
-		<h2><?php echo _t('stats_entry_per_day_of_week', $this->averageDayOfWeek); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_day_of_week', $this->averageDayOfWeek); ?></h2>
 		<div id="statsEntryPerDayOfWeek" style="height: 300px"></div>
 	</div><!--
 
 	--><div class="stat half">
-		<h2><?php echo _t('stats_entry_per_month', $this->averageMonth); ?></h2>
+		<h2><?php echo _t('admin.stats.entry_per_month', $this->averageMonth); ?></h2>
 		<div id="statsEntryPerMonth" style="height: 300px"></div>
 	</div>
 </div>