diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-09-17 09:30:31 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-09-17 09:30:31 +0200 |
| commit | f5c863705ba63b124decb3769fc26798bf12a016 (patch) | |
| tree | e0932e7f1524c64eaab877f37975e772a5cc1980 /app/i18n | |
| parent | fc5cae981f906bc887eaf053b1826f9153210423 (diff) | |
| parent | 83832a39c4651bd3e4bfa007f75c91d040db79d3 (diff) | |
Merge branch 'reading-conf' of github.com:aledeg/FreshRSS into aledeg-reading-conf
Diffstat (limited to 'app/i18n')
| -rw-r--r-- | app/i18n/en.php | 2 | ||||
| -rw-r--r-- | app/i18n/fr.php | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php index 0c6d0e94f..7c66864c1 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -92,6 +92,7 @@ return array ( 'rss_view' => 'RSS feed', 'show_all_articles' => 'Show all articles', 'show_not_reads' => 'Show only unread', + 'show_not_reads_with_fallback' => 'Show only unread or read if no unread', 'show_read' => 'Show only read', 'show_favorite' => 'Show only favorites', 'show_not_favorite' => 'Show all but favorites', @@ -271,6 +272,7 @@ return array ( 'articles_per_page' => 'Number of articles per page', 'number_divided_when_unfolded' => 'Divided by 2 during loading of unfolded articles.', 'default_view' => 'Default view', + 'articles_to_display' => 'Articles to display', 'sort_order' => 'Sort order', 'auto_load_more' => 'Load next articles at the page bottom', 'display_articles_unfolded' => 'Show articles unfolded by default', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 403638c99..327661035 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -92,6 +92,7 @@ return array ( 'rss_view' => 'Flux RSS', 'show_all_articles' => 'Afficher tous les articles', 'show_not_reads' => 'Afficher les non lus', + 'show_not_reads_with_fallback' => 'Afficher les non lus ou les lus si aucun non lus', 'show_read' => 'Afficher les lus', 'show_favorite' => 'Afficher les favoris', 'show_not_favorite' => 'Afficher tout sauf les favoris', @@ -271,6 +272,7 @@ return array ( 'articles_per_page' => 'Nombre d’articles par page', 'number_divided_when_unfolded' => 'Divisé par 2 lors du chargement d’articles dépliés.', 'default_view' => 'Vue par défaut', + 'articles_to_display' => 'Articles à afficher', 'sort_order' => 'Ordre de tri', 'auto_load_more' => 'Charger les articles suivants en bas de page', 'display_articles_unfolded' => 'Afficher les articles dépliés par défaut', |