Clarify that maximum number to keep is per feed (#5458)

* Clarify that maximum number to keep is per feed

Signed-off-by: Christian König <ckoenig@posteo.de>

* Append //DIRTY

Signed-off-by: Christian König <ckoenig@posteo.de>

* make fix-all

* Revert wrong whitespace

* Amend Credits.md

Signed-off-by: Christian König <ckoenig@posteo.de>

---------

Signed-off-by: Christian König <ckoenig@posteo.de>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

23 files changed, 23 insertions, 22 deletions

diff --git a/CREDITS.md b/CREDITS.md
index 1f8267244..42490cf5d 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -38,6 +38,7 @@ People are sorted by name so please keep this order.
 * [Cem KOÇ](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:hckweb)
 * [chemical1979](https://github.com/chemical1979): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:chemical1979)
 * [Chris Francy](https://github.com/zoredache): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:zoredache)
+* [Christian König](https://github.com/yubiuser): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:yubiuser)
 * [Çılga İşcan Tercanlı](https://github.com/CilgaIscan): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:CilgaIscan)
 * [Clemens Neubauer](https://github.com/cn-tools): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:cn-tools), [Web](http://cn-tools.eu/)
 * [Corentin Garcia](https://github.com/corenting): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:corenting), [Web](http://corenting.fr/)
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index 04e8fc6c4..0d6d5893f 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Více možností je dostupných v nastavení jednotlivých kanálů',
 		'keep_favourites' => 'Nikdy neodstraňovat oblíbené',
 		'keep_labels' => 'Nikdy neodstraňovat popisky',
-		'keep_max' => 'Maximální počet článků k ponechání',
+		'keep_max' => 'Maximální počet článků k ponechání na kanál',
 		'keep_min_by_feed' => 'Minimální počet článků k ponechání na kanál',
 		'keep_period' => 'Maximální stáří článků k ponechání',
 		'keep_unreads' => 'Nikdy neodstraňovat nepřečtené články',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 3cd6b5bc9..506b228be 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Weitere Optionen sind in den Einstellungen der individuellen Feeds verfügbar.',
 		'keep_favourites' => 'Lieblingsartikel behalten',
 		'keep_labels' => 'Artikel mit Label behalten',
-		'keep_max' => 'Maximale Anzahl an Artikeln die behalten werden',
+		'keep_max' => 'Maximale Anzahl an Artikeln, die pro Feed die behalten werden',
 		'keep_min_by_feed' => 'Minimale Anzahl an Artikeln, die pro Feed behalten werden',
 		'keep_period' => 'Maximales Alter der zu behaltenden Artikel',
 		'keep_unreads' => 'Ungelesene Artikel behalten',
diff --git a/app/i18n/el/conf.php b/app/i18n/el/conf.php
index 7a9fad9a0..9f55b3f5c 100644
--- a/app/i18n/el/conf.php
+++ b/app/i18n/el/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'More options are available in the individual feed’s settings',	// TODO
 		'keep_favourites' => 'Never delete favourites',	// TODO
 		'keep_labels' => 'Never delete labels',	// TODO
-		'keep_max' => 'Maximum number of articles to keep',	// TODO
+		'keep_max' => 'Maximum number of articles to keep per feed',	// TODO
 		'keep_min_by_feed' => 'Minimum number of articles to keep per feed',	// TODO
 		'keep_period' => 'Maximum age of articles to keep',	// TODO
 		'keep_unreads' => 'Never delete unread articles',	// TODO
diff --git a/app/i18n/en-us/conf.php b/app/i18n/en-us/conf.php
index c24e1efda..7e0232c04 100644
--- a/app/i18n/en-us/conf.php
+++ b/app/i18n/en-us/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'More options are available in the individual feed’s settings',	// IGNORE
 		'keep_favourites' => 'Never delete favorites',
 		'keep_labels' => 'Never delete labels',	// IGNORE
-		'keep_max' => 'Maximum number of articles to keep',	// IGNORE
+		'keep_max' => 'Maximum number of articles to keep per feed',	// IGNORE
 		'keep_min_by_feed' => 'Minimum number of articles to keep per feed',	// IGNORE
 		'keep_period' => 'Maximum age of articles to keep',	// IGNORE
 		'keep_unreads' => 'Never delete unread articles',	// IGNORE
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 266e77281..4c99ae6a2 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'More options are available in the individual feed’s settings',
 		'keep_favourites' => 'Never delete favourites',
 		'keep_labels' => 'Never delete labels',
-		'keep_max' => 'Maximum number of articles to keep',
+		'keep_max' => 'Maximum number of articles to keep per feed',
 		'keep_min_by_feed' => 'Minimum number of articles to keep per feed',
 		'keep_period' => 'Maximum age of articles to keep',
 		'keep_unreads' => 'Never delete unread articles',
diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php
index d2212a779..b6d414d03 100644
--- a/app/i18n/es/conf.php
+++ b/app/i18n/es/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Hay más opciones disponibles en los ajustes de la fuente',
 		'keep_favourites' => 'Nunca elimines favoritos',
 		'keep_labels' => 'Nunca elimine etiquetas',
-		'keep_max' => 'Número máximo de artículos a conservar',
+		'keep_max' => 'Número máximo de artículos a conservar por fuente',
 		'keep_min_by_feed' => 'Número mínimo de artículos a conservar por fuente',
 		'keep_period' => 'Edad máxima de los artículos a conservar',
 		'keep_unreads' => 'Nunca elimine artículos no leídos',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index beebef75a..ac4cebc4a 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'D’autres options sont disponibles dans la configuration individuelle des flux.',
 		'keep_favourites' => 'Ne jamais supprimer les articles favoris',
 		'keep_labels' => 'Ne jamais supprimer les articles étiquetés',
-		'keep_max' => 'Nombre maximum d’articles à conserver',
+		'keep_max' => 'Nombre maximum d’articles à conserver par flux',
 		'keep_min_by_feed' => 'Nombre minimum d’articles à conserver par flux',
 		'keep_period' => 'Âge maximum des articles à conserver',
 		'keep_unreads' => 'Ne jamais supprimer les articles non lus',
diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php
index d84024b30..96def73f2 100644
--- a/app/i18n/he/conf.php
+++ b/app/i18n/he/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'אפשרויות נוספות זמינות בזרמים ספציפיים',
 		'keep_favourites' => 'Never delete favourites',	// TODO
 		'keep_labels' => 'Never delete labels',	// TODO
-		'keep_max' => 'Maximum number of articles to keep',	// TODO
+		'keep_max' => 'Maximum number of articles to keep per feed',	// TODO
 		'keep_min_by_feed' => 'Minimum number of articles to keep per feed',	// TODO
 		'keep_period' => 'Maximum age of articles to keep',	// TODO
 		'keep_unreads' => 'Never delete unread articles',	// TODO
diff --git a/app/i18n/id/conf.php b/app/i18n/id/conf.php
index 301b36b0e..abf2da35d 100644
--- a/app/i18n/id/conf.php
+++ b/app/i18n/id/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'More options are available in the individual feed’s settings',	// TODO
 		'keep_favourites' => 'Never delete favorites',
 		'keep_labels' => 'Never delete labels',	// TODO
-		'keep_max' => 'Maximum number of articles to keep',	// TODO
+		'keep_max' => 'Maximum number of articles to keep per feed',	// TODO
 		'keep_min_by_feed' => 'Minimum number of articles to keep per feed',	// TODO
 		'keep_period' => 'Maximum age of articles to keep',	// TODO
 		'keep_unreads' => 'Never delete unread articles',	// TODO
diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
index 806dbaedc..80dc31f92 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Altre opzioni sono disponibili nelle impostazioni dei singoli feed',
 		'keep_favourites' => 'Non eliminare mai i preferiti',
 		'keep_labels' => 'Non eliminare mai le etichette',
-		'keep_max' => 'Numero massimo di articoli da mantenere',
+		'keep_max' => 'Numero massimo di articoli da mantenere per feed',
 		'keep_min_by_feed' => 'Numero minimo di articoli da mantenere per feed',
 		'keep_period' => 'Massima durata degli articoli da mantenere',
 		'keep_unreads' => 'Non eliminare mai gli articoli non letti',
diff --git a/app/i18n/ja/conf.php b/app/i18n/ja/conf.php
index e4498c7d4..c48b7b7f1 100644
--- a/app/i18n/ja/conf.php
+++ b/app/i18n/ja/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => '個々のフィード設定内で、より多くの設定をしていただけます。',
 		'keep_favourites' => 'お気に入りを消去しない',
 		'keep_labels' => 'ラベルを消去しない',
-		'keep_max' => '記事を保存する最大数',
+		'keep_max' => '記事を保存する最大数',	// DIRTY
 		'keep_min_by_feed' => '記事をフィードに残す最小数',
 		'keep_period' => '記事を保存する最大時間',
 		'keep_unreads' => '未読の記事を消去しない',
diff --git a/app/i18n/ko/conf.php b/app/i18n/ko/conf.php
index cece3a301..c666b0035 100644
--- a/app/i18n/ko/conf.php
+++ b/app/i18n/ko/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => '더 자세한 옵션은 개별 피드 설정에 있습니다',
 		'keep_favourites' => '즐겨찾기 삭제 안 함',
 		'keep_labels' => '라벨 삭제 안 함',
-		'keep_max' => '보관할 글 최대 개수',
+		'keep_max' => '보관할 글 최대 개수',	// DIRTY
 		'keep_min_by_feed' => '피드별 보관할 글 최소 개수',
 		'keep_period' => '보관할 글 최대 기간',
 		'keep_unreads' => '읽지 않은 글 삭제 안 함',
diff --git a/app/i18n/lv/conf.php b/app/i18n/lv/conf.php
index 719d33239..24e0c031a 100644
--- a/app/i18n/lv/conf.php
+++ b/app/i18n/lv/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Vairākas opcijas ir pieejamas atsevišķas barotnes iestatījumos.',
 		'keep_favourites' => 'Nekad neizdzēst mīļākos',
 		'keep_labels' => 'Nekad neizdzēst birkas',
-		'keep_max' => 'Maksimālais saglabājamo rakstu skaits',
+		'keep_max' => 'Maksimālais saglabājamo rakstu skaits',	// DIRTY
 		'keep_min_by_feed' => 'Minimālais rakstu skaits, kas jāsaglabā vienā barotnē',
 		'keep_period' => 'Maksimālais saglabājamo rakstu vecums',
 		'keep_unreads' => 'Nekad neizdzēst nelasītos rakstus',
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index b48cca523..806a5b4ed 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Meer opties zijn beschikbaar in de persoonlijke stroom instellingen',
 		'keep_favourites' => 'Favorieten nooit verwijderen',
 		'keep_labels' => 'Labels nooit verwijderen',
-		'keep_max' => 'Maximaal aantal artikelen om te behouden',
+		'keep_max' => 'Maximaal aantal artikelen om te behouden in de feed',
 		'keep_min_by_feed' => 'Minimum aantal te behouden artikelen in de feed',
 		'keep_period' => 'Maximumleeftijd artikelen om te behouden',
 		'keep_unreads' => 'Ongelezen artikels nooit verwijderen',
diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php
index 28ed80df8..28207dc6a 100644
--- a/app/i18n/oc/conf.php
+++ b/app/i18n/oc/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Mai d’opcions son disponiblas dins la configuracion individuala dels fluxes',
 		'keep_favourites' => 'Jamai suprimir los favorits',
 		'keep_labels' => 'Jamai suprimir las etiquetas',
-		'keep_max' => 'Nombre maximum d’articles de gardar',
+		'keep_max' => 'Nombre maximum d’articles de gardar per flux',
 		'keep_min_by_feed' => 'Nombre minimum d’articles de servar per flux',
 		'keep_period' => 'Atge maximum dels articles de gardar',
 		'keep_unreads' => 'Jamai suprimir los pas legits',
diff --git a/app/i18n/pl/conf.php b/app/i18n/pl/conf.php
index f99b8ff47..3a05933c6 100644
--- a/app/i18n/pl/conf.php
+++ b/app/i18n/pl/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Więcej opcji dostępne jest w ustawieniach konkretnych kanałów',
 		'keep_favourites' => 'Nigdy nie usuwaj ulubionych',
 		'keep_labels' => 'Nigdy nie usuwaj oznaczonych etykietą',
-		'keep_max' => 'Maksymalna liczba wiadomości do przechowywania',
+		'keep_max' => 'Maksymalna liczba wiadomości do przechowywania w każdym kanale',
 		'keep_min_by_feed' => 'Minimalna liczba wiadomości do przechowywania w każdym kanale',
 		'keep_period' => 'Maksymalny wiek wiadomości do przechowywania',
 		'keep_unreads' => 'Nigdy nie usuwaj nieprzeczytanych wiadomości',
diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php
index c1d169219..019fe8744 100644
--- a/app/i18n/pt-br/conf.php
+++ b/app/i18n/pt-br/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Mais opções estão disponíveis nas configurações individuais do Feed',
 		'keep_favourites' => 'Nunca deletar os favoritos',
 		'keep_labels' => 'Nunca deletar etiquetas',
-		'keep_max' => 'Número máximo de artigos para manter',
+		'keep_max' => 'Número máximo de artigos para manter no feed',
 		'keep_min_by_feed' => 'Número mínimo de artigos para deixar no feed',
 		'keep_period' => 'Idade máxima dos artigos a serem mantidos',
 		'keep_unreads' => 'Nunca apagar os não lidos',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index 1b58f5b45..a5bdf1605 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'В индивидуальных настройках лент есть больше опций',
 		'keep_favourites' => 'Никогда не удалять избранное',
 		'keep_labels' => 'Никогда не удалять метки',
-		'keep_max' => 'Максимальное количество статей',
+		'keep_max' => 'Максимальное количество статей',	// DIRTY
 		'keep_min_by_feed' => 'Минимальное количество статей в ленте',
 		'keep_period' => 'Максимальный возраст статей',
 		'keep_unreads' => 'Никогда не удалять непрочитанные статьи',
diff --git a/app/i18n/sk/conf.php b/app/i18n/sk/conf.php
index ff0551df9..14a501e6c 100644
--- a/app/i18n/sk/conf.php
+++ b/app/i18n/sk/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Viac možností nájdete v nastaveniach kanála',
 		'keep_favourites' => 'Nikdy nemazať obľúbené',
 		'keep_labels' => 'Nikdy nemazať štítky',
-		'keep_max' => 'Maximálny počet článkov na zachovanie',
+		'keep_max' => 'Maximálny počet článkov na zachovanie',	// DIRTY
 		'keep_min_by_feed' => 'Minimálny počet článkov kanála na zachovanie',
 		'keep_period' => 'Maximálny vek článkov na zachovanie',
 		'keep_unreads' => 'Nikdy nemazať neprečítané články',
diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
index b446d0301..15569faed 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => 'Akış ayarlarında daha çok ayar bulabilirsiniz',
 		'keep_favourites' => 'Favorileri asla silme',
 		'keep_labels' => 'Etiketleri asla silme',
-		'keep_max' => 'Bellekte tutulacak en fazla makale sayısı',
+		'keep_max' => 'Bellekte tutulacak en fazla makale sayısı',	// DIRTY
 		'keep_min_by_feed' => 'Akışta en az tutulacak makale sayısı',
 		'keep_period' => 'Bellekte tutulacak en eski makale tarihi',
 		'keep_unreads' => 'Okunmamaış makaleleri asla silme',
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 4a099c3a9..6bf3324fa 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => '更多可用选项位于各订阅源的设置',
 		'keep_favourites' => '永不删除已收藏的文章',
 		'keep_labels' => '永不删除标签',
-		'keep_max' => '最多保留的文章数',
+		'keep_max' => '最多保留的文章数',	// DIRTY
 		'keep_min_by_feed' => '至少保留的文章数',
 		'keep_period' => '文章最多保留',
 		'keep_unreads' => '永不删除未读文章',
diff --git a/app/i18n/zh-tw/conf.php b/app/i18n/zh-tw/conf.php
index 5ac1d43a6..8b26fee80 100644
--- a/app/i18n/zh-tw/conf.php
+++ b/app/i18n/zh-tw/conf.php
@@ -17,7 +17,7 @@ return array(
 		'help' => '具體選項位於各訂閱源的設置',
 		'keep_favourites' => '不清理已收藏的文章',
 		'keep_labels' => '不清理標簽',
-		'keep_max' => '最多保留的文章數',
+		'keep_max' => '最多保留的文章數',	// DIRTY
 		'keep_min_by_feed' => '至少保留的文章數',
 		'keep_period' => '文章最多保留',
 		'keep_unreads' => '不清理未讀文章',