From 38cf6946ed2fdbf1149978428ed93053dd9a375a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 8 Nov 2013 22:07:35 +0100
Subject: Fix issue #244: catégorie "tous" devient "flux principal"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/i18n/en.php             | 4 ++--
 app/i18n/fr.php             | 2 +-
 app/layout/aside_flux.phtml | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/i18n/en.php b/app/i18n/en.php
index fad4f4cce..2f9232160 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -19,7 +19,7 @@ return array (
 	'import_export_opml'		=> 'Import / export (OPML)',
 
 	'subscription_management'	=> 'Subscriptions management',
-	'all_feeds'			=> 'All (%d)',
+	'all_feeds'			=> 'Main stream (%d)',
 	'favorite_feeds'		=> 'Favourites (%d)',
 	'not_read'			=> '%d unread',
 	'not_reads'			=> '%d unread',
@@ -133,7 +133,7 @@ return array (
 	'keep_history'			=> 'Keep history?',
 	'categorize'			=> 'Store in a category',
 	'advanced'			=> 'Advanced',
-	'show_in_all_flux'		=> 'Show in principal stream',
+	'show_in_all_flux'		=> 'Show in main stream',
 	'yes'				=> 'Yes',
 	'no'				=> 'No',
 	'css_path_on_website'		=> 'Articles CSS path on original website',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 2e4fa88c4..37d562812 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -19,7 +19,7 @@ return array (
 	'import_export_opml'		=> 'Importer / exporter (OPML)',
 
 	'subscription_management'	=> 'Gestion des abonnements',
-	'all_feeds'			=> 'Tous (%d)',
+	'all_feeds'			=> 'Flux principal (%d)',
 	'favorite_feeds'		=> 'Favoris (%d)',
 	'not_read'			=> '%d non lu',
 	'not_reads'			=> '%d non lus',
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index a2465c6cf..1c1b5559c 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -14,7 +14,8 @@
 		<li>
 			<div class="category all">
 				<a data-unread="<?php echo $this->nb_not_read; ?>" class="btn<?php echo $this->get_c == 'all' ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index'); ?>">
-					<i class="icon i_all"></i><?php echo Translate::t ('all_feeds', $this->nb_total); ?>
+					<i class="icon i_all"></i>
+					<?php echo Translate::t ('all_feeds', $this->nb_total); ?>
 				</a>
 			</div>
 		</li>
-- 
cgit v1.2.3