From 6b14a743ccfe5c14e15acac858c0906f4fccdf67 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 15 Dec 2024 12:34:18 +0100 Subject: New state: favorite or unread (#7088) * New state: favorite or unread https://github.com/FreshRSS/FreshRSS/discussions/7078#discussioncomment-11526292 * Experiment using this state by default * Rework state * Allow ANDS for typos * Revert change unrelated to this PR * Revert change of default state * Add option *unread_or_favorite* * Fix hide_read_feeds * i18n: it Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com> * Update app/i18n/pl/conf.php Co-authored-by: Zic <55097497+ZicPL@users.noreply.github.com> * Update app/i18n/pl/conf.php Co-authored-by: Zic <55097497+ZicPL@users.noreply.github.com> * Fix i18n * Fix auto_remove_article * Fix mark_unread_enabled --------- Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com> Co-authored-by: Zic <55097497+ZicPL@users.noreply.github.com> --- app/i18n/tr/conf.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/i18n/tr/conf.php') diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php index 751dba7c1..c442def82 100644 --- a/app/i18n/tr/conf.php +++ b/app/i18n/tr/conf.php @@ -257,12 +257,13 @@ return array( 'show' => array( '_' => 'Gösterilecek makaleler', 'active_category' => 'Mevcut kategori', - 'adaptive' => 'Ayarlanmış gösterim', + 'adaptive' => 'Show unreads if any, all articles otherwise', // TODO 'all_articles' => 'Tüm makaleleri göster', 'all_categories' => 'Tüm kategoriler', 'no_category' => 'Hiçbir kategori', 'remember_categories' => 'Açık kategorileri hatırla', 'unread' => 'Sadece okunmamış makaleleri göster', + 'unread_or_favorite' => 'Show unreads and favourites', // TODO ), 'show_fav_unread_help' => 'Etiketlerde de uygula', 'sides_close_article' => 'Makale dışında bir alana tıklamak makaleyi kapatır', -- cgit v1.2.3