Fix reader view header (#4015)

* fix the hyperlink underline

* add mouse title

* improve German mouse titles

* fixed whitespaces

* use the same title in config/display like in normal/reader view

* i18n German: Discard change for this String

* delete unused gen.action.mark_favorite

21 files changed, 11 insertions, 33 deletions

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 674759052..a0d865e50 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Import',	// TODO - Translation
 		'load_default_shortcuts' => 'Load default shortcuts',	// TODO - Translation
 		'manage' => 'Spravovat',
-		'mark_favorite' => 'Označit jako oblíbené',
 		'mark_read' => 'Označit jako přečtené',
 		'promote' => 'Promote',	// TODO - Translation
 		'purge' => 'Purge',	// TODO - Translation
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 1aed5aa4c..29057a150 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -192,8 +192,8 @@ return array(
 		'javascript' => 'JavaScript muss aktiviert sein, um Tastaturkürzel benutzen zu können',
 		'last_article' => 'Zum letzten Artikel springen',
 		'load_more' => 'Weitere Artikel laden',
-		'mark_favorite' => 'Als Favorit markieren',
-		'mark_read' => 'Als gelesen markieren',
+		'mark_favorite' => 'Als Favorit auswählen/entfernen',
+		'mark_read' => 'Als (un-)gelesen markieren',
 		'navigation' => 'Navigation',
 		'navigation_help' => 'Mit der <kbd>⇧ Umschalttaste</kbd> finden die Tastenkombination auf Feeds Anwendung.<br/>Mit der <kbd>Alt ⎇</kbd>-Taste finden die Tastenkombination auf Kategorien Anwendung.',
 		'navigation_no_mod_help' => 'Die folgenden Navigationsverknüpfungen unterstützen keine Modifikatoren.',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 5b58ceb1d..a2fe85882 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importieren',
 		'load_default_shortcuts' => 'Standard-Kürzel laden',
 		'manage' => 'Verwalten',
-		'mark_favorite' => 'Als Favorit markieren',
 		'mark_read' => 'Als gelesen markieren',
 		'promote' => 'Hochstufen',
 		'purge' => 'Bereinigen',
diff --git a/app/i18n/en-us/gen.php b/app/i18n/en-us/gen.php
index 5d014f1c2..2aec26d58 100644
--- a/app/i18n/en-us/gen.php
+++ b/app/i18n/en-us/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Import',
 		'load_default_shortcuts' => 'Load default shortcuts',
 		'manage' => 'Manage',
-		'mark_favorite' => 'Mark as favorite',
 		'mark_read' => 'Mark as read',
 		'promote' => 'Promote',
 		'purge' => 'Purge',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index cabf25992..cec389798 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Import',
 		'load_default_shortcuts' => 'Load default shortcuts',
 		'manage' => 'Manage',
-		'mark_favorite' => 'Mark as favourite',
 		'mark_read' => 'Mark as read',
 		'promote' => 'Promote',
 		'purge' => 'Purge',
diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php
index 89c4547a6..90b5da603 100755
--- a/app/i18n/es/gen.php
+++ b/app/i18n/es/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importar',
 		'load_default_shortcuts' => 'Cargar accesos directos predeterminados',
 		'manage' => 'Administrar',
-		'mark_favorite' => 'Marcar como favorita',
 		'mark_read' => 'Marcar como leído',
 		'promote' => 'Promover',
 		'purge' => 'Eliminar',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 5b37c5c53..9471d8639 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importer',
 		'load_default_shortcuts' => 'Utiliser les raccourcis par défaut',
 		'manage' => 'Gérer',
-		'mark_favorite' => 'Mettre en favori',
 		'mark_read' => 'Marquer comme lu',
 		'promote' => 'Promouvoir',
 		'purge' => 'Purger',
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index 2899df4de..44e708eda 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'ייבוא',
 		'load_default_shortcuts' => 'Load default shortcuts',	// TODO - Translation
 		'manage' => 'ניהול',
-		'mark_favorite' => 'סימון כמועדף',
 		'mark_read' => 'סימון כנקרא',
 		'promote' => 'Promote',	// TODO - Translation
 		'purge' => 'Purge',	// TODO - Translation
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 03875d4fd..e2879cdfd 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importa',
 		'load_default_shortcuts' => 'Load default shortcuts',	// TODO - Translation
 		'manage' => 'Gestisci',
-		'mark_favorite' => 'Segna come preferito',
 		'mark_read' => 'Segna come letto',
 		'promote' => 'Promote',	// TODO - Translation
 		'purge' => 'Purge',	// TODO - Translation
diff --git a/app/i18n/ja/gen.php b/app/i18n/ja/gen.php
index 472204593..26ae96907 100644
--- a/app/i18n/ja/gen.php
+++ b/app/i18n/ja/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'インポート',
 		'load_default_shortcuts' => 'デフォルトのショートカットを読み込む',
 		'manage' => '管理',
-		'mark_favorite' => 'お気に入りとする',
 		'mark_read' => '既読にする',
 		'promote' => 'プロモート',
 		'purge' => '不要なデータの削除',
diff --git a/app/i18n/ko/gen.php b/app/i18n/ko/gen.php
index 6794f46e1..c810574ff 100644
--- a/app/i18n/ko/gen.php
+++ b/app/i18n/ko/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => '불러오기',
 		'load_default_shortcuts' => '기본 단축키 불러오기',
 		'manage' => '관리',
-		'mark_favorite' => '즐겨찾기에 등록',
 		'mark_read' => '읽음으로 표시',
 		'promote' => '목록 수준 올리기',
 		'purge' => '제거',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 8efba05d5..c3da75cab 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importeren',
 		'load_default_shortcuts' => 'Standaardshortcuts laden',
 		'manage' => 'Beheren',
-		'mark_favorite' => 'Markeer als favoriet',
 		'mark_read' => 'Markeer als gelezen',
 		'promote' => 'Bevorderen',
 		'purge' => 'Zuiveren',
diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php
index 2ade5386f..28c396fa9 100644
--- a/app/i18n/oc/gen.php
+++ b/app/i18n/oc/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importar',
 		'load_default_shortcuts' => 'Cargar los acorchis per defaut',
 		'manage' => 'Gerir',
-		'mark_favorite' => 'Ajustar als favorits',
 		'mark_read' => 'Marcar coma legit',
 		'promote' => 'Promòure',
 		'purge' => 'Purgar',
diff --git a/app/i18n/pl/gen.php b/app/i18n/pl/gen.php
index 136b8f14c..c9464c4f5 100644
--- a/app/i18n/pl/gen.php
+++ b/app/i18n/pl/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importuj',
 		'load_default_shortcuts' => 'Ustaw domyślne skróty',
 		'manage' => 'Ustawienia',
-		'mark_favorite' => 'Oznacz jako ulubione',
 		'mark_read' => 'Oznacz jako przeczytane',
 		'promote' => 'Awansuj',
 		'purge' => 'Oczyść',
diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php
index 4298dc589..1a06d7046 100644
--- a/app/i18n/pt-br/gen.php
+++ b/app/i18n/pt-br/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importar',
 		'load_default_shortcuts' => 'Carregar mais atalhos',
 		'manage' => 'Gerenciar',
-		'mark_favorite' => 'Marcar como favorito',
 		'mark_read' => 'Marcar como lido',
 		'promote' => 'Promover',
 		'purge' => 'Limpar',
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index 1802d1433..783360e05 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Импортировать',
 		'load_default_shortcuts' => 'Загрузить горячие клавиши по умолчанию',
 		'manage' => 'Настроить',
-		'mark_favorite' => 'Отметить избранным',
 		'mark_read' => 'Отметить прочитанным',
 		'promote' => 'Продвинуть',
 		'purge' => 'Запустить очистку',
diff --git a/app/i18n/sk/gen.php b/app/i18n/sk/gen.php
index 3517629fa..89436be98 100644
--- a/app/i18n/sk/gen.php
+++ b/app/i18n/sk/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'Importovať',
 		'load_default_shortcuts' => 'Load default shortcuts',	// TODO - Translation
 		'manage' => 'Spravovať',
-		'mark_favorite' => 'Označiť ako obľúbené',
 		'mark_read' => 'Označiť ako prečítané',
 		'promote' => 'Promote',	// TODO - Translation
 		'purge' => 'Purge',	// TODO - Translation
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index cc00dc63c..448078d57 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => 'İçe Aktar',
 		'load_default_shortcuts' => 'Öntanımlı kısayolları yükle',
 		'manage' => 'Yönet',
-		'mark_favorite' => 'Favoriye ekle',
 		'mark_read' => 'Okundu olarak işaretle',
 		'promote' => 'Yöneticilik ata',
 		'purge' => 'Temizle',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index 210d3f72b..9643d2e96 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -17,7 +17,6 @@ return array(
 		'import' => '导入',
 		'load_default_shortcuts' => '重置快捷键',
 		'manage' => '管理',
-		'mark_favorite' => '标记收藏',
 		'mark_read' => '标记已读',
 		'promote' => '设为管理员',
 		'purge' => '清理',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 96f93a27f..dfb377893 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -122,8 +122,8 @@
 					<thead>
 						<tr>
 							<th> </th>
-							<th title="<?= _t('gen.action.mark_read') ?>"><?= _i('read') ?></th>
-							<th title="<?= _t('gen.action.mark_favorite') ?>"><?= _i('bookmark') ?></th>
+							<th title="<?= _t('conf.shortcut.mark_read') ?>"><?= _i('read') ?></th>
+							<th title="<?= _t('conf.shortcut.mark_favorite') ?>"><?= _i('bookmark') ?></th>
 							<th><?= _t('conf.display.icon.related_tags') ?></th>
 							<th><?= _t('conf.display.icon.sharing') ?></th>
 							<th><?= _t('conf.display.icon.summary') ?></th>
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index f58839d8f..0e9fb4b3e 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -38,18 +38,14 @@ $content_width = FreshRSS_Context::$user_conf->content_width;
 					}
 				?>
 				<?php if (FreshRSS_Auth::hasAccess()) { ?>
-				<a class="read" href="<?= Minz_Url::display($readUrl) ?>">
-					<?= _i($item->isRead() ? 'read' : 'unread') ?>
-				</a>
-				<a class="bookmark" href="<?= Minz_Url::display($favoriteUrl) ?>">
-					<?= _i($item->isFavorite() ? 'starred' : 'non-starred') ?>
-				</a>
+				<a class="read" href="<?= Minz_Url::display($readUrl) ?>" title="<?= _t('conf.shortcut.mark_read') ?>"><?= _i($item->isRead() ? 'read' : 'unread') ?></a>
+				<a class="bookmark" href="<?= Minz_Url::display($favoriteUrl) ?>" title="<?= _t('conf.shortcut.mark_favorite') ?>"><?= _i($item->isFavorite() ? 'starred' : 'non-starred') ?></a>
 				<?php } ?>
-				<a class="website" href="<?= _url('index', 'reader', 'get', 'f_' . $feed->id()) ?>">
-					<?php if (FreshRSS_Context::$user_conf->show_favicons): ?>
-						<img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" />
-					<?php endif; ?>
-					<span><?= $feed->name() ?></span>
+				<a class="website" href="<?= _url('index', 'reader', 'get', 'f_' . $feed->id()) ?>" title="<?= _t('gen.action.filter') ?>"><?php
+				if (FreshRSS_Context::$user_conf->show_favicons):
+				?><img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php
+				endif;
+				?><span><?= $feed->name() ?></span>
 				</a>
 				<h1 class="title"><a target="_blank" rel="noreferrer" class="go_website" href="<?= $item->link() ?>"><?= $item->title() ?></a></h1>