aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-08 22:07:35 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-08 22:07:35 +0100
commit38cf6946ed2fdbf1149978428ed93053dd9a375a (patch)
tree795d9abe85a7ac596a356432910ff9bc944112c7 /app
parentb15781045e03adc725da468d95734048600f6c04 (diff)
Fix issue #244: catégorie "tous" devient "flux principal"
Diffstat (limited to 'app')
-rw-r--r--app/i18n/en.php4
-rw-r--r--app/i18n/fr.php2
-rw-r--r--app/layout/aside_flux.phtml3
3 files changed, 5 insertions, 4 deletions
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>