Prepare options for category-level filter actions (#6920)

* Prepare options for category-level filter actions
Slightly move some options and add some help messages
Contributes to https://github.com/FreshRSS/FreshRSS/issues/6866
Prepare https://github.com/FreshRSS/FreshRSS/issues/6143

* Remove redudant help
Text changed by https://github.com/FreshRSS/FreshRSS/pull/6922 to be more precise

26 files changed, 53 insertions, 28 deletions

diff --git a/app/i18n/cs/conf.php b/app/i18n/cs/conf.php
index b6564cbfe..158259374 100644
--- a/app/i18n/cs/conf.php
+++ b/app/i18n/cs/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Čtení',
 		'after_onread' => 'Po „označit vše jako přečtené“',
 		'always_show_favorites' => 'Ve výchozím nastavení zobrazit všechny články v oblíbených',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Autoři a datum',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 1bee015cf..4743fd4ad 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Lesen',
 		'after_onread' => 'Nach „Alle als gelesen markieren“,',
 		'always_show_favorites' => 'Favoriten immer anzeigen',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Autoren und Datum',
diff --git a/app/i18n/el/conf.php b/app/i18n/el/conf.php
index aa84a26fb..843884970 100644
--- a/app/i18n/el/conf.php
+++ b/app/i18n/el/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Reading',	// TODO
 		'after_onread' => 'After “mark all as read”,',	// TODO
 		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Authors and date',	// TODO
diff --git a/app/i18n/en-us/conf.php b/app/i18n/en-us/conf.php
index 588e60c76..f241163ba 100644
--- a/app/i18n/en-us/conf.php
+++ b/app/i18n/en-us/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Reading',	// IGNORE
 		'after_onread' => 'After “mark all as read”,',	// IGNORE
 		'always_show_favorites' => 'Show all articles in favorites by default',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// IGNORE
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Authors and date',	// IGNORE
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 829687dd0..72d7ad4fe 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Reading',
 		'after_onread' => 'After “mark all as read”,',
 		'always_show_favorites' => 'Show all articles in favourites by default',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Authors and date',
diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php
index a5d1cc978..0a4dc635b 100644
--- a/app/i18n/es/conf.php
+++ b/app/i18n/es/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Lectura',
 		'after_onread' => 'Tras “marcar todo como leído”,',
 		'always_show_favorites' => 'Mostrar todos los artículos en favoritos de forma predeterminada',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Autores y fecha',
diff --git a/app/i18n/fa/conf.php b/app/i18n/fa/conf.php
index b7a9b0293..0c2be1a34 100644
--- a/app/i18n/fa/conf.php
+++ b/app/i18n/fa/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => ' خواندن',
 		'after_onread' => ' بعد از "علامت گذاری همه به عنوان خوانده شده"',
 		'always_show_favorites' => ' نمایش همه مقالات در موارد دلخواه به طور پیش فرض',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => ' نویسندگان و تاریخ',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index b1b06eb25..129bbde43 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Lecture',
 		'after_onread' => 'Après « Marquer tout comme lu »,',
 		'always_show_favorites' => 'Afficher par défaut tous les articles dans les favoris',
+		'apply_to_individual_feed' => 'S’applique aux flux individuellement',
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Auteurs et date',
diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php
index 318f64f70..cb2f5b152 100644
--- a/app/i18n/he/conf.php
+++ b/app/i18n/he/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'קריאה',
 		'after_onread' => 'לאחר “סימון הכל כנקרא”,',
 		'always_show_favorites' => 'Show all articles in favourites by default',	// TODO
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Authors and date',	// TODO
diff --git a/app/i18n/hu/conf.php b/app/i18n/hu/conf.php
index acfb04b91..df34c9bea 100644
--- a/app/i18n/hu/conf.php
+++ b/app/i18n/hu/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Olvasás',
 		'after_onread' => 'Utána „minden megjelölése olvasottként”,',
 		'always_show_favorites' => 'Minden cikk megjelenítése a kedvencekben alapértelmezetten',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Szerzők és dátum',
diff --git a/app/i18n/id/conf.php b/app/i18n/id/conf.php
index 7c67c64d7..e3dc3e390 100644
--- a/app/i18n/id/conf.php
+++ b/app/i18n/id/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Membaca',
 		'after_onread' => 'Setelah “tandai semua sebagai telah dibaca”',
 		'always_show_favorites' => 'Selalu tampilkan semua artikel favorit secara default',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Penulis dan tanggal',
diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
index 8417bbc13..c55d87147 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Lettura',
 		'after_onread' => 'Dopo “segna tutto come letto”,',
 		'always_show_favorites' => 'Mostra tutti gli articoli nei preferiti di default',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Autori e data',
diff --git a/app/i18n/ja/conf.php b/app/i18n/ja/conf.php
index 9832c636a..38cd74655 100644
--- a/app/i18n/ja/conf.php
+++ b/app/i18n/ja/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'リーディング',
 		'after_onread' => '“すべてに既読を付ける”を押した後,',
 		'always_show_favorites' => 'デフォルトですべてのお気に入りの記事を表示する',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => '著者と日付',
diff --git a/app/i18n/ko/conf.php b/app/i18n/ko/conf.php
index f14a67ba8..66f690f71 100644
--- a/app/i18n/ko/conf.php
+++ b/app/i18n/ko/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => '읽기',
 		'after_onread' => '“모두 읽음으로 표시” 후,',
 		'always_show_favorites' => '기본으로 즐겨찾기에 있는 모든 글을 표시',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => '작성자, 작성일',
diff --git a/app/i18n/lv/conf.php b/app/i18n/lv/conf.php
index 87eef7260..30de855c6 100644
--- a/app/i18n/lv/conf.php
+++ b/app/i18n/lv/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Lasīšana',
 		'after_onread' => 'Pēc "atzīmēt visus kā izlasītus",',
 		'always_show_favorites' => 'Pēc noklusējuma rādīt visus rakstus mīļāko sadaļā',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Autori un datums',
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index ed87b253f..46115fc39 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Lezen',
 		'after_onread' => 'Na „markeer alles als gelezen”,',
 		'always_show_favorites' => 'Toon alle artikelen standaard in favorieten',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Auteurs en datum',
diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php
index 2e2afa73d..30e9eeef0 100644
--- a/app/i18n/oc/conf.php
+++ b/app/i18n/oc/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Lectura',
 		'after_onread' => 'Aprèp « marcar coma legit »,',
 		'always_show_favorites' => 'Mostrar totes los articles dels favorits per defaut',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Autors e data',
diff --git a/app/i18n/pl/conf.php b/app/i18n/pl/conf.php
index 77a15b3b5..071eef8b3 100644
--- a/app/i18n/pl/conf.php
+++ b/app/i18n/pl/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Czytanie',
 		'after_onread' => 'Po oznaczeniu wszystkich jako przeczytane,',
 		'always_show_favorites' => 'Pokaż wszystkie wiadomości po wejściu do ulubionych',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Autor i data',
diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php
index 39180b03c..0bfc5cf6c 100644
--- a/app/i18n/pt-br/conf.php
+++ b/app/i18n/pt-br/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Leitura',
 		'after_onread' => 'Depois de “marcar todos como lido”,',
 		'always_show_favorites' => 'Mostrar todos os artivos nos favoritos por padrão',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Autores e Data',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index 1ec861269..7b5b49f8b 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Чтение',
 		'after_onread' => 'После «отметить всё прочитанным»',
 		'always_show_favorites' => 'Показывать все статьи в избранном по умолчанию',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Авторы и дата',
diff --git a/app/i18n/sk/conf.php b/app/i18n/sk/conf.php
index 7e8604037..193c3bb88 100644
--- a/app/i18n/sk/conf.php
+++ b/app/i18n/sk/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Čítanie',
 		'after_onread' => 'Po “Označiť všetko ako prečítané”,',
 		'always_show_favorites' => 'Automaticky zobraziť všetky články v obľúbených',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Authori a dátum',
diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
index 0619125f4..0825551f3 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => 'Okuma',
 		'after_onread' => '“Hepsini okundu say” dedinten sonra,',
 		'always_show_favorites' => 'Öntanımlı olarak favori tüm makaleleri göster',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => 'Yazarlar ve Tarih',
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 891031f6f..a39024ffb 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => '阅读',
 		'after_onread' => '“全部标记为已读”后',
 		'always_show_favorites' => '默认显示收藏夹中所有的文章',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => '作者和日期',
diff --git a/app/i18n/zh-tw/conf.php b/app/i18n/zh-tw/conf.php
index 7b57c4403..d75755373 100644
--- a/app/i18n/zh-tw/conf.php
+++ b/app/i18n/zh-tw/conf.php
@@ -173,6 +173,7 @@ return array(
 		'_' => '閱讀',
 		'after_onread' => '「全部標記為已讀」後',
 		'always_show_favorites' => '預設顯示收藏夾中所有的文章',
+		'apply_to_individual_feed' => 'Applies to feeds individually',	// TODO
 		'article' => array(
 			'authors_date' => array(
 				'_' => '作者和日期',
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 474700117..feef45b6b 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -244,17 +244,6 @@
 			</div>
 
 			<div class="form-group">
-				<div class="group-controls">
-					<label class="checkbox" for="mark_updated_article_unread">
-						<input type="checkbox" name="mark_updated_article_unread" id="mark_updated_article_unread" value="1"<?=
-							FreshRSS_Context::userConf()->mark_updated_article_unread ? ' checked="checked"' : '' ?>
-							data-leave-validation="<?= FreshRSS_Context::userConf()->mark_updated_article_unread ?>"/>
-						<?= _t('conf.reading.mark_updated_article_unread') ?>
-					</label>
-				</div>
-			</div>
-
-			<div class="form-group">
 				<label class="group-name" for="check_open_article"><?= _t('conf.reading.read.when') ?></label>
 				<div class="group-controls">
 					<label class="checkbox" for="check_open_article">
@@ -301,6 +290,20 @@
 					</label>
 				</div>
 			</div>
+		</fieldset>
+
+		<fieldset>
+			<legend><?= _t('sub.feed.filteractions') ?></legend>
+			<div class="form-group">
+				<div class="group-controls">
+					<label class="checkbox" for="mark_updated_article_unread">
+						<input type="checkbox" name="mark_updated_article_unread" id="mark_updated_article_unread" value="1"<?=
+							FreshRSS_Context::userConf()->mark_updated_article_unread ? ' checked="checked"' : '' ?>
+							data-leave-validation="<?= FreshRSS_Context::userConf()->mark_updated_article_unread ?>"/>
+						<?= _t('conf.reading.mark_updated_article_unread') ?>
+					</label>
+				</div>
+			</div>
 
 			<div class="form-group">
 				<label class="group-name" for="enable_read_when_same_title_in_feed"><?= _t('conf.reading.read.when') ?></label>
@@ -342,22 +345,6 @@
 			</div>
 
 			<div class="form-group">
-				<div class="group-controls">
-					<label class="checkbox" for="keep_max_n_unread">
-						<input type="checkbox" name="enable_keep_max_n_unread" id="enable_keep_max_n_unread" value="1"<?=
-							empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? '' : ' checked="checked"' ?>
-							data-leave-validation="<?= empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? 0 : 1 ?>"/>
-						<?= _t('conf.reading.read.keep_max_n_unread') ?>
-						<?php $keep_max_n_unread = empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? 1000 : FreshRSS_Context::userConf()->mark_when['max_n_unread']; ?>
-						<input type="number" id="keep_max_n_unread" name="keep_max_n_unread" min="0" value="<?= $keep_max_n_unread ?>" data-leave-validation="<?= $keep_max_n_unread ?>" />
-					</label>
-				</div>
-			</div>
-		</fieldset>
-
-		<fieldset>
-			<legend><?= _t('sub.feed.filteractions') ?></legend>
-			<div class="form-group">
 				<label class="group-name" for="filteractions_read"><?= _t('conf.reading.read.when') ?></label>
 				<div class="group-controls">
 					<textarea name="filteractions_read" id="filteractions_read" class="w100"><?php
@@ -380,6 +367,19 @@
 					<p class="help"><?= _i('help') ?> <?= _t('sub.feed.filteractions.help') ?></p>
 				</div>
 			</div>
+
+			<div class="form-group">
+				<div class="group-controls">
+					<label class="checkbox" for="keep_max_n_unread">
+						<input type="checkbox" name="enable_keep_max_n_unread" id="enable_keep_max_n_unread" value="1"<?=
+							empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? '' : ' checked="checked"' ?>
+							data-leave-validation="<?= empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? 0 : 1 ?>"/>
+						<?= _t('conf.reading.read.keep_max_n_unread') ?>
+						<?php $keep_max_n_unread = empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? 1000 : FreshRSS_Context::userConf()->mark_when['max_n_unread']; ?>
+						<input type="number" id="keep_max_n_unread" name="keep_max_n_unread" min="0" value="<?= $keep_max_n_unread ?>" data-leave-validation="<?= $keep_max_n_unread ?>" />
+					</label>
+				</div>
+			</div>
 		</fieldset>
 
 		<fieldset>
diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml
index a922d4dca..96924c8f4 100644
--- a/app/views/helpers/category/update.phtml
+++ b/app/views/helpers/category/update.phtml
@@ -137,7 +137,8 @@
 			?>
 
 			<p class="alert alert-warn">
-				<?= _t('conf.archiving.policy_warning') ?>
+				<?= _t('conf.archiving.policy_warning') ?><br />
+				<?= _t('conf.reading.apply_to_individual_feed') ?>
 			</p>
 
 			<div class="form-group">