Merge remote-tracking branch 'upstream/develop' into baseurl

[friendica.git] / src / App / Page.php

diff --git a/src/App/Page.php b/src/App/Page.php
index 96bb59425efd151f405bd025d41dfb98a1058f70..e369d482e83610617105b9718b46bd2bca9d9d92 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -245,10 +245,12 @@ class Page implements ArrayAccess
                 */
                $this->page['htmlhead'] = Renderer::replaceMacros($tpl, [
                        '$l10n' => [
-                               'delitem'        => $l10n->t('Delete this item?'),
-                               'blockAuthor'    => $l10n->t('Block this author? They won\'t be able to follow you nor see your public posts, and you won\'t be able to see their posts and their notifications.'),
-                               'ignoreAuthor'   => $l10n->t('Ignore this author? You won\'t be able to see their posts and their notifications.'),
-                               'collapseAuthor' => $l10n->t('Collapse this author\'s posts?'),
+                               'delitem'          => $l10n->t('Delete this item?'),
+                               'blockAuthor'      => $l10n->t("Block this author? They won't be able to follow you nor see your public posts, and you won't be able to see their posts and their notifications."),
+                               'ignoreAuthor'     => $l10n->t("Ignore this author? You won't be able to see their posts and their notifications."),
+                               'collapseAuthor'   => $l10n->t("Collapse this author's posts?"),
+                               'ignoreServer'     => $l10n->t("Ignore this author's server?"),
+                               'ignoreServerDesc' => $l10n->t("You won't see any content from this server including reshares in your Network page, the community pages and individual conversations."),
 
                                'likeError'     => $l10n->t('Like not successful'),
                                'dislikeError'  => $l10n->t('Dislike not successful'),