Skip to content

A free, self-hostable news aggregator…

Move article header/footer options from Reading to Display configuration (#9139)

Gerard Alvear Porras2ff32b0254e8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 552601a10..26af6b5b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ See also [the FreshRSS releases](https://github.com/FreshRSS/FreshRSS/releases).
* Always jump article to top when header is offscreen, also when **Stick the article to the top when opened* is disabled [#8870](https://github.com/FreshRSS/FreshRSS/pull/8870)
* Fix padding for `.nav_menu` in Alternative-Dark, Flat, and Nord themes [#8901](https://github.com/FreshRSS/FreshRSS/pull/8901)
* Various UI and style improvements: [#8823](https://github.com/FreshRSS/FreshRSS/pull/8823), [#8824](https://github.com/FreshRSS/FreshRSS/pull/8824)
+ * Move article header/footer options (feed title, authors and date, icons position, tags) from *Reading* to *Display* configuration [#6866](https://github.com/FreshRSS/FreshRSS/issues/6866)
* Extensions
* New `freshrss:entryStateChange` JavaScript event for extensions, dispatched when an article has finished being marked as read/unread [#8862](https://github.com/FreshRSS/FreshRSS/pull/9031)
* I18n
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index aeebb66ab..3eb50911a 100644
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -40,6 +40,10 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController {
* - display of my Labels in footer
* - display of date in footer
* - display of open action in footer
+ * - display of feed title (default: above title)
+ * - display of authors and date (default: none)
+ * - display of article icons position (default: above title)
+ * - display of tags (default: none)
* - html5 notification timeout (default: 0)
* Default values are false unless specified.
*/
@@ -66,6 +70,11 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController {
FreshRSS_Context::userConf()->topline_thumbnail = Minz_Request::paramString('topline_thumbnail');
FreshRSS_Context::userConf()->topline_summary = Minz_Request::paramBoolean('topline_summary');
FreshRSS_Context::userConf()->topline_display_authors = Minz_Request::paramBoolean('topline_display_authors');
+ FreshRSS_Context::userConf()->show_tags = Minz_Request::paramStringNull('show_tags') ?? '0';
+ FreshRSS_Context::userConf()->show_tags_max = Minz_Request::paramInt('show_tags_max');
+ FreshRSS_Context::userConf()->show_author_date = Minz_Request::paramStringNull('show_author_date') ?? '0';
+ FreshRSS_Context::userConf()->show_feed_name = Minz_Request::paramStringNull('show_feed_name') ?? 't';
+ FreshRSS_Context::userConf()->show_article_icons = Minz_Request::paramStringNull('show_article_icons') ?? 't';
FreshRSS_Context::userConf()->bottomline_read = Minz_Request::paramBoolean('bottomline_read');
FreshRSS_Context::userConf()->bottomline_favorite = Minz_Request::paramBoolean('bottomline_favorite');
FreshRSS_Context::userConf()->bottomline_sharing = Minz_Request::paramBoolean('bottomline_sharing');
@@ -140,11 +149,6 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController {
FreshRSS_Context::userConf()->auto_load_more = Minz_Request::paramBoolean('auto_load_more');
FreshRSS_Context::userConf()->display_posts = Minz_Request::paramBoolean('display_posts');
FreshRSS_Context::userConf()->display_categories = Minz_Request::paramStringNull('display_categories') ?? 'active';
- FreshRSS_Context::userConf()->show_tags = Minz_Request::paramStringNull('show_tags') ?? '0';
- FreshRSS_Context::userConf()->show_tags_max = Minz_Request::paramInt('show_tags_max');
- FreshRSS_Context::userConf()->show_author_date = Minz_Request::paramStringNull('show_author_date') ?? '0';
- FreshRSS_Context::userConf()->show_feed_name = Minz_Request::paramStringNull('show_feed_name') ?? 't';
- FreshRSS_Context::userConf()->show_article_icons = Minz_Request::paramStringNull('show_article_icons') ?? 't';
FreshRSS_Context::userConf()->hide_read_feeds = Minz_Request::paramBoolean('hide_read_feeds');
FreshRSS_Context::userConf()->onread_jump_next = Minz_Request::paramBoolean('onread_jump_next');
FreshRSS_Context::userConf()->lazyload = Minz_Request::paramBoolean('lazyload');
diff --git a/app/i18n/cs/conf.php b/app/i18n/cs/conf.php
index fa5119bd4..843c1680a 100644
--- a/app/i18n/cs/conf.php
+++ b/app/i18n/cs/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Zobrazení',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autoři a datum',
+ 'both' => 'V záhlaví a zápatí',
+ 'footer' => 'V zápatí',
+ 'header' => 'V záhlaví',
+ 'none' => 'Žádný',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Nad názvem/štítky',
+ 'none' => 'Žádný',
+ 'with_authors' => 'V řádku s autory a datem',
+ ),
+ 'feed_title' => 'Název feedu',
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
+ 'above_title' => 'Above title', // TODO
+ 'with_authors' => 'In authors and date row', // TODO
+ ),
+ 'tags' => array(
+ '_' => 'Štítky',
+ 'both' => 'V záhlaví a zápatí',
+ 'footer' => 'V zápatí',
+ 'header' => 'V záhlaví',
+ 'none' => 'Žádné',
+ ),
+ 'tags_max' => array(
+ '_' => 'Maximální počet zobrazených štítků',
+ 'help' => '0 znamená: zobrazit všechny značky a nesbalovat je.',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatický tmavý režim',
'auto' => 'Automatický',
@@ -39,6 +70,9 @@ return array(
'no' => 'Ne',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Články: záhlaví/zápatí',
+ ),
'icon' => array(
'bottom_line' => 'Spodní řádek',
'display_authors' => 'Autoři',
@@ -232,37 +266,6 @@ return array(
'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',
- 'both' => 'V záhlaví a zápatí',
- 'footer' => 'V zápatí',
- 'header' => 'V záhlaví',
- 'none' => 'Žádný',
- ),
- 'feed_name' => array(
- 'above_title' => 'Nad názvem/štítky',
- 'none' => 'Žádný',
- 'with_authors' => 'V řádku s autory a datem',
- ),
- 'feed_title' => 'Název feedu',
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
- 'above_title' => 'Above title', // TODO
- 'with_authors' => 'In authors and date row', // TODO
- ),
- 'tags' => array(
- '_' => 'Štítky',
- 'both' => 'V záhlaví a zápatí',
- 'footer' => 'V zápatí',
- 'header' => 'V záhlaví',
- 'none' => 'Žádné',
- ),
- 'tags_max' => array(
- '_' => 'Maximální počet zobrazených štítků',
- 'help' => '0 znamená: zobrazit všechny značky a nesbalovat je.',
- ),
- ),
'articles_per_page' => 'Počet článků na stránku',
'auto_load_more' => 'Načítat další články dole na stránce',
'auto_remove_article' => 'Po přečtení články skrýt',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Kategorii, které rozbalovat',
'headline' => array(
'articles' => 'Články: Otevřít/zavřít',
- 'articles_header_footer' => 'Články: záhlaví/zápatí',
'categories' => 'Navigace vlevo: Kategorie',
'mark_as_read' => 'Označit článek jako přečtený',
'misc' => 'Různé',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 3fc66c3a0..479d28a94 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Anzeige',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autoren und Datum',
+ 'both' => 'In Kopf- und Fußzeile',
+ 'footer' => 'In Fußzeile',
+ 'header' => 'In Kopfzeile',
+ 'none' => 'Nicht anzeigen',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Oberhalb der Überschrift und Tags',
+ 'none' => 'Nicht anzeigen',
+ 'with_authors' => 'In der Zeile mit Autoren und Datum',
+ ),
+ 'feed_title' => 'Feed-Titel',
+ 'icons' => array(
+ '_' => 'Artikel-Icon-Position<br /><small>(Nur in der Lese-Ansicht)</small>',
+ 'above_title' => 'Über dem Titel',
+ 'with_authors' => 'In der Autoren- und Datumszeile',
+ ),
+ 'tags' => array(
+ '_' => 'Tags', // IGNORE
+ 'both' => 'In Kopf- und Fußzeile',
+ 'footer' => 'In Fußzeile',
+ 'header' => 'In Kopfzeile',
+ 'none' => 'Nicht anzeigen',
+ ),
+ 'tags_max' => array(
+ '_' => 'Max. Anzahl angezeigter Tags',
+ 'help' => '0 bedeutet, dass alle Tags angezeigt und nicht eingeklappt werden',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatischer Dunkel-Modus',
'auto' => 'Automatisch',
@@ -39,6 +70,9 @@ return array(
'no' => 'Nein',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Artikel: Kopf- und Fußzeile',
+ ),
'icon' => array(
'bottom_line' => 'Fußzeile',
'display_authors' => 'Autoren',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Nach „Alle als gelesen markieren“,',
'always_show_favorites' => 'Favoriten immer anzeigen',
'apply_to_individual_feed' => 'Betrifft die Feeds einzeln.',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Autoren und Datum',
- 'both' => 'In Kopf- und Fußzeile',
- 'footer' => 'In Fußzeile',
- 'header' => 'In Kopfzeile',
- 'none' => 'Nicht anzeigen',
- ),
- 'feed_name' => array(
- 'above_title' => 'Oberhalb der Überschrift und Tags',
- 'none' => 'Nicht anzeigen',
- 'with_authors' => 'In der Zeile mit Autoren und Datum',
- ),
- 'feed_title' => 'Feed-Titel',
- 'icons' => array(
- '_' => 'Artikel-Icon-Position<br /><small>(Nur in der Lese-Ansicht)</small>',
- 'above_title' => 'Über dem Titel',
- 'with_authors' => 'In der Autoren- und Datumszeile',
- ),
- 'tags' => array(
- '_' => 'Tags', // IGNORE
- 'both' => 'In Kopf- und Fußzeile',
- 'footer' => 'In Fußzeile',
- 'header' => 'In Kopfzeile',
- 'none' => 'Nicht anzeigen',
- ),
- 'tags_max' => array(
- '_' => 'Max. Anzahl angezeigter Tags',
- 'help' => '0 bedeutet, dass alle Tags angezeigt und nicht eingeklappt werden',
- ),
- ),
'articles_per_page' => 'Anzahl der Artikel pro Seite',
'auto_load_more' => 'Die nächsten Artikel am Seitenende laden',
'auto_remove_article' => 'Artikel nach dem Lesen verstecken',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Ausgeklappte Kategorien',
'headline' => array(
'articles' => 'Artikel: Öffnen/Schließen',
- 'articles_header_footer' => 'Artikel: Kopf- und Fußzeile',
'categories' => 'Linke Navigation: Kategorien',
'mark_as_read' => 'Artikel als gelesen markieren',
'misc' => 'Sonstiges',
diff --git a/app/i18n/el/conf.php b/app/i18n/el/conf.php
index de8120843..c7b9f5ca1 100644
--- a/app/i18n/el/conf.php
+++ b/app/i18n/el/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Προβολή',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Συντάκτες και ημερομηνία',
+ 'both' => 'Στην κεφαλίδα και στο υποσέλιδο',
+ 'footer' => 'Στο υποσέλιδο',
+ 'header' => 'Στην κεφαλίδα',
+ 'none' => 'Καμία',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Πάνω από τίτλο/ετικέτες',
+ 'none' => 'Καμία',
+ 'with_authors' => 'Στη γραμμή συντακτών και ημερομηνίας',
+ ),
+ 'feed_title' => 'Τίτλος ροής',
+ 'icons' => array(
+ '_' => 'Θέση εικονιδίων άρθρου<br /><small>(Μόνο στην προβολή ανάγνωσης)</small>',
+ 'above_title' => 'Πάνω από τον τίτλο',
+ 'with_authors' => 'Στη γραμμή συντακτών και ημερομηνίας',
+ ),
+ 'tags' => array(
+ '_' => 'Ετικέτες',
+ 'both' => 'Στην κεφαλίδα και στο υποσέλιδο',
+ 'footer' => 'Στο υποσέλιδο',
+ 'header' => 'Στην κεφαλίδα',
+ 'none' => 'Καμία',
+ ),
+ 'tags_max' => array(
+ '_' => 'Μέγιστος αριθμός εμφανιζόμενων ετικετών',
+ 'help' => '0 σημαίνει: εμφάνιση όλων των ετικετών χωρίς σύμπτυξη',
+ ),
+ ),
'darkMode' => array(
'_' => 'Αυτόματη σκοτεινή λειτουργία',
'auto' => 'Αυτόματο',
@@ -39,6 +70,9 @@ return array(
'no' => 'Όχι',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Άρθρα: κεφαλίδα/υποσέλιδο',
+ ),
'icon' => array(
'bottom_line' => 'Κάτω γραμμή',
'display_authors' => 'Συντάκτες',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Μετά τη «Σήμανση όλων ως αναγνωσμένα»,',
'always_show_favorites' => 'Εμφάνιση όλων των άρθρων στα αγαπημένα από προεπιλογή',
'apply_to_individual_feed' => 'Εφαρμόζεται σε κάθε ροή ξεχωριστά',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Συντάκτες και ημερομηνία',
- 'both' => 'Στην κεφαλίδα και στο υποσέλιδο',
- 'footer' => 'Στο υποσέλιδο',
- 'header' => 'Στην κεφαλίδα',
- 'none' => 'Καμία',
- ),
- 'feed_name' => array(
- 'above_title' => 'Πάνω από τίτλο/ετικέτες',
- 'none' => 'Καμία',
- 'with_authors' => 'Στη γραμμή συντακτών και ημερομηνίας',
- ),
- 'feed_title' => 'Τίτλος ροής',
- 'icons' => array(
- '_' => 'Θέση εικονιδίων άρθρου<br /><small>(Μόνο στην προβολή ανάγνωσης)</small>',
- 'above_title' => 'Πάνω από τον τίτλο',
- 'with_authors' => 'Στη γραμμή συντακτών και ημερομηνίας',
- ),
- 'tags' => array(
- '_' => 'Ετικέτες',
- 'both' => 'Στην κεφαλίδα και στο υποσέλιδο',
- 'footer' => 'Στο υποσέλιδο',
- 'header' => 'Στην κεφαλίδα',
- 'none' => 'Καμία',
- ),
- 'tags_max' => array(
- '_' => 'Μέγιστος αριθμός εμφανιζόμενων ετικετών',
- 'help' => '0 σημαίνει: εμφάνιση όλων των ετικετών χωρίς σύμπτυξη',
- ),
- ),
'articles_per_page' => 'Αριθμός άρθρων ανά σελίδα',
'auto_load_more' => 'Φόρτωση περισσότερων άρθρων στο κάτω μέρος της σελίδας',
'auto_remove_article' => 'Απόκρυψη άρθρων μετά την ανάγνωση',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Κατηγορίες προς ανάπτυξη',
'headline' => array(
'articles' => 'Άρθρα: Άνοιγμα/Κλείσιμο',
- 'articles_header_footer' => 'Άρθρα: κεφαλίδα/υποσέλιδο',
'categories' => 'Αριστερή πλοήγηση: Κατηγορίες',
'mark_as_read' => 'Σήμανση άρθρου ως αναγνωσμένου',
'misc' => 'Διάφορα',
diff --git a/app/i18n/en-US/conf.php b/app/i18n/en-US/conf.php
index 6ff926773..dac2499af 100644
--- a/app/i18n/en-US/conf.php
+++ b/app/i18n/en-US/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Display', // IGNORE
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Authors and date', // IGNORE
+ 'both' => 'In header and footer', // IGNORE
+ 'footer' => 'In footer', // IGNORE
+ 'header' => 'In header', // IGNORE
+ 'none' => 'None', // IGNORE
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Above title/tags', // IGNORE
+ 'none' => 'None', // IGNORE
+ 'with_authors' => 'In authors and date row', // IGNORE
+ ),
+ 'feed_title' => 'Feed title', // IGNORE
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>', // IGNORE
+ 'above_title' => 'Above title', // IGNORE
+ 'with_authors' => 'In authors and date row', // IGNORE
+ ),
+ 'tags' => array(
+ '_' => 'Tags', // IGNORE
+ 'both' => 'In header and footer', // IGNORE
+ 'footer' => 'In footer', // IGNORE
+ 'header' => 'In header', // IGNORE
+ 'none' => 'None', // IGNORE
+ ),
+ 'tags_max' => array(
+ '_' => 'Max number of tags shown', // IGNORE
+ 'help' => '0 means: show all tags and do not collapse them', // IGNORE
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatic dark mode', // IGNORE
'auto' => 'Auto', // IGNORE
@@ -39,6 +70,9 @@ return array(
'no' => 'No', // IGNORE
),
'display_enclosures' => 'Show enclosures', // IGNORE
+ 'headline' => array(
+ 'articles_header_footer' => 'Articles: header/footer', // IGNORE
+ ),
'icon' => array(
'bottom_line' => 'Bottom line', // IGNORE
'display_authors' => 'Authors', // IGNORE
@@ -232,37 +266,6 @@ return array(
'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
- 'both' => 'In header and footer', // IGNORE
- 'footer' => 'In footer', // IGNORE
- 'header' => 'In header', // IGNORE
- 'none' => 'None', // IGNORE
- ),
- 'feed_name' => array(
- 'above_title' => 'Above title/tags', // IGNORE
- 'none' => 'None', // IGNORE
- 'with_authors' => 'In authors and date row', // IGNORE
- ),
- 'feed_title' => 'Feed title', // IGNORE
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>', // IGNORE
- 'above_title' => 'Above title', // IGNORE
- 'with_authors' => 'In authors and date row', // IGNORE
- ),
- 'tags' => array(
- '_' => 'Tags', // IGNORE
- 'both' => 'In header and footer', // IGNORE
- 'footer' => 'In footer', // IGNORE
- 'header' => 'In header', // IGNORE
- 'none' => 'None', // IGNORE
- ),
- 'tags_max' => array(
- '_' => 'Max number of tags shown', // IGNORE
- 'help' => '0 means: show all tags and do not collapse them', // IGNORE
- ),
- ),
'articles_per_page' => 'Number of articles per page', // IGNORE
'auto_load_more' => 'Load more articles at the bottom of the page', // IGNORE
'auto_remove_article' => 'Hide articles after reading', // IGNORE
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categories to unfold', // IGNORE
'headline' => array(
'articles' => 'Articles: Open/Close', // IGNORE
- 'articles_header_footer' => 'Articles: header/footer', // IGNORE
'categories' => 'Left navigation: Categories', // IGNORE
'mark_as_read' => 'Mark article as read', // IGNORE
'misc' => 'Miscellaneous', // IGNORE
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 4e1fa7a43..b0c5c1301 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Display',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Authors and date',
+ 'both' => 'In header and footer',
+ 'footer' => 'In footer',
+ 'header' => 'In header',
+ 'none' => 'None',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Above title/tags',
+ 'none' => 'None',
+ 'with_authors' => 'In authors and date row',
+ ),
+ 'feed_title' => 'Feed title',
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>',
+ 'above_title' => 'Above title',
+ 'with_authors' => 'In authors and date row',
+ ),
+ 'tags' => array(
+ '_' => 'Tags',
+ 'both' => 'In header and footer',
+ 'footer' => 'In footer',
+ 'header' => 'In header',
+ 'none' => 'None',
+ ),
+ 'tags_max' => array(
+ '_' => 'Max number of tags shown',
+ 'help' => '0 means: show all tags and do not collapse them',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatic dark mode',
'auto' => 'Auto',
@@ -39,6 +70,9 @@ return array(
'no' => 'No',
),
'display_enclosures' => 'Show enclosures',
+ 'headline' => array(
+ 'articles_header_footer' => 'Articles: header/footer',
+ ),
'icon' => array(
'bottom_line' => 'Bottom line',
'display_authors' => 'Authors',
@@ -232,37 +266,6 @@ return array(
'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',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Authors and date',
- 'both' => 'In header and footer',
- 'footer' => 'In footer',
- 'header' => 'In header',
- 'none' => 'None',
- ),
- 'feed_name' => array(
- 'above_title' => 'Above title/tags',
- 'none' => 'None',
- 'with_authors' => 'In authors and date row',
- ),
- 'feed_title' => 'Feed title',
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>',
- 'above_title' => 'Above title',
- 'with_authors' => 'In authors and date row',
- ),
- 'tags' => array(
- '_' => 'Tags',
- 'both' => 'In header and footer',
- 'footer' => 'In footer',
- 'header' => 'In header',
- 'none' => 'None',
- ),
- 'tags_max' => array(
- '_' => 'Max number of tags shown',
- 'help' => '0 means: show all tags and do not collapse them',
- ),
- ),
'articles_per_page' => 'Number of articles per page',
'auto_load_more' => 'Load more articles at the bottom of the page',
'auto_remove_article' => 'Hide articles after reading',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categories to unfold',
'headline' => array(
'articles' => 'Articles: Open/Close',
- 'articles_header_footer' => 'Articles: header/footer',
'categories' => 'Left navigation: Categories',
'mark_as_read' => 'Mark article as read',
'misc' => 'Miscellaneous',
diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php
index f7540396e..bde9f9526 100644
--- a/app/i18n/es/conf.php
+++ b/app/i18n/es/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Visualización',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autores y fecha',
+ 'both' => 'En el encabezado y pie de página',
+ 'footer' => 'En el pie de página',
+ 'header' => 'En el encabezado',
+ 'none' => 'Ninguno',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Encima de título/etiquetas',
+ 'none' => 'Ninguno',
+ 'with_authors' => 'En la fila de autores y fecha',
+ ),
+ 'feed_title' => 'Título de la fuente',
+ 'icons' => array(
+ '_' => 'Posición de los iconos del artículo<br /><small>(Solo en vista de lectura)</small>',
+ 'above_title' => 'Encima del título',
+ 'with_authors' => 'En la fila de autores y fecha',
+ ),
+ 'tags' => array(
+ '_' => 'Etiquetas',
+ 'both' => 'En el encabezado y pie de página',
+ 'footer' => 'En el pie de página',
+ 'header' => 'En el encabezado',
+ 'none' => 'Ninguno',
+ ),
+ 'tags_max' => array(
+ '_' => 'Máximo número de etiquetas a mostrar',
+ 'help' => '0 significa: mostrar todas las etiquetas y que no estén colapsadas',
+ ),
+ ),
'darkMode' => array(
'_' => 'Modo oscuro automático',
'auto' => 'Automático',
@@ -39,6 +70,9 @@ return array(
'no' => 'No', // IGNORE
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Artículos: encabezado/pie de página',
+ ),
'icon' => array(
'bottom_line' => 'Línea inferior',
'display_authors' => 'Autores',
@@ -232,37 +266,6 @@ return array(
'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' => 'Aplica a fuentes individualmente',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Autores y fecha',
- 'both' => 'En el encabezado y pie de página',
- 'footer' => 'En el pie de página',
- 'header' => 'En el encabezado',
- 'none' => 'Ninguno',
- ),
- 'feed_name' => array(
- 'above_title' => 'Encima de título/etiquetas',
- 'none' => 'Ninguno',
- 'with_authors' => 'En la fila de autores y fecha',
- ),
- 'feed_title' => 'Título de la fuente',
- 'icons' => array(
- '_' => 'Posición de los iconos del artículo<br /><small>(Solo en vista de lectura)</small>',
- 'above_title' => 'Encima del título',
- 'with_authors' => 'En la fila de autores y fecha',
- ),
- 'tags' => array(
- '_' => 'Etiquetas',
- 'both' => 'En el encabezado y pie de página',
- 'footer' => 'En el pie de página',
- 'header' => 'En el encabezado',
- 'none' => 'Ninguno',
- ),
- 'tags_max' => array(
- '_' => 'Máximo número de etiquetas a mostrar',
- 'help' => '0 significa: mostrar todas las etiquetas y que no estén colapsadas',
- ),
- ),
'articles_per_page' => 'Número de artículos por página',
'auto_load_more' => 'Cargar más artículos al final de la página',
'auto_remove_article' => 'Ocultar artículos tras la lectura',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categorías a desarrollar',
'headline' => array(
'articles' => 'Artículos: Abrir/Cerrar',
- 'articles_header_footer' => 'Artículos: encabezado/pie de página',
'categories' => 'Navegación izquierda: Categorías',
'mark_as_read' => 'Marcar artículo como leído',
'misc' => 'Variados',
diff --git a/app/i18n/fa/conf.php b/app/i18n/fa/conf.php
index a13d4f98b..9f3395bc5 100644
--- a/app/i18n/fa/conf.php
+++ b/app/i18n/fa/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => ' نمایش',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => ' نویسندگان و تاریخ',
+ 'both' => ' در سرصفحه و پاورقی',
+ 'footer' => ' در پاورقی',
+ 'header' => ' در سربرگ',
+ 'none' => ' هیچکدام',
+ ),
+ 'feed_name' => array(
+ 'above_title' => ' بالای عنوان/برچسب ها',
+ 'none' => ' هیچ',
+ 'with_authors' => ' در نویسندگان و ردیف تاریخ',
+ ),
+ 'feed_title' => ' عنوان خوراک',
+ 'icons' => array(
+ '_' => 'موقعیت آیکون‌ها<br /><small>(فقط در نمای خواندن)</small>',
+ 'above_title' => 'بالاتر از عنوان',
+ 'with_authors' => 'در سطر نویسنده و تاریخ',
+ ),
+ 'tags' => array(
+ '_' => ' برچسب ها',
+ 'both' => ' در سرصفحه و پاورقی',
+ 'footer' => ' در پاورقی',
+ 'header' => ' در سربرگ',
+ 'none' => ' هیچ',
+ ),
+ 'tags_max' => array(
+ '_' => ' حداکثر تعداد برچسب نشان داده شده است',
+ 'help' => '0 به این معنی است: همه برچسب ها را نشان دهید و آنها را جمع نکنید',
+ ),
+ ),
'darkMode' => array(
'_' => ' حالت تاریک خودکار',
'auto' => ' خودکار',
@@ -39,6 +70,9 @@ return array(
'no' => 'خیر',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => ' مقالات: سرصفحه / پاورقی',
+ ),
'icon' => array(
'bottom_line' => ' خط پایین',
'display_authors' => ' نویسندگان',
@@ -232,37 +266,6 @@ return array(
'after_onread' => ' بعد از "علامت گذاری همه به عنوان خوانده شده"',
'always_show_favorites' => ' نمایش همه مقالات در موارد دلخواه به طور پیش فرض',
'apply_to_individual_feed' => 'به صورت جداگانه برای هر فید اعمال می‌شود',
- 'article' => array(
- 'authors_date' => array(
- '_' => ' نویسندگان و تاریخ',
- 'both' => ' در سرصفحه و پاورقی',
- 'footer' => ' در پاورقی',
- 'header' => ' در سربرگ',
- 'none' => ' هیچکدام',
- ),
- 'feed_name' => array(
- 'above_title' => ' بالای عنوان/برچسب ها',
- 'none' => ' هیچ',
- 'with_authors' => ' در نویسندگان و ردیف تاریخ',
- ),
- 'feed_title' => ' عنوان خوراک',
- 'icons' => array(
- '_' => 'موقعیت آیکون‌ها<br /><small>(فقط در نمای خواندن)</small>',
- 'above_title' => 'بالاتر از عنوان',
- 'with_authors' => 'در سطر نویسنده و تاریخ',
- ),
- 'tags' => array(
- '_' => ' برچسب ها',
- 'both' => ' در سرصفحه و پاورقی',
- 'footer' => ' در پاورقی',
- 'header' => ' در سربرگ',
- 'none' => ' هیچ',
- ),
- 'tags_max' => array(
- '_' => ' حداکثر تعداد برچسب نشان داده شده است',
- 'help' => '0 به این معنی است: همه برچسب ها را نشان دهید و آنها را جمع نکنید',
- ),
- ),
'articles_per_page' => ' تعداد مقاله در هر صفحه',
'auto_load_more' => ' مقالات بیشتری را در پایین صفحه بارگذاری کنید',
'auto_remove_article' => ' مخفی کردن مقالات پس از خواندن',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'دسته‌بندی‌هایی که باید باز باشند',
'headline' => array(
'articles' => ' مقالات: باز/بستن',
- 'articles_header_footer' => ' مقالات: سرصفحه / پاورقی',
'categories' => ' ناوبری چپ: دسته ها',
'mark_as_read' => ' مقاله را به عنوان خوانده شده علامت گذاری کنید',
'misc' => ' متفرقه',
diff --git a/app/i18n/fi/conf.php b/app/i18n/fi/conf.php
index 82681613e..a26106c8b 100644
--- a/app/i18n/fi/conf.php
+++ b/app/i18n/fi/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Näkymä',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Kirjoittajat ja päiväys',
+ 'both' => 'Ylä- ja alatunnisteessa',
+ 'footer' => 'Alatunnisteessa',
+ 'header' => 'Ylätunnisteessa',
+ 'none' => 'Älä näytä',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Otsikon/tunnisteiden yläpuolella',
+ 'none' => 'Älä näytä',
+ 'with_authors' => 'Kirjoittajien ja päiväysten rivillä',
+ ),
+ 'feed_title' => 'Syötteen otsikko',
+ 'icons' => array(
+ '_' => 'Artikkelin kuvakkeiden asettelu<br /><small>(vain lukunäkymä)</small>',
+ 'above_title' => 'Otsikon yläpuolella',
+ 'with_authors' => 'Kirjoittajien ja päiväysten rivillä',
+ ),
+ 'tags' => array(
+ '_' => '#Tunnisteet',
+ 'both' => 'Ylä- ja alatunnisteessa',
+ 'footer' => 'Alatunnisteessa',
+ 'header' => 'Ylätunnisteessa',
+ 'none' => 'Älä näytä',
+ ),
+ 'tags_max' => array(
+ '_' => 'Enimmäismäärä näytettäviä tunnisteita',
+ 'help' => '0 - näytä kaikki tunnisteet tiivistämättä',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automaattinen tumma tila',
'auto' => 'Automaattinen',
@@ -39,6 +70,9 @@ return array(
'no' => 'Ei',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Artikkelit: ylätunniste/alatunniste',
+ ),
'icon' => array(
'bottom_line' => 'Alin rivi',
'display_authors' => 'Kirjoittajat',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Kun valitset “merkitse kaikki luetuiksi”',
'always_show_favorites' => 'Näytä oletusarvoisesti kaikki suosikkiartikkelit',
'apply_to_individual_feed' => 'Asetus vaikuttaa jokaiseen syötteeseen erikseen',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Kirjoittajat ja päiväys',
- 'both' => 'Ylä- ja alatunnisteessa',
- 'footer' => 'Alatunnisteessa',
- 'header' => 'Ylätunnisteessa',
- 'none' => 'Älä näytä',
- ),
- 'feed_name' => array(
- 'above_title' => 'Otsikon/tunnisteiden yläpuolella',
- 'none' => 'Älä näytä',
- 'with_authors' => 'Kirjoittajien ja päiväysten rivillä',
- ),
- 'feed_title' => 'Syötteen otsikko',
- 'icons' => array(
- '_' => 'Artikkelin kuvakkeiden asettelu<br /><small>(vain lukunäkymä)</small>',
- 'above_title' => 'Otsikon yläpuolella',
- 'with_authors' => 'Kirjoittajien ja päiväysten rivillä',
- ),
- 'tags' => array(
- '_' => '#Tunnisteet',
- 'both' => 'Ylä- ja alatunnisteessa',
- 'footer' => 'Alatunnisteessa',
- 'header' => 'Ylätunnisteessa',
- 'none' => 'Älä näytä',
- ),
- 'tags_max' => array(
- '_' => 'Enimmäismäärä näytettäviä tunnisteita',
- 'help' => '0 - näytä kaikki tunnisteet tiivistämättä',
- ),
- ),
'articles_per_page' => 'Artikkelien määrä sivulla',
'auto_load_more' => 'Lataa lisää artikkeleita sivun lopussa',
'auto_remove_article' => 'Piilota artikkelit lukemisen jälkeen',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Luokat, joiden artikkelit näytetään kokonaan',
'headline' => array(
'articles' => 'Artikkelit: avaa/sulje',
- 'articles_header_footer' => 'Artikkelit: ylätunniste/alatunniste',
'categories' => 'Vasen siirtymisvalikko: luokat',
'mark_as_read' => 'Merkitse artikkeli luetuksi',
'misc' => 'Sekalaista',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index a1d5d31e9..c6a8bdeb2 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Affichage',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Auteurs et date',
+ 'both' => 'En en-tête et en pied d’article',
+ 'footer' => 'En pied d’article',
+ 'header' => 'En en-tête',
+ 'none' => 'Caché',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Au-dessus du titre',
+ 'none' => 'Caché',
+ 'with_authors' => 'Sur la ligne « Auteurs et date »',
+ ),
+ 'feed_title' => 'Titre du flux',
+ 'icons' => array(
+ '_' => 'Position des icônes d’article<br /><small>(Vue lecture seulement)</small>',
+ 'above_title' => 'Au dessus du titre',
+ 'with_authors' => 'Sur la ligne auteur et date',
+ ),
+ 'tags' => array(
+ '_' => 'Tags', // IGNORE
+ 'both' => 'En en-tête et en pied d’article',
+ 'footer' => 'En pied d’article',
+ 'header' => 'En en-tête',
+ 'none' => 'Caché',
+ ),
+ 'tags_max' => array(
+ '_' => 'Nombre maximum de tags affichés',
+ 'help' => '0 pour afficher tous les tags sans menu déroulant',
+ ),
+ ),
'darkMode' => array(
'_' => 'Mode sombre automatique',
'auto' => 'Auto', // IGNORE
@@ -39,6 +70,9 @@ return array(
'no' => 'Non',
),
'display_enclosures' => 'Afficher les pièces jointes',
+ 'headline' => array(
+ 'articles_header_footer' => 'Articles : en-tête / pied d’article',
+ ),
'icon' => array(
'bottom_line' => 'Ligne du bas',
'display_authors' => 'Auteurs',
@@ -232,37 +266,6 @@ return array(
'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',
- 'both' => 'En en-tête et en pied d’article',
- 'footer' => 'En pied d’article',
- 'header' => 'En en-tête',
- 'none' => 'Caché',
- ),
- 'feed_name' => array(
- 'above_title' => 'Au-dessus du titre',
- 'none' => 'Caché',
- 'with_authors' => 'Sur la ligne « Auteurs et date »',
- ),
- 'feed_title' => 'Titre du flux',
- 'icons' => array(
- '_' => 'Position des icônes d’article<br /><small>(Vue lecture seulement)</small>',
- 'above_title' => 'Au dessus du titre',
- 'with_authors' => 'Sur la ligne auteur et date',
- ),
- 'tags' => array(
- '_' => 'Tags', // IGNORE
- 'both' => 'En en-tête et en pied d’article',
- 'footer' => 'En pied d’article',
- 'header' => 'En en-tête',
- 'none' => 'Caché',
- ),
- 'tags_max' => array(
- '_' => 'Nombre maximum de tags affichés',
- 'help' => '0 pour afficher tous les tags sans menu déroulant',
- ),
- ),
'articles_per_page' => 'Nombre d’articles par page',
'auto_load_more' => 'Charger les articles suivants en bas de page',
'auto_remove_article' => 'Cacher les articles après lecture',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Catégories à déplier',
'headline' => array(
'articles' => 'Articles : ouverture/fermeture',
- 'articles_header_footer' => 'Articles : en-tête / pied d’article',
'categories' => 'Navigation de gauche : catégories',
'mark_as_read' => 'Marquer les articles comme lus',
'misc' => 'Divers',
diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php
index e4834a107..4d391c81a 100644
--- a/app/i18n/he/conf.php
+++ b/app/i18n/he/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'תצוגה',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Authors and date', // TODO
+ 'both' => 'In header and footer', // TODO
+ 'footer' => 'In footer', // TODO
+ 'header' => 'In header', // TODO
+ 'none' => 'None', // TODO
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Above title/tags', // TODO
+ 'none' => 'None', // TODO
+ 'with_authors' => 'In authors and date row', // TODO
+ ),
+ 'feed_title' => 'Feed title', // TODO
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
+ 'above_title' => 'Above title', // TODO
+ 'with_authors' => 'In authors and date row', // TODO
+ ),
+ 'tags' => array(
+ '_' => 'Tags', // TODO
+ 'both' => 'In header and footer', // TODO
+ 'footer' => 'In footer', // TODO
+ 'header' => 'In header', // TODO
+ 'none' => 'None', // TODO
+ ),
+ 'tags_max' => array(
+ '_' => 'Max number of tags shown', // TODO
+ 'help' => '0 means: show all tags and do not collapse them', // TODO
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatic dark mode', // TODO
'auto' => 'Auto', // TODO
@@ -39,6 +70,9 @@ return array(
'no' => 'No', // TODO
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Articles: header/footer', // TODO
+ ),
'icon' => array(
'bottom_line' => 'שורה תחתונה',
'display_authors' => 'Authors', // TODO
@@ -232,37 +266,6 @@ 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
- 'both' => 'In header and footer', // TODO
- 'footer' => 'In footer', // TODO
- 'header' => 'In header', // TODO
- 'none' => 'None', // TODO
- ),
- 'feed_name' => array(
- 'above_title' => 'Above title/tags', // TODO
- 'none' => 'None', // TODO
- 'with_authors' => 'In authors and date row', // TODO
- ),
- 'feed_title' => 'Feed title', // TODO
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
- 'above_title' => 'Above title', // TODO
- 'with_authors' => 'In authors and date row', // TODO
- ),
- 'tags' => array(
- '_' => 'Tags', // TODO
- 'both' => 'In header and footer', // TODO
- 'footer' => 'In footer', // TODO
- 'header' => 'In header', // TODO
- 'none' => 'None', // TODO
- ),
- 'tags_max' => array(
- '_' => 'Max number of tags shown', // TODO
- 'help' => '0 means: show all tags and do not collapse them', // TODO
- ),
- ),
'articles_per_page' => 'מספר המאמרים בעמוד',
'auto_load_more' => 'טעינת המאמר הבא סוף העמוד',
'auto_remove_article' => 'Hide articles after reading', // TODO
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categories to unfold', // TODO
'headline' => array(
'articles' => 'Articles: Open/Close', // TODO
- 'articles_header_footer' => 'Articles: header/footer', // TODO
'categories' => 'Left navigation: Categories', // TODO
'mark_as_read' => 'Mark article as read', // TODO
'misc' => 'Miscellaneous', // TODO
diff --git a/app/i18n/hu/conf.php b/app/i18n/hu/conf.php
index c4c6cc8c2..41d1f44d4 100644
--- a/app/i18n/hu/conf.php
+++ b/app/i18n/hu/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Megjelenítés',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Szerzők és dátum',
+ 'both' => 'Fejlécben és láblécben',
+ 'footer' => 'Láblécben',
+ 'header' => 'Fejlécben',
+ 'none' => 'Sehol',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Cím/címke felett',
+ 'none' => 'Sehol',
+ 'with_authors' => 'A szerzők és dátum sorban',
+ ),
+ 'feed_title' => 'Hírforrás címe',
+ 'icons' => array(
+ '_' => 'Cikk ikon helye<br /><small>(Csak olvasó nézet)</small>',
+ 'above_title' => 'A cím felett',
+ 'with_authors' => 'A szerzők és dátum sorban',
+ ),
+ 'tags' => array(
+ '_' => 'Címkék',
+ 'both' => 'Fejlécben és láblécben',
+ 'footer' => 'Láblécben',
+ 'header' => 'Fejlécben',
+ 'none' => 'Sehol',
+ ),
+ 'tags_max' => array(
+ '_' => 'Címkék maximális száma',
+ 'help' => '0 esetén: minden címke mutatása összecsukás nélkül',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatikus sötét mód',
'auto' => 'Automatikus',
@@ -39,6 +70,9 @@ return array(
'no' => 'Nem',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Cikkek: fejléc/lábléc',
+ ),
'icon' => array(
'bottom_line' => 'Alsó sor',
'display_authors' => 'Szerzők',
@@ -232,37 +266,6 @@ return array(
'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' => 'A hírforrásokra külön-külön vonatkozik',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Szerzők és dátum',
- 'both' => 'Fejlécben és láblécben',
- 'footer' => 'Láblécben',
- 'header' => 'Fejlécben',
- 'none' => 'Sehol',
- ),
- 'feed_name' => array(
- 'above_title' => 'Cím/címke felett',
- 'none' => 'Sehol',
- 'with_authors' => 'A szerzők és dátum sorban',
- ),
- 'feed_title' => 'Hírforrás címe',
- 'icons' => array(
- '_' => 'Cikk ikon helye<br /><small>(Csak olvasó nézet)</small>',
- 'above_title' => 'A cím felett',
- 'with_authors' => 'A szerzők és dátum sorban',
- ),
- 'tags' => array(
- '_' => 'Címkék',
- 'both' => 'Fejlécben és láblécben',
- 'footer' => 'Láblécben',
- 'header' => 'Fejlécben',
- 'none' => 'Sehol',
- ),
- 'tags_max' => array(
- '_' => 'Címkék maximális száma',
- 'help' => '0 esetén: minden címke mutatása összecsukás nélkül',
- ),
- ),
'articles_per_page' => 'Cikkek száma oldalanként',
'auto_load_more' => 'Még több cikk betöltése, ha a lap aljához ért',
'auto_remove_article' => 'Cikkek elrejtése elolvasás után',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Mely kategóriák legyenek kibontva',
'headline' => array(
'articles' => 'Cikkek: Nyitva/Zárva',
- 'articles_header_footer' => 'Cikkek: fejléc/lábléc',
'categories' => 'Baloldali navigáció: Kategóriák',
'mark_as_read' => 'Cikk megjelölése olvasottnak',
'misc' => 'Egyebek',
diff --git a/app/i18n/id/conf.php b/app/i18n/id/conf.php
index 262bd783a..1959e045c 100644
--- a/app/i18n/id/conf.php
+++ b/app/i18n/id/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Tampilan',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Penulis dan tanggal',
+ 'both' => 'Di baris atas dan bawah',
+ 'footer' => 'Di baris bawah',
+ 'header' => 'Di baris atas',
+ 'none' => 'Tidak ditampilkan',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Di atas judul/lebel',
+ 'none' => 'Tidak ditampilkan',
+ 'with_authors' => 'Di baris penulis dan tanggal',
+ ),
+ 'feed_title' => 'Judul umpan',
+ 'icons' => array(
+ '_' => 'Posisi ikon artikel <br /><small>(Tampilan membaca saja)</small>',
+ 'above_title' => 'Di atas judul',
+ 'with_authors' => 'Di baris penulis dan tanggal',
+ ),
+ 'tags' => array(
+ '_' => 'Label',
+ 'both' => 'Di baris atas dan bawah',
+ 'footer' => 'Di baris bawah',
+ 'header' => 'Di baris atas',
+ 'none' => 'Tidak ditampilkan',
+ ),
+ 'tags_max' => array(
+ '_' => 'Maksimum label yang ditampilkan',
+ 'help' => '0 berarti: tampilkan semua label dan jangan sembunyikan',
+ ),
+ ),
'darkMode' => array(
'_' => 'Mode gelap otomatis',
'auto' => 'Otomatis',
@@ -39,6 +70,9 @@ return array(
'no' => 'Tidak',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Artikel: Baris Atas/Bawah',
+ ),
'icon' => array(
'bottom_line' => 'Baris bawah',
'display_authors' => 'Penulis',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Setelah “tandai semua sebagai sudah dibaca”',
'always_show_favorites' => 'Tampilkan semua artikel favorit secara baku',
'apply_to_individual_feed' => 'Berlaku per umpan individu',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Penulis dan tanggal',
- 'both' => 'Di baris atas dan bawah',
- 'footer' => 'Di baris bawah',
- 'header' => 'Di baris atas',
- 'none' => 'Tidak ditampilkan',
- ),
- 'feed_name' => array(
- 'above_title' => 'Di atas judul/lebel',
- 'none' => 'Tidak ditampilkan',
- 'with_authors' => 'Di baris penulis dan tanggal',
- ),
- 'feed_title' => 'Judul umpan',
- 'icons' => array(
- '_' => 'Posisi ikon artikel <br /><small>(Tampilan membaca saja)</small>',
- 'above_title' => 'Di atas judul',
- 'with_authors' => 'Di baris penulis dan tanggal',
- ),
- 'tags' => array(
- '_' => 'Label',
- 'both' => 'Di baris atas dan bawah',
- 'footer' => 'Di baris bawah',
- 'header' => 'Di baris atas',
- 'none' => 'Tidak ditampilkan',
- ),
- 'tags_max' => array(
- '_' => 'Maksimum label yang ditampilkan',
- 'help' => '0 berarti: tampilkan semua label dan jangan sembunyikan',
- ),
- ),
'articles_per_page' => 'Jumlah artikel per halaman',
'auto_load_more' => 'Muat lebih banyak artikel setelah bagian bawah halaman',
'auto_remove_article' => 'Sembunyikan artikel setelah dibaca',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Kategori yang dibuka',
'headline' => array(
'articles' => 'Artikel: Buka/Tutup',
- 'articles_header_footer' => 'Artikel: Baris Atas/Bawah',
'categories' => 'Navigasi kiri: Kategori',
'mark_as_read' => 'Tandai artikel sebagai sudah dibaca',
'misc' => 'Lain-lain',
diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
index 85a894f83..2f0e390aa 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Visualizzazione',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autori e data',
+ 'both' => 'Nell’intestazione e nel fondo pagina',
+ 'footer' => 'Nel fondo pagina',
+ 'header' => 'Nell’intestazione',
+ 'none' => 'Nessuno',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Sopra il titolo/tag',
+ 'none' => 'Nessuno',
+ 'with_authors' => 'Nella riga degli autori e data',
+ ),
+ 'feed_title' => 'Titolo del feed',
+ 'icons' => array(
+ '_' => 'Posizione delle icone dell’articolo <br /><small>(solo in lettura)</small>',
+ 'above_title' => 'Titolo in evidenza',
+ 'with_authors' => 'Nella riga degli autori e della data',
+ ),
+ 'tags' => array(
+ '_' => 'Tag',
+ 'both' => 'Nell’intestazione e nel fondo pagina',
+ 'footer' => 'Nel fondo pagina',
+ 'header' => 'Nell’intestazione',
+ 'none' => 'Nessuno',
+ ),
+ 'tags_max' => array(
+ '_' => 'Numero massimo di tag mostrati',
+ 'help' => '0 significa: mostra tutti i tag e non raggrupparli',
+ ),
+ ),
'darkMode' => array(
'_' => 'Modalità scura automatica',
'auto' => 'Auto', // IGNORE
@@ -39,6 +70,9 @@ return array(
'no' => 'No', // IGNORE
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Articoli: intestazione/fondo pagina',
+ ),
'icon' => array(
'bottom_line' => 'Barra in fondo',
'display_authors' => 'Autori',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Dopo “segna tutto come letto”,',
'always_show_favorites' => 'Mostra tutti gli articoli nei preferiti di default',
'apply_to_individual_feed' => 'Si applica ai feed singolarmente',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Autori e data',
- 'both' => 'Nell’intestazione e nel fondo pagina',
- 'footer' => 'Nel fondo pagina',
- 'header' => 'Nell’intestazione',
- 'none' => 'Nessuno',
- ),
- 'feed_name' => array(
- 'above_title' => 'Sopra il titolo/tag',
- 'none' => 'Nessuno',
- 'with_authors' => 'Nella riga degli autori e data',
- ),
- 'feed_title' => 'Titolo del feed',
- 'icons' => array(
- '_' => 'Posizione delle icone dell’articolo <br /><small>(solo in lettura)</small>',
- 'above_title' => 'Titolo in evidenza',
- 'with_authors' => 'Nella riga degli autori e della data',
- ),
- 'tags' => array(
- '_' => 'Tag',
- 'both' => 'Nell’intestazione e nel fondo pagina',
- 'footer' => 'Nel fondo pagina',
- 'header' => 'Nell’intestazione',
- 'none' => 'Nessuno',
- ),
- 'tags_max' => array(
- '_' => 'Numero massimo di tag mostrati',
- 'help' => '0 significa: mostra tutti i tag e non raggrupparli',
- ),
- ),
'articles_per_page' => 'Numero di articoli per pagina',
'auto_load_more' => 'Carica articoli successivi a fondo pagina',
'auto_remove_article' => 'Nascondi articoli dopo la lettura',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categorie da aprire',
'headline' => array(
'articles' => 'Articoli: Apri/Chiudi',
- 'articles_header_footer' => 'Articoli: intestazione/fondo pagina',
'categories' => 'Navigazione di sinistra: Categorie',
'mark_as_read' => 'Segna gli articoli come letti',
'misc' => 'Varie',
diff --git a/app/i18n/ja/conf.php b/app/i18n/ja/conf.php
index 28c6d4d1b..b3b21c792 100644
--- a/app/i18n/ja/conf.php
+++ b/app/i18n/ja/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => '表示',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => '著者と日時',
+ 'both' => 'ヘッダーとフッター',
+ 'footer' => 'フッター',
+ 'header' => 'ヘッダー',
+ 'none' => 'なし',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'タイトルとタグの上',
+ 'none' => 'なし',
+ 'with_authors' => '著者と日時の隣',
+ ),
+ 'feed_title' => 'フィード名',
+ 'icons' => array(
+ '_' => '記事アイコンの位置<br /><small>(リーディングビューのみ)</small>',
+ 'above_title' => 'タイトルの上',
+ 'with_authors' => '著者と日時の隣',
+ ),
+ 'tags' => array(
+ '_' => 'タグ',
+ 'both' => 'ヘッダーとフッター',
+ 'footer' => 'フッター',
+ 'header' => 'ヘッダー',
+ 'none' => 'なし',
+ ),
+ 'tags_max' => array(
+ '_' => '表示するタグの数の上限',
+ 'help' => '0に設定すると、折りたたまずにすべてのタグを表示します。',
+ ),
+ ),
'darkMode' => array(
'_' => '自動ダークモード',
'auto' => '有効',
@@ -39,6 +70,9 @@ return array(
'no' => '無効',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => '記事:ヘッダー/フッター',
+ ),
'icon' => array(
'bottom_line' => '下段',
'display_authors' => '著者',
@@ -232,37 +266,6 @@ return array(
'after_onread' => '「すべて既読にする」の実行後、',
'always_show_favorites' => 'デフォルトですべてのお気に入りの記事を表示する',
'apply_to_individual_feed' => '個々のフィードに適用する',
- 'article' => array(
- 'authors_date' => array(
- '_' => '著者と日時',
- 'both' => 'ヘッダーとフッター',
- 'footer' => 'フッター',
- 'header' => 'ヘッダー',
- 'none' => 'なし',
- ),
- 'feed_name' => array(
- 'above_title' => 'タイトルとタグの上',
- 'none' => 'なし',
- 'with_authors' => '著者と日時の隣',
- ),
- 'feed_title' => 'フィード名',
- 'icons' => array(
- '_' => '記事アイコンの位置<br /><small>(リーディングビューのみ)</small>',
- 'above_title' => 'タイトルの上',
- 'with_authors' => '著者と日時の隣',
- ),
- 'tags' => array(
- '_' => 'タグ',
- 'both' => 'ヘッダーとフッター',
- 'footer' => 'フッター',
- 'header' => 'ヘッダー',
- 'none' => 'なし',
- ),
- 'tags_max' => array(
- '_' => '表示するタグの数の上限',
- 'help' => '0に設定すると、折りたたまずにすべてのタグを表示します。',
- ),
- ),
'articles_per_page' => '1ページあたりの記事の数',
'auto_load_more' => 'ページ下部で記事をさらに読み込む',
'auto_remove_article' => '記事を読んだら非表示にする',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => '展開するカテゴリ',
'headline' => array(
'articles' => '記事:開く/閉じる',
- 'articles_header_footer' => '記事:ヘッダー/フッター',
'categories' => '左のナビゲーション:カテゴリ',
'mark_as_read' => 'チェックをつけた記事を既読にする',
'misc' => 'その他',
diff --git a/app/i18n/ko/conf.php b/app/i18n/ko/conf.php
index d18683002..585760033 100644
--- a/app/i18n/ko/conf.php
+++ b/app/i18n/ko/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => '표시',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => '작성자, 작성일',
+ 'both' => '머리말과 꼬리말에 모두',
+ 'footer' => '꼬리말에',
+ 'header' => '머리말에',
+ 'none' => '숨김',
+ ),
+ 'feed_name' => array(
+ 'above_title' => '제목/태그 위에',
+ 'none' => '숨김',
+ 'with_authors' => '작성자, 작성일과 같은 줄에',
+ ),
+ 'feed_title' => '피드 제목',
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
+ 'above_title' => 'Above title', // TODO
+ 'with_authors' => 'In authors and date row', // TODO
+ ),
+ 'tags' => array(
+ '_' => '태그',
+ 'both' => '머리말과 꼬리말에',
+ 'footer' => '꼬리말에',
+ 'header' => '머리말에',
+ 'none' => '숨김',
+ ),
+ 'tags_max' => array(
+ '_' => ' 표시할 최대 태그 수',
+ 'help' => '0 으로 설정하면 모든 태그를 표시하고 숨기지 않습니다',
+ ),
+ ),
'darkMode' => array(
'_' => '자동 다크 모드',
'auto' => '자동',
@@ -39,6 +70,9 @@ return array(
'no' => '끄기',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => '기사: 머리말/꼬리말',
+ ),
'icon' => array(
'bottom_line' => '하단',
'display_authors' => '저자',
@@ -232,37 +266,6 @@ return array(
'after_onread' => '“모두 읽음으로 표시” 후,',
'always_show_favorites' => '기본으로 즐겨찾기에 있는 모든 글을 표시',
'apply_to_individual_feed' => 'Applies to feeds individually', // TODO
- 'article' => array(
- 'authors_date' => array(
- '_' => '작성자, 작성일',
- 'both' => '머리말과 꼬리말에 모두',
- 'footer' => '꼬리말에',
- 'header' => '머리말에',
- 'none' => '숨김',
- ),
- 'feed_name' => array(
- 'above_title' => '제목/태그 위에',
- 'none' => '숨김',
- 'with_authors' => '작성자, 작성일과 같은 줄에',
- ),
- 'feed_title' => '피드 제목',
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
- 'above_title' => 'Above title', // TODO
- 'with_authors' => 'In authors and date row', // TODO
- ),
- 'tags' => array(
- '_' => '태그',
- 'both' => '머리말과 꼬리말에',
- 'footer' => '꼬리말에',
- 'header' => '머리말에',
- 'none' => '숨김',
- ),
- 'tags_max' => array(
- '_' => ' 표시할 최대 태그 수',
- 'help' => '0 으로 설정하면 모든 태그를 표시하고 숨기지 않습니다',
- ),
- ),
'articles_per_page' => '페이지당 글 수',
'auto_load_more' => '페이지 하단에 다다르면 글 더 불러오기',
'auto_remove_article' => '글을 읽은 후 숨기기',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => '다음 카테고리를 펼치기',
'headline' => array(
'articles' => '기사: 열기/닫기',
- 'articles_header_footer' => '기사: 머리말/꼬리말',
'categories' => '좌측 탐색 메뉴: 카테고리',
'mark_as_read' => '읽음으로 표시',
'misc' => '기타',
diff --git a/app/i18n/lv/conf.php b/app/i18n/lv/conf.php
index b1d27af31..9211315ba 100644
--- a/app/i18n/lv/conf.php
+++ b/app/i18n/lv/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Ekrāns',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autori un datums',
+ 'both' => 'Virsrakstā un kājenē',
+ 'footer' => 'Kājienē',
+ 'header' => 'Virsrakstā',
+ 'none' => 'Nekāds',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Virs titula/birkām',
+ 'none' => 'Nekāds',
+ 'with_authors' => 'Autoru un datuma rindā',
+ ),
+ 'feed_title' => 'Barotnes tituls',
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
+ 'above_title' => 'Above title', // TODO
+ 'with_authors' => 'In authors and date row', // TODO
+ ),
+ 'tags' => array(
+ '_' => 'Birkas',
+ 'both' => 'Virsrakstā un kājenē',
+ 'footer' => 'Kājienē',
+ 'header' => 'Virsrakstā',
+ 'none' => 'Nekāds',
+ ),
+ 'tags_max' => array(
+ '_' => 'Maksimālais rādīto birku skaits',
+ 'help' => '0 nozīmē: rādīt visas birkas un nesalocīt tās',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automātiskais tumšais režīms',
'auto' => 'Auto', // IGNORE
@@ -39,6 +70,9 @@ return array(
'no' => 'Nē',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Raksti: virsraksts/kājotne',
+ ),
'icon' => array(
'bottom_line' => 'Apakšējā līnija',
'display_authors' => 'Autori',
@@ -232,37 +266,6 @@ return array(
'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',
- 'both' => 'Virsrakstā un kājenē',
- 'footer' => 'Kājienē',
- 'header' => 'Virsrakstā',
- 'none' => 'Nekāds',
- ),
- 'feed_name' => array(
- 'above_title' => 'Virs titula/birkām',
- 'none' => 'Nekāds',
- 'with_authors' => 'Autoru un datuma rindā',
- ),
- 'feed_title' => 'Barotnes tituls',
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
- 'above_title' => 'Above title', // TODO
- 'with_authors' => 'In authors and date row', // TODO
- ),
- 'tags' => array(
- '_' => 'Birkas',
- 'both' => 'Virsrakstā un kājenē',
- 'footer' => 'Kājienē',
- 'header' => 'Virsrakstā',
- 'none' => 'Nekāds',
- ),
- 'tags_max' => array(
- '_' => 'Maksimālais rādīto birku skaits',
- 'help' => '0 nozīmē: rādīt visas birkas un nesalocīt tās',
- ),
- ),
'articles_per_page' => 'Rakstu skaits lapā',
'auto_load_more' => 'Ielādēt vairāk rakstu lapas apakšā',
'auto_remove_article' => 'Paslēpt rakstus pēc izlasīšanas',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Nesalocītās kategorijas',
'headline' => array(
'articles' => 'Raksti: Atvērt/Aizvērt',
- 'articles_header_footer' => 'Raksti: virsraksts/kājotne',
'categories' => 'Kreisā navigācija: Kategorijas',
'mark_as_read' => 'Atzīmēt rakstu kā izlasītu',
'misc' => 'Citi',
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index f08ef6b2b..62e23bdf4 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Opmaak',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Auteurs en datum',
+ 'both' => 'In kop en voet',
+ 'footer' => 'In voet',
+ 'header' => 'In kop',
+ 'none' => 'Geen',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Boven titel/tags',
+ 'none' => 'Geen',
+ 'with_authors' => 'In lijn met auteurs en datum',
+ ),
+ 'feed_title' => 'Feedtitel',
+ 'icons' => array(
+ '_' => 'Positie van artikelpictogrammen<br /><small>(Alleen leesweergave)</small>',
+ 'above_title' => 'Boven titel',
+ 'with_authors' => 'In rij auteurs en datum',
+ ),
+ 'tags' => array(
+ '_' => 'Tags', // IGNORE
+ 'both' => 'In kop en voet',
+ 'footer' => 'In voet',
+ 'header' => 'In kop',
+ 'none' => 'Geen',
+ ),
+ 'tags_max' => array(
+ '_' => 'Max aantal getoonde tags',
+ 'help' => '0 betekent: toon alle tags en verberg er geen',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatische dark mode',
'auto' => 'Auto', // IGNORE
@@ -39,6 +70,9 @@ return array(
'no' => 'Nee',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Artikelen: kop/voet',
+ ),
'icon' => array(
'bottom_line' => 'Onderaan',
'display_authors' => 'Auteurs',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Na „markeer alles als gelezen”,',
'always_show_favorites' => 'Toon alle artikelen standaard in favorieten',
'apply_to_individual_feed' => 'Toegepast op individuele feeds',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Auteurs en datum',
- 'both' => 'In kop en voet',
- 'footer' => 'In voet',
- 'header' => 'In kop',
- 'none' => 'Geen',
- ),
- 'feed_name' => array(
- 'above_title' => 'Boven titel/tags',
- 'none' => 'Geen',
- 'with_authors' => 'In lijn met auteurs en datum',
- ),
- 'feed_title' => 'Feedtitel',
- 'icons' => array(
- '_' => 'Positie van artikelpictogrammen<br /><small>(Alleen leesweergave)</small>',
- 'above_title' => 'Boven titel',
- 'with_authors' => 'In rij auteurs en datum',
- ),
- 'tags' => array(
- '_' => 'Tags', // IGNORE
- 'both' => 'In kop en voet',
- 'footer' => 'In voet',
- 'header' => 'In kop',
- 'none' => 'Geen',
- ),
- 'tags_max' => array(
- '_' => 'Max aantal getoonde tags',
- 'help' => '0 betekent: toon alle tags en verberg er geen',
- ),
- ),
'articles_per_page' => 'Aantal artikelen per pagina',
'auto_load_more' => 'Laad volgende artikel onderaan de pagina',
'auto_remove_article' => 'Verberg artikel na lezen',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categoriën om uit te klappen',
'headline' => array(
'articles' => 'Artikelen: openen/sluiten',
- 'articles_header_footer' => 'Artikelen: kop/voet',
'categories' => 'Linkernavigatie: categoriën',
'mark_as_read' => 'Artikelen als gelezen markeren',
'misc' => 'Diversen',
diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php
index 43aa3bff3..081a8fbc3 100644
--- a/app/i18n/oc/conf.php
+++ b/app/i18n/oc/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Afichatge',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autors e data',
+ 'both' => 'Dins l’entèsta e lo bas de pagina',
+ 'footer' => 'Al pè de pagina',
+ 'header' => 'Dins l’entèsta',
+ 'none' => 'Cap',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Al dessús títol/etiquetas',
+ 'none' => 'Cap',
+ 'with_authors' => 'Dins la linha autors e data',
+ ),
+ 'feed_title' => 'Títol del flux',
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
+ 'above_title' => 'Above title', // TODO
+ 'with_authors' => 'In authors and date row', // TODO
+ ),
+ 'tags' => array(
+ '_' => 'Etiquetas',
+ 'both' => 'Dins l’entèsta e lo bas de pagina',
+ 'footer' => 'Al pè de pagina',
+ 'header' => 'Dins l’entèsta',
+ 'none' => 'Cap',
+ ),
+ 'tags_max' => array(
+ '_' => 'Nombre max d’etiquetas afichadas',
+ 'help' => '0 significa : mostrar totas las etiquetas e las plegar pas',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatic dark mode', // TODO
'auto' => 'Auto', // TODO
@@ -39,6 +70,9 @@ return array(
'no' => 'No', // TODO
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Articles : entèsta/pè de pagina',
+ ),
'icon' => array(
'bottom_line' => 'Linha enbàs',
'display_authors' => 'Autors',
@@ -232,37 +266,6 @@ return array(
'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',
- 'both' => 'Dins l’entèsta e lo bas de pagina',
- 'footer' => 'Al pè de pagina',
- 'header' => 'Dins l’entèsta',
- 'none' => 'Cap',
- ),
- 'feed_name' => array(
- 'above_title' => 'Al dessús títol/etiquetas',
- 'none' => 'Cap',
- 'with_authors' => 'Dins la linha autors e data',
- ),
- 'feed_title' => 'Títol del flux',
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
- 'above_title' => 'Above title', // TODO
- 'with_authors' => 'In authors and date row', // TODO
- ),
- 'tags' => array(
- '_' => 'Etiquetas',
- 'both' => 'Dins l’entèsta e lo bas de pagina',
- 'footer' => 'Al pè de pagina',
- 'header' => 'Dins l’entèsta',
- 'none' => 'Cap',
- ),
- 'tags_max' => array(
- '_' => 'Nombre max d’etiquetas afichadas',
- 'help' => '0 significa : mostrar totas las etiquetas e las plegar pas',
- ),
- ),
'articles_per_page' => 'Nombre d’articles per pagina',
'auto_load_more' => 'Cargar los articles seguents enbàs de la pagina',
'auto_remove_article' => 'Rescondre los articles aprèp lectura',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categorias a desplegar',
'headline' => array(
'articles' => 'Articles : Dobrir/Tampar',
- 'articles_header_footer' => 'Articles : entèsta/pè de pagina',
'categories' => 'Navegacion esquèrra : categorias',
'mark_as_read' => 'Marcar los articles coma legits',
'misc' => 'Divèrs',
diff --git a/app/i18n/pl/conf.php b/app/i18n/pl/conf.php
index 7b3a75315..443ae056f 100644
--- a/app/i18n/pl/conf.php
+++ b/app/i18n/pl/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Wyświetlanie',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autor i data',
+ 'both' => 'W nagłówku i stopce',
+ 'footer' => 'W stopce',
+ 'header' => 'W nagłówku',
+ 'none' => 'Brak',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Ponad tytułem/tagami',
+ 'none' => 'Brak',
+ 'with_authors' => 'W tej samej linii co autor i data',
+ ),
+ 'feed_title' => 'Nazwa kanału',
+ 'icons' => array(
+ '_' => 'Pozycja ikonek wiadomości<br /><small>(tylko w widoku czytania)</small>',
+ 'above_title' => 'Powyżej tytułu',
+ 'with_authors' => 'W tej samej linii co autor i data',
+ ),
+ 'tags' => array(
+ '_' => 'Tagi',
+ 'both' => 'W nagłówku i stopce',
+ 'footer' => 'W stopce',
+ 'header' => 'W nagłówku',
+ 'none' => 'Brak',
+ ),
+ 'tags_max' => array(
+ '_' => 'Limit liczby wyświetlanych tagów',
+ 'help' => '0 oznacza: wyświetl wszystkie tagi i żadnego nie zwijaj',
+ ),
+ ),
'darkMode' => array(
'_' => 'Tryb ciemny',
'auto' => 'Automatyczny',
@@ -39,6 +70,9 @@ return array(
'no' => 'Wyłączony',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Wiadomości: nagłówek i stopka',
+ ),
'icon' => array(
'bottom_line' => 'Dolny margines',
'display_authors' => 'Autorzy',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Po oznaczeniu wszystkich jako przeczytane,',
'always_show_favorites' => 'Pokaż wszystkie wiadomości po wejściu do ulubionych',
'apply_to_individual_feed' => 'Dotyczy kanałów indywidualnie',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Autor i data',
- 'both' => 'W nagłówku i stopce',
- 'footer' => 'W stopce',
- 'header' => 'W nagłówku',
- 'none' => 'Brak',
- ),
- 'feed_name' => array(
- 'above_title' => 'Ponad tytułem/tagami',
- 'none' => 'Brak',
- 'with_authors' => 'W tej samej linii co autor i data',
- ),
- 'feed_title' => 'Nazwa kanału',
- 'icons' => array(
- '_' => 'Pozycja ikonek wiadomości<br /><small>(tylko w widoku czytania)</small>',
- 'above_title' => 'Powyżej tytułu',
- 'with_authors' => 'W tej samej linii co autor i data',
- ),
- 'tags' => array(
- '_' => 'Tagi',
- 'both' => 'W nagłówku i stopce',
- 'footer' => 'W stopce',
- 'header' => 'W nagłówku',
- 'none' => 'Brak',
- ),
- 'tags_max' => array(
- '_' => 'Limit liczby wyświetlanych tagów',
- 'help' => '0 oznacza: wyświetl wszystkie tagi i żadnego nie zwijaj',
- ),
- ),
'articles_per_page' => 'Liczba wiadomości na stronę',
'auto_load_more' => 'Załaduj więcej wiadomości po dojściu na koniec strony',
'auto_remove_article' => 'Ukryj wiadomości po przeczytaniu',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Kategorie do rozwinięcia',
'headline' => array(
'articles' => 'Wiadomości: otwieranie i zamykanie',
- 'articles_header_footer' => 'Wiadomości: nagłówek i stopka',
'categories' => 'Nawigacja po lewej: Kategorie',
'mark_as_read' => 'Oznacz wiadomość jako przeczytaną',
'misc' => 'Różne',
diff --git a/app/i18n/pt-BR/conf.php b/app/i18n/pt-BR/conf.php
index d3b9e6b3c..eff6e79d2 100644
--- a/app/i18n/pt-BR/conf.php
+++ b/app/i18n/pt-BR/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Exibição',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autores e Data',
+ 'both' => 'No cabeçalho e rodapé',
+ 'footer' => 'No rodapé',
+ 'header' => 'No cabeçalho',
+ 'none' => 'Nenhum',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Acima do título/etiqueta',
+ 'none' => 'Nenhum',
+ 'with_authors' => 'Com autores e data',
+ ),
+ 'feed_title' => 'Título do Feed',
+ 'icons' => array(
+ '_' => 'Posição dos ícones do artigo<br /><small>(Apenas na visualização de leitura)</small>',
+ 'above_title' => 'Acima do título',
+ 'with_authors' => 'Na linha de autores e data',
+ ),
+ 'tags' => array(
+ '_' => 'Tag',
+ 'both' => 'No cabeçalho e rodapé',
+ 'footer' => 'No rodapé',
+ 'header' => 'No cabeçalho',
+ 'none' => 'Nenhum',
+ ),
+ 'tags_max' => array(
+ '_' => 'Número máximo de tags exibidas',
+ 'help' => '0 significa: mostrar todas as tags e não recolhê-las',
+ ),
+ ),
'darkMode' => array(
'_' => 'Modo noturno automático',
'auto' => 'Automático',
@@ -39,6 +70,9 @@ return array(
'no' => 'Não',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Artigos: cabeçalho/rodapé',
+ ),
'icon' => array(
'bottom_line' => 'Linha inferior',
'display_authors' => 'Autores',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Depois de “marcar todos como lido”,',
'always_show_favorites' => 'Mostrar todos os artigos nos favoritos por padrão',
'apply_to_individual_feed' => 'Aplica-se a feeds individualmente',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Autores e Data',
- 'both' => 'No cabeçalho e rodapé',
- 'footer' => 'No rodapé',
- 'header' => 'No cabeçalho',
- 'none' => 'Nenhum',
- ),
- 'feed_name' => array(
- 'above_title' => 'Acima do título/etiqueta',
- 'none' => 'Nenhum',
- 'with_authors' => 'Com autores e data',
- ),
- 'feed_title' => 'Título do Feed',
- 'icons' => array(
- '_' => 'Posição dos ícones do artigo<br /><small>(Apenas na visualização de leitura)</small>',
- 'above_title' => 'Acima do título',
- 'with_authors' => 'Na linha de autores e data',
- ),
- 'tags' => array(
- '_' => 'Tag',
- 'both' => 'No cabeçalho e rodapé',
- 'footer' => 'No rodapé',
- 'header' => 'No cabeçalho',
- 'none' => 'Nenhum',
- ),
- 'tags_max' => array(
- '_' => 'Número máximo de tags exibidas',
- 'help' => '0 significa: mostrar todas as tags e não recolhê-las',
- ),
- ),
'articles_per_page' => 'Número de artigos por página',
'auto_load_more' => 'Carregar mais artigos no final da página',
'auto_remove_article' => 'Esconder artigos depois de lidos',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categorias abertas',
'headline' => array(
'articles' => 'Artigos: Abrir/Fechar',
- 'articles_header_footer' => 'Artigos: cabeçalho/rodapé',
'categories' => 'Navegação à esquerda: Categoria',
'mark_as_read' => 'Marcar artigo como lido',
'misc' => 'Diversos',
diff --git a/app/i18n/pt-PT/conf.php b/app/i18n/pt-PT/conf.php
index 485d0908d..1e73667fa 100644
--- a/app/i18n/pt-PT/conf.php
+++ b/app/i18n/pt-PT/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Exibição',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Autores e Data',
+ 'both' => 'No cabeçalho e rodapé',
+ 'footer' => 'No rodapé',
+ 'header' => 'No cabeçalho',
+ 'none' => 'Nenhum',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Acima do título/etiqueta',
+ 'none' => 'Nenhum',
+ 'with_authors' => 'Com autores e data',
+ ),
+ 'feed_title' => 'Título do Feed',
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
+ 'above_title' => 'Above title', // TODO
+ 'with_authors' => 'In authors and date row', // TODO
+ ),
+ 'tags' => array(
+ '_' => 'Tag',
+ 'both' => 'No cabeçalho e rodapé',
+ 'footer' => 'No rodapé',
+ 'header' => 'No cabeçalho',
+ 'none' => 'Nenhum',
+ ),
+ 'tags_max' => array(
+ '_' => 'Número máximo de tags exibidas',
+ 'help' => '0 significa: mostrar todas as tags e não enconde-las',
+ ),
+ ),
'darkMode' => array(
'_' => 'Modo noturno automático',
'auto' => 'Automático',
@@ -39,6 +70,9 @@ return array(
'no' => 'Não',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Artigos: cabeçalho/rodapé',
+ ),
'icon' => array(
'bottom_line' => 'Linha inferior',
'display_authors' => 'Autores',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Depois de “marcar todos como lido”,',
'always_show_favorites' => 'Mostrar todos os artigos nos favoritos por padrão',
'apply_to_individual_feed' => 'Applies to feeds individually', // TODO
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Autores e Data',
- 'both' => 'No cabeçalho e rodapé',
- 'footer' => 'No rodapé',
- 'header' => 'No cabeçalho',
- 'none' => 'Nenhum',
- ),
- 'feed_name' => array(
- 'above_title' => 'Acima do título/etiqueta',
- 'none' => 'Nenhum',
- 'with_authors' => 'Com autores e data',
- ),
- 'feed_title' => 'Título do Feed',
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
- 'above_title' => 'Above title', // TODO
- 'with_authors' => 'In authors and date row', // TODO
- ),
- 'tags' => array(
- '_' => 'Tag',
- 'both' => 'No cabeçalho e rodapé',
- 'footer' => 'No rodapé',
- 'header' => 'No cabeçalho',
- 'none' => 'Nenhum',
- ),
- 'tags_max' => array(
- '_' => 'Número máximo de tags exibidas',
- 'help' => '0 significa: mostrar todas as tags e não enconde-las',
- ),
- ),
'articles_per_page' => 'Número de artigos por página',
'auto_load_more' => 'Carregar mais artigos no final da página',
'auto_remove_article' => 'Esconder artigos depois de lidos',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Categorias abertas',
'headline' => array(
'articles' => 'Artigos: Abrir/Fechar',
- 'articles_header_footer' => 'Artigos: cabeçalho/rodapé',
'categories' => 'Navegação à esquerda: Categoria',
'mark_as_read' => 'Marcar artigo como lido',
'misc' => 'Diversos',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index 4ec070a74..e7503fe4b 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Отображение',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Авторы и дата',
+ 'both' => 'В верхнем и нижнем колонтитулах',
+ 'footer' => 'В нижнем колонтитуле',
+ 'header' => 'В верхнем колонтитуле',
+ 'none' => 'Нигде',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Над титулом и метками',
+ 'none' => 'Нигде',
+ 'with_authors' => 'В строке с автором и датой',
+ ),
+ 'feed_title' => 'Титул ленты',
+ 'icons' => array(
+ '_' => 'Позиция иконок статьи<br /><small>(только в виде для чтения)</small>',
+ 'above_title' => 'Над заголовком',
+ 'with_authors' => 'В строке с авторами и датой',
+ ),
+ 'tags' => array(
+ '_' => 'Метки',
+ 'both' => 'В верхнем и нижнем колонтитулах',
+ 'footer' => 'В нижнем колонтитуле',
+ 'header' => 'В верхнем колонтитуле',
+ 'none' => 'Нигде',
+ ),
+ 'tags_max' => array(
+ '_' => 'Максимальное количество отображающих меток',
+ 'help' => '0 означает: показать все метки и не сжимать их',
+ ),
+ ),
'darkMode' => array(
'_' => 'Автоматический темный режим',
'auto' => 'Авто',
@@ -39,6 +70,9 @@ return array(
'no' => 'Нет',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Статьи: верхний/нижний колонтитул',
+ ),
'icon' => array(
'bottom_line' => 'Нижняя линия',
'display_authors' => 'Авторы',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'После «отметить всё прочитанным»',
'always_show_favorites' => 'Показывать все статьи в избранном по умолчанию',
'apply_to_individual_feed' => 'Применяется к лентам индивидуально',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Авторы и дата',
- 'both' => 'В верхнем и нижнем колонтитулах',
- 'footer' => 'В нижнем колонтитуле',
- 'header' => 'В верхнем колонтитуле',
- 'none' => 'Нигде',
- ),
- 'feed_name' => array(
- 'above_title' => 'Над титулом и метками',
- 'none' => 'Нигде',
- 'with_authors' => 'В строке с автором и датой',
- ),
- 'feed_title' => 'Титул ленты',
- 'icons' => array(
- '_' => 'Позиция иконок статьи<br /><small>(только в виде для чтения)</small>',
- 'above_title' => 'Над заголовком',
- 'with_authors' => 'В строке с авторами и датой',
- ),
- 'tags' => array(
- '_' => 'Метки',
- 'both' => 'В верхнем и нижнем колонтитулах',
- 'footer' => 'В нижнем колонтитуле',
- 'header' => 'В верхнем колонтитуле',
- 'none' => 'Нигде',
- ),
- 'tags_max' => array(
- '_' => 'Максимальное количество отображающих меток',
- 'help' => '0 означает: показать все метки и не сжимать их',
- ),
- ),
'articles_per_page' => 'Количество статей на странице',
'auto_load_more' => 'Загружать больше статей при достижении низа страницы',
'auto_remove_article' => 'Скрывать статьи по прочтении',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Какие категории развёртывать',
'headline' => array(
'articles' => 'Статьи: открыть/закрыть',
- 'articles_header_footer' => 'Статьи: верхний/нижний колонтитул',
'categories' => 'Левая панель: категории',
'mark_as_read' => 'Пометить статью прочитанной',
'misc' => 'Разное',
diff --git a/app/i18n/sk/conf.php b/app/i18n/sk/conf.php
index fc4257ff8..a013f5013 100644
--- a/app/i18n/sk/conf.php
+++ b/app/i18n/sk/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Zobrazenie',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Authori a dátum',
+ 'both' => 'V záhlaví a pätičke',
+ 'footer' => 'V pätičke',
+ 'header' => 'V záhlaví',
+ 'none' => 'Žiadne',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'O zápise/značky',
+ 'none' => 'Žiadne',
+ 'with_authors' => 'V riadku autori a dátum',
+ ),
+ 'feed_title' => 'Nadpis kanála',
+ 'icons' => array(
+ '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
+ 'above_title' => 'Above title', // TODO
+ 'with_authors' => 'In authors and date row', // TODO
+ ),
+ 'tags' => array(
+ '_' => 'Značky',
+ 'both' => 'V záhlaví a pätičke',
+ 'footer' => 'V pätičke',
+ 'header' => 'V záhlaví',
+ 'none' => 'Žiadne',
+ ),
+ 'tags_max' => array(
+ '_' => 'Maximálny počet zobrazených značiek',
+ 'help' => '0 znamená: zobraziť všetky značky a nerozbaľuj ich',
+ ),
+ ),
'darkMode' => array(
'_' => 'Automatický tmavý režim',
'auto' => 'Automaticky',
@@ -39,6 +70,9 @@ return array(
'no' => 'Nie',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Články: záhlavie/pätička',
+ ),
'icon' => array(
'bottom_line' => 'Spodný riadok',
'display_authors' => 'Autori',
@@ -232,37 +266,6 @@ return array(
'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',
- 'both' => 'V záhlaví a pätičke',
- 'footer' => 'V pätičke',
- 'header' => 'V záhlaví',
- 'none' => 'Žiadne',
- ),
- 'feed_name' => array(
- 'above_title' => 'O zápise/značky',
- 'none' => 'Žiadne',
- 'with_authors' => 'V riadku autori a dátum',
- ),
- 'feed_title' => 'Nadpis kanála',
- 'icons' => array(
- '_' => 'Article icons position<br /><small>(Reading view only)</small>', // TODO
- 'above_title' => 'Above title', // TODO
- 'with_authors' => 'In authors and date row', // TODO
- ),
- 'tags' => array(
- '_' => 'Značky',
- 'both' => 'V záhlaví a pätičke',
- 'footer' => 'V pätičke',
- 'header' => 'V záhlaví',
- 'none' => 'Žiadne',
- ),
- 'tags_max' => array(
- '_' => 'Maximálny počet zobrazených značiek',
- 'help' => '0 znamená: zobraziť všetky značky a nerozbaľuj ich',
- ),
- ),
'articles_per_page' => 'Počet článkov na jednu stranu',
'auto_load_more' => 'Načítať ďalšie články dolu na stránke',
'auto_remove_article' => 'Skryť články po prečítaní',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Kategórie na rozbalenie',
'headline' => array(
'articles' => 'Články: Otvoriť/Zatvoriť',
- 'articles_header_footer' => 'Články: záhlavie/pätička',
'categories' => 'Ľavé menu: Kategórie',
'mark_as_read' => 'Označiť článok ako prečítaný',
'misc' => 'Ostatné',
diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
index aa33be7eb..65b9bcb36 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Görüntüleme',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Yazarlar ve tarih',
+ 'both' => 'Başlıkta ve altbilgide',
+ 'footer' => 'Altbilgide',
+ 'header' => 'Başlıkta',
+ 'none' => 'Yok',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Başlık/etiketlerin üstünde',
+ 'none' => 'Yok',
+ 'with_authors' => 'Yazarlar ve tarih satırında',
+ ),
+ 'feed_title' => 'Besleme başlığı',
+ 'icons' => array(
+ '_' => 'Makale simgelerinin konumu<br /><small>(Yalnızca okuma görünümünde)</small>',
+ 'above_title' => 'Başlığın üstünde',
+ 'with_authors' => 'Yazarlar ve tarih satırında',
+ ),
+ 'tags' => array(
+ '_' => 'Etiketler',
+ 'both' => 'Başlıkta ve altbilgide',
+ 'footer' => 'Altbilgide',
+ 'header' => 'Başlıkta',
+ 'none' => 'Yok',
+ ),
+ 'tags_max' => array(
+ '_' => 'Gösterilecek maksimum etiket sayısı',
+ 'help' => '0: tüm etiketleri göster ve daraltma',
+ ),
+ ),
'darkMode' => array(
'_' => 'Otomatik karanlık mod',
'auto' => 'Otomatik',
@@ -39,6 +70,9 @@ return array(
'no' => 'Hayır',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Makaleler: başlık/altbilgi',
+ ),
'icon' => array(
'bottom_line' => 'Alt satır',
'display_authors' => 'Yazarlar',
@@ -232,37 +266,6 @@ return array(
'after_onread' => '“Tümünü okundu olarak işaretle”den sonra,',
'always_show_favorites' => 'Varsayılan olarak favorilerdeki tüm makaleleri göster',
'apply_to_individual_feed' => 'Beslemelere bireysel olarak uygula',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Yazarlar ve tarih',
- 'both' => 'Başlıkta ve altbilgide',
- 'footer' => 'Altbilgide',
- 'header' => 'Başlıkta',
- 'none' => 'Yok',
- ),
- 'feed_name' => array(
- 'above_title' => 'Başlık/etiketlerin üstünde',
- 'none' => 'Yok',
- 'with_authors' => 'Yazarlar ve tarih satırında',
- ),
- 'feed_title' => 'Besleme başlığı',
- 'icons' => array(
- '_' => 'Makale simgelerinin konumu<br /><small>(Yalnızca okuma görünümünde)</small>',
- 'above_title' => 'Başlığın üstünde',
- 'with_authors' => 'Yazarlar ve tarih satırında',
- ),
- 'tags' => array(
- '_' => 'Etiketler',
- 'both' => 'Başlıkta ve altbilgide',
- 'footer' => 'Altbilgide',
- 'header' => 'Başlıkta',
- 'none' => 'Yok',
- ),
- 'tags_max' => array(
- '_' => 'Gösterilecek maksimum etiket sayısı',
- 'help' => '0: tüm etiketleri göster ve daraltma',
- ),
- ),
'articles_per_page' => 'Sayfa başına makale sayısı',
'auto_load_more' => 'Sayfanın altından daha fazla makale yükle',
'auto_remove_article' => 'Okuduktan sonra makaleleri gizle',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Açılacak kategoriler',
'headline' => array(
'articles' => 'Makaleler: Aç/Kapat',
- 'articles_header_footer' => 'Makaleler: başlık/altbilgi',
'categories' => 'Sol gezinme: Kategoriler',
'mark_as_read' => 'Makaleyi okundu olarak işaretle',
'misc' => 'Çeşitli',
diff --git a/app/i18n/uk/conf.php b/app/i18n/uk/conf.php
index 3a040055a..555ccc2e8 100644
--- a/app/i18n/uk/conf.php
+++ b/app/i18n/uk/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => 'Оформлення',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => 'Автори й дата',
+ 'both' => 'Вгорі й унизу',
+ 'footer' => 'Внизу',
+ 'header' => 'Вгорі',
+ 'none' => 'Не показувати',
+ ),
+ 'feed_name' => array(
+ 'above_title' => 'Над заголовком і тегами',
+ 'none' => 'Не показувати',
+ 'with_authors' => 'У рядку авторів і дати',
+ ),
+ 'feed_title' => 'Назва стрічки',
+ 'icons' => array(
+ '_' => 'Піктограми статті<br /><small>(Тільки читацький показ)</small>',
+ 'above_title' => 'Над заголовком',
+ 'with_authors' => 'У рядку авторів і дати',
+ ),
+ 'tags' => array(
+ '_' => 'Теги',
+ 'both' => 'Вгорі й унизу',
+ 'footer' => 'Внизу',
+ 'header' => 'Вгорі',
+ 'none' => 'Не показувати',
+ ),
+ 'tags_max' => array(
+ '_' => 'Показувати тегів',
+ 'help' => '0 означає показати всі теги й не згортати їх',
+ ),
+ ),
'darkMode' => array(
'_' => 'Темний режим',
'auto' => 'Автоматично',
@@ -39,6 +70,9 @@ return array(
'no' => 'Вимкнено',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => 'Статті: верх/низ',
+ ),
'icon' => array(
'bottom_line' => 'Нижній рядок',
'display_authors' => 'Автори',
@@ -232,37 +266,6 @@ return array(
'after_onread' => 'Коли все позначено прочитаним,',
'always_show_favorites' => 'У вподобаних типово показувати всі статті',
'apply_to_individual_feed' => 'Застосовується до саме цієї стрічки',
- 'article' => array(
- 'authors_date' => array(
- '_' => 'Автори й дата',
- 'both' => 'Вгорі й унизу',
- 'footer' => 'Внизу',
- 'header' => 'Вгорі',
- 'none' => 'Не показувати',
- ),
- 'feed_name' => array(
- 'above_title' => 'Над заголовком і тегами',
- 'none' => 'Не показувати',
- 'with_authors' => 'У рядку авторів і дати',
- ),
- 'feed_title' => 'Назва стрічки',
- 'icons' => array(
- '_' => 'Піктограми статті<br /><small>(Тільки читацький показ)</small>',
- 'above_title' => 'Над заголовком',
- 'with_authors' => 'У рядку авторів і дати',
- ),
- 'tags' => array(
- '_' => 'Теги',
- 'both' => 'Вгорі й унизу',
- 'footer' => 'Внизу',
- 'header' => 'Вгорі',
- 'none' => 'Не показувати',
- ),
- 'tags_max' => array(
- '_' => 'Показувати тегів',
- 'help' => '0 означає показати всі теги й не згортати їх',
- ),
- ),
'articles_per_page' => 'Статей на сторінці',
'auto_load_more' => 'Завантажувати більше статей при прокручуванні',
'auto_remove_article' => 'Ховати статті після прочитання',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => 'Категорії для розгортання',
'headline' => array(
'articles' => 'Статті: відкриті/закриті',
- 'articles_header_footer' => 'Статті: верх/низ',
'categories' => 'Ліва навігація: категорії',
'mark_as_read' => 'Позначити статтю прочитаною',
'misc' => 'Різне',
diff --git a/app/i18n/zh-CN/conf.php b/app/i18n/zh-CN/conf.php
index 1d7675925..107840f1b 100644
--- a/app/i18n/zh-CN/conf.php
+++ b/app/i18n/zh-CN/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => '显示',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => '作者和日期',
+ 'both' => '页脚与页眉',
+ 'footer' => '页脚',
+ 'header' => '页眉',
+ 'none' => '不显示',
+ ),
+ 'feed_name' => array(
+ 'above_title' => '在标题/标签上方',
+ 'none' => '不显示',
+ 'with_authors' => '与作者和日期一行',
+ ),
+ 'feed_title' => '订阅源标题',
+ 'icons' => array(
+ '_' => '文章图标位置<br /><small>(仅阅读视图)</small>',
+ 'above_title' => '标题之上',
+ 'with_authors' => '与作者和日期在同一行',
+ ),
+ 'tags' => array(
+ '_' => '文章标签',
+ 'both' => '页脚与页眉',
+ 'footer' => '页脚',
+ 'header' => '页眉',
+ 'none' => '不显示',
+ ),
+ 'tags_max' => array(
+ '_' => '标签最多显示个数',
+ 'help' => '0 表示:显示所有标签且不折叠',
+ ),
+ ),
'darkMode' => array(
'_' => '自动黑暗模式',
'auto' => '启动',
@@ -39,6 +70,9 @@ return array(
'no' => '关闭',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => '文章: 页眉/页脚',
+ ),
'icon' => array(
'bottom_line' => '底栏',
'display_authors' => '作者',
@@ -232,37 +266,6 @@ return array(
'after_onread' => '“全部标记为已读”后',
'always_show_favorites' => '默认显示收藏夹中所有的文章',
'apply_to_individual_feed' => '单独应用于各订阅源',
- 'article' => array(
- 'authors_date' => array(
- '_' => '作者和日期',
- 'both' => '页脚与页眉',
- 'footer' => '页脚',
- 'header' => '页眉',
- 'none' => '不显示',
- ),
- 'feed_name' => array(
- 'above_title' => '在标题/标签上方',
- 'none' => '不显示',
- 'with_authors' => '与作者和日期一行',
- ),
- 'feed_title' => '订阅源标题',
- 'icons' => array(
- '_' => '文章图标位置<br /><small>(仅阅读视图)</small>',
- 'above_title' => '标题之上',
- 'with_authors' => '与作者和日期在同一行',
- ),
- 'tags' => array(
- '_' => '文章标签',
- 'both' => '页脚与页眉',
- 'footer' => '页脚',
- 'header' => '页眉',
- 'none' => '不显示',
- ),
- 'tags_max' => array(
- '_' => '标签最多显示个数',
- 'help' => '0 表示:显示所有标签且不折叠',
- ),
- ),
'articles_per_page' => '每页文章数',
'auto_load_more' => '在页面底部载入更多文章',
'auto_remove_article' => '阅读后隐藏文章',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => '展开的分类',
'headline' => array(
'articles' => '文章:打开/关闭',
- 'articles_header_footer' => '文章: 页眉/页脚',
'categories' => '左侧导航栏:分类',
'mark_as_read' => '标为已读选项',
'misc' => '其它',
diff --git a/app/i18n/zh-TW/conf.php b/app/i18n/zh-TW/conf.php
index 5c461995c..6a066de13 100644
--- a/app/i18n/zh-TW/conf.php
+++ b/app/i18n/zh-TW/conf.php
@@ -32,6 +32,37 @@ return array(
),
'display' => array(
'_' => '顯示',
+ 'article' => array(
+ 'authors_date' => array(
+ '_' => '作者和日期',
+ 'both' => '兩者都顯示',
+ 'footer' => '僅頁腳顯示',
+ 'header' => '僅頁眉顯示',
+ 'none' => '不顯示',
+ ),
+ 'feed_name' => array(
+ 'above_title' => '標題/標籤之上',
+ 'none' => '不顯示',
+ 'with_authors' => '在作者和日期那列',
+ ),
+ 'feed_title' => '訂閱源標題',
+ 'icons' => array(
+ '_' => '文章圖示位置<br /><small>(僅閱讀檢視)</small>',
+ 'above_title' => '標題之上',
+ 'with_authors' => '在作者和日期那列',
+ ),
+ 'tags' => array(
+ '_' => '標籤',
+ 'both' => '兩者都顯示',
+ 'footer' => '僅頁腳顯示',
+ 'header' => '僅頁眉顯示',
+ 'none' => '不顯示',
+ ),
+ 'tags_max' => array(
+ '_' => '標籤最大顯示數量',
+ 'help' => '0 代表顯示所有標籤並且不摺疊它們',
+ ),
+ ),
'darkMode' => array(
'_' => '自動黑暗模式',
'auto' => '自動',
@@ -39,6 +70,9 @@ return array(
'no' => '否',
),
'display_enclosures' => 'Show enclosures', // TODO
+ 'headline' => array(
+ 'articles_header_footer' => '文章: 頁首/頁尾',
+ ),
'icon' => array(
'bottom_line' => '底部',
'display_authors' => '作者',
@@ -232,37 +266,6 @@ return array(
'after_onread' => '在 "標記全部為已讀" 之後,',
'always_show_favorites' => '預設顯示收藏中的所有文章',
'apply_to_individual_feed' => '個別套用到訂閱源',
- 'article' => array(
- 'authors_date' => array(
- '_' => '作者和日期',
- 'both' => '兩者都顯示',
- 'footer' => '僅頁腳顯示',
- 'header' => '僅頁眉顯示',
- 'none' => '不顯示',
- ),
- 'feed_name' => array(
- 'above_title' => '標題/標籤之上',
- 'none' => '不顯示',
- 'with_authors' => '在作者和日期那列',
- ),
- 'feed_title' => '訂閱源標題',
- 'icons' => array(
- '_' => '文章圖示位置<br /><small>(僅閱讀檢視)</small>',
- 'above_title' => '標題之上',
- 'with_authors' => '在作者和日期那列',
- ),
- 'tags' => array(
- '_' => '標籤',
- 'both' => '兩者都顯示',
- 'footer' => '僅頁腳顯示',
- 'header' => '僅頁眉顯示',
- 'none' => '不顯示',
- ),
- 'tags_max' => array(
- '_' => '標籤最大顯示數量',
- 'help' => '0 代表顯示所有標籤並且不摺疊它們',
- ),
- ),
'articles_per_page' => '每頁文章數',
'auto_load_more' => '在頁面底部載入更多文章',
'auto_remove_article' => '閱讀後隱藏文章',
@@ -271,7 +274,6 @@ return array(
'display_categories_unfolded' => '不摺疊的類別',
'headline' => array(
'articles' => '文章: 開啟/關閉',
- 'articles_header_footer' => '文章: 頁首/頁尾',
'categories' => '左側導覽: 類別',
'mark_as_read' => '標記文章為已讀',
'misc' => '雜項',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 4d75fc6f4..365ee8b47 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -308,6 +308,58 @@
</div>
</div>
+ <h2><?= _t('conf.display.headline.articles_header_footer') ?></h2>
+ <div class="form-group">
+ <label class="group-name" for="show_feed_name"><?= _t('conf.display.article.feed_title') ?></label>
+ <div class="group-controls">
+ <select name="show_feed_name" id="show_feed_name">
+ <option value="0"<?= FreshRSS_Context::userConf()->show_feed_name === '0' ? ' selected="selected"' : '' ?>><?= _t('conf.display.article.feed_name.none') ?></option>
+ <option value="t"<?= FreshRSS_Context::userConf()->show_feed_name === 't' ? ' selected="selected"' : '' ?>><?= _t('conf.display.article.feed_name.above_title') ?></option>
+ <option value="a"<?= FreshRSS_Context::userConf()->show_feed_name === 'a' ? ' selected="selected"' : '' ?>><?= _t('conf.display.article.feed_name.with_authors') ?></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="group-name" for="show_author_date"><?= _t('conf.display.article.authors_date') ?></label>
+ <div class="group-controls">
+ <select name="show_author_date" id="show_author_date">
+ <option value="0" <?= FreshRSS_Context::userConf()->show_author_date === '0' ? ' selected="selected"' : '' ?>><?= _t('conf.display.article.authors_date.none') ?></option>
+ <option value="h" <?= FreshRSS_Context::userConf()->show_author_date === 'h' ? ' selected="selected"' : '' ?>><?= _t('conf.display.article.authors_date.header') ?></option>
+ <option value="f" <?= FreshRSS_Context::userConf()->show_author_date === 'f' ? ' selected="selected"' : '' ?>><?= _t('conf.display.article.authors_date.footer') ?></option>
+ <option value="b" <?= FreshRSS_Context::userConf()->show_author_date === 'b' ? ' selected="selected"' : '' ?>><?= _t('conf.display.article.authors_date.both') ?></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="group-name" for="show_article_icons"><?= _t('conf.display.article.icons') ?></label>
+ <div class="group-controls">
+ <select name="show_article_icons" id="show_article_icons">
+ <option value="t" <?= FreshRSS_Context::userConf()->show_article_icons === 't' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.display.article.icons.above_title') ?></option>
+ <option value="a" <?= FreshRSS_Context::userConf()->show_article_icons === 'a' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.display.article.icons.with_authors') ?></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="group-name" for="show_tags"><?= _t('conf.display.article.tags') ?></label>
+ <div class="group-controls">
+ <select class="select-input-changer" name="show_tags" id="show_tags" data-name="show_tags_max">
+ <option value="0" <?= FreshRSS_Context::userConf()->show_tags === '0' ? ' selected="selected"' : '' ?> data-input-visible="false"><?= _t('conf.display.article.tags.none') ?></option>
+ <option value="h" <?= FreshRSS_Context::userConf()->show_tags === 'h' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.display.article.tags.header') ?></option>
+ <option value="f" <?= FreshRSS_Context::userConf()->show_tags === 'f' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.display.article.tags.footer') ?></option>
+ <option value="b" <?= FreshRSS_Context::userConf()->show_tags === 'b' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.display.article.tags.both') ?></option>
+ </select>
+ <noscript> — <strong><?= _t('gen.js.should_be_activated') ?></strong></noscript>
+ </div>
+ </div>
+ <div class="form-group" id="show_tags_max-block">
+ <label class="group-name" for="show_tags_max"><?= _t('conf.display.article.tags_max') ?></label>
+ <div class="group-controls">
+ <input type="number" id="show_tags_max" name="show_tags_max" value="<?= FreshRSS_Context::userConf()->show_tags_max ?>" min="0" data-number="2" />
+ <p class="help"><?= _i('help') ?> <?= _t('conf.display.article.tags_max.help') ?></p>
+ </div>
+ </div>
+
<div class="form-group form-actions">
<div class="group-controls">
<button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button>
@@ -316,3 +368,5 @@
</div>
</form>
</main>
+
+<script src="../scripts/config.js?<?= @filemtime(PUBLIC_PATH . '/scripts/config.js') ?>"></script>
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 31ecdb5c7..6d054e8f2 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -180,60 +180,6 @@
</div>
</fieldset>
- <fieldset>
- <legend><?= _t('conf.reading.headline.articles_header_footer') ?></legend>
- <div class="form-group">
- <label class="group-name" for="show_feed_name"><?= _t('conf.reading.article.feed_title') ?></label>
- <div class="group-controls">
- <select name="show_feed_name" id="show_feed_name">
- <option value="0"<?= FreshRSS_Context::userConf()->show_feed_name === '0' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.article.feed_name.none') ?></option>
- <option value="t"<?= FreshRSS_Context::userConf()->show_feed_name === 't' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.article.feed_name.above_title') ?></option>
- <option value="a"<?= FreshRSS_Context::userConf()->show_feed_name === 'a' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.article.feed_name.with_authors') ?></option>
- </select>
- </div>
- </div>
-
- <div class="form-group">
- <label class="group-name" for="show_author_date"><?= _t('conf.reading.article.authors_date') ?></label>
- <div class="group-controls">
- <select name="show_author_date" id="show_author_date">
- <option value="0" <?= FreshRSS_Context::userConf()->show_author_date === '0' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.article.authors_date.none') ?></option>
- <option value="h" <?= FreshRSS_Context::userConf()->show_author_date === 'h' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.article.authors_date.header') ?></option>
- <option value="f" <?= FreshRSS_Context::userConf()->show_author_date === 'f' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.article.authors_date.footer') ?></option>
- <option value="b" <?= FreshRSS_Context::userConf()->show_author_date === 'b' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.article.authors_date.both') ?></option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="group-name" for="show_article_icons"><?= _t('conf.reading.article.icons') ?></label>
- <div class="group-controls">
- <select name="show_article_icons" id="show_article_icons">
- <option value="t" <?= FreshRSS_Context::userConf()->show_article_icons === 't' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.reading.article.icons.above_title') ?></option>
- <option value="a" <?= FreshRSS_Context::userConf()->show_article_icons === 'a' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.reading.article.icons.with_authors') ?></option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="group-name" for="show_tags"><?= _t('conf.reading.article.tags') ?></label>
- <div class="group-controls">
- <select class="select-input-changer" name="show_tags" id="show_tags" data-name="show_tags_max">
- <option value="0" <?= FreshRSS_Context::userConf()->show_tags === '0' ? ' selected="selected"' : '' ?> data-input-visible="false"><?= _t('conf.reading.article.tags.none') ?></option>
- <option value="h" <?= FreshRSS_Context::userConf()->show_tags === 'h' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.reading.article.tags.header') ?></option>
- <option value="f" <?= FreshRSS_Context::userConf()->show_tags === 'f' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.reading.article.tags.footer') ?></option>
- <option value="b" <?= FreshRSS_Context::userConf()->show_tags === 'b' ? ' selected="selected"' : '' ?> data-input-visible="true"><?= _t('conf.reading.article.tags.both') ?></option>
- </select>
- <noscript> — <strong><?= _t('gen.js.should_be_activated') ?></strong></noscript>
- </div>
- </div>
- <div class="form-group" id="show_tags_max-block">
- <label class="group-name" for="show_tags_max"><?= _t('conf.reading.article.tags_max') ?></label>
- <div class="group-controls">
- <input type="number" id="show_tags_max" name="show_tags_max" value="<?= FreshRSS_Context::userConf()->show_tags_max ?>" min="0" data-number="2" />
- <p class="help"><?= _i('help') ?> <?= _t('conf.reading.article.tags_max.help') ?></p>
- </div>
- </div>
- </fieldset>
-
<fieldset>
<legend><?= _t('conf.reading.headline.articles') ?></legend>
<div class="form-group">
@@ -468,5 +414,3 @@
</form>
</main>
-
-<script src="../scripts/config.js?<?= @filemtime(PUBLIC_PATH . '/scripts/config.js') ?>"></script>