Update Echo to 1.35

Signed-off-by: Brian Evans <grknight@gentoo.org>

1 files changed, 44 insertions, 22 deletions

diff --git a/Echo/i18n/en.json b/Echo/i18n/en.json
index 5c14a87e..ca1290aa 100644
--- a/Echo/i18n/en.json
+++ b/Echo/i18n/en.json
@@ -38,15 +38,20 @@
 	"echo-desc": "System for notifying users about events and messages",
 	"prefs-echo": "Notifications",
 	"prefs-emailsettings": "Email options",
-	"prefs-displaynotifications": "Display options",
 	"prefs-echosubscriptions": "Notify me about these events",
 	"prefs-echocrosswiki": "Cross-wiki notifications",
 	"prefs-blocknotificationslist": "Muted users",
+	"prefs-mutedpageslist": "Muted pages for page link notifications",
+	"prefs-echopollupdates": "Live notifications",
+	"echo-mobile-notifications-filter-title": "Filter notifications",
+	"echo-pref-show-poll-updates": "Display new notifications as they arrive",
+	"echo-pref-show-poll-updates-help": "Show the number of unread notifications in the title bar, and show a snippet of each notification immediately when it arrives.",
 	"echo-pref-send-me": "Send me:",
 	"echo-pref-send-to": "Send to:",
 	"echo-pref-email-format": "Email format:",
 	"echo-pref-web": "Web",
 	"echo-pref-email": "Email",
+	"echo-pref-push": "Apps",
 	"echo-pref-email-frequency-never": "Do not send me any email notifications",
 	"echo-pref-email-frequency-immediately": "Individual notifications as they come in",
 	"echo-pref-email-frequency-daily": "A daily summary of notifications",
@@ -55,8 +60,8 @@
 	"echo-pref-email-format-plain-text": "Plain text",
 	"echo-pref-cross-wiki-notifications": "Show notifications from other wikis",
 	"echo-pref-notifications-blacklist": "Do not display notifications from these users. ([[mw:Special:MyLanguage/Help:Notifications#mute|learn more]])",
-	"echo-pref-beta-feature-cross-wiki-message": "Enhanced notifications",
-	"echo-pref-beta-feature-cross-wiki-description": "View and organize notifications more easily. Includes cross-wiki notifications, which lets you see messages from other wikis. (To receive cross-wiki notifications on a given wiki, you must activate the beta feature on that wiki.)",
+	"echo-pref-notifications-page-linked-title-muted-list": "Do not display \"Page link\" notifications for these pages. ([[mw:Special:MyLanguage/Help:Notifications#mute|learn more]])",
+	"echo-pref-dont-email-read-notifications": "Don't include read notifications in summary emails",
 	"echo-learn-more": "Learn more",
 	"echo-log": "Public log",
 	"echo-new-messages": "You have new messages",
@@ -68,9 +73,14 @@
 	"echo-category-title-mention-success": "Successful {{PLURAL:$1|mention|mentions}}",
 	"echo-category-title-other": "{{PLURAL:$1|Other}}",
 	"echo-category-title-system": "{{PLURAL:$1|System}}",
+	"echo-category-title-system-noemail": "{{PLURAL:$1|System}}",
+	"echo-category-title-system-emailonly": "{{PLURAL:$1|System}}",
 	"echo-category-title-user-rights": "{{PLURAL:$1|User rights change|User rights changes}}",
 	"echo-category-title-emailuser": "{{PLURAL:$1|Email from other user|Emails from other users}}",
 	"echo-category-title-article-reminder": "Page {{PLURAL:$1|reminder|reminders}}",
+	"echo-category-title-thank-you-edit": "Edit {{PLURAL:$1|milestone|milestones}}",
+	"echo-category-title-watchlist": "Edit to watched page",
+	"echo-category-title-minor-watchlist": "Minor edit to watched page",
 	"echo-pref-tooltip-edit-user-talk": "Notify me when someone posts a message or replies on my talk page.",
 	"echo-pref-tooltip-article-linked": "Notify me when someone links to a page I created from another page.",
 	"echo-pref-tooltip-reverted": "Notify me when someone reverts an edit I made, by using the undo or rollback tool.",
@@ -80,7 +90,9 @@
 	"echo-pref-tooltip-user-rights": "Notify me when someone changes my user rights.",
 	"echo-pref-tooltip-emailuser": "Notify me when someone sends me an email.",
 	"echo-pref-tooltip-article-reminder": "Notify me about this page when I ask.",
-	"echo-error-no-formatter": "No formatting defined for notification.",
+	"echo-pref-tooltip-thank-you-edit": "Notify me when I reach my 1st, 10th, 100th... edit.",
+	"echo-pref-tooltip-watchlist": "Notify me when someone makes a (non-minor) edit to a page on my watchlist.",
+	"echo-pref-tooltip-minor-watchlist": "Notify me when someone makes a minor edit to a page on my watchlist.",
 	"notifications": "Notifications",
 	"tooltip-pt-notifications-alert": "{{GENDER:|Your}} alerts",
 	"tooltip-pt-notifications-notice": "{{GENDER:|Your}} notices",
@@ -91,7 +103,6 @@
 	"echo-displaynotificationsconfiguration-sorting-by-section-legend": "Which section each notification type is sorted into",
 	"echo-displaynotificationsconfiguration-available-notification-methods-header": "Allowed notification methods",
 	"echo-displaynotificationsconfiguration-available-notification-methods-by-category-legend": "Which notification methods are supported for each category",
-	"echo-displaynotificationsconfiguration-available-notification-methods-by-type-legend": "Which notification methods are supported for each type; only applies to types within categories that are hidden from preferences",
 	"echo-displaynotificationsconfiguration-enabled-default-header": "Enabled by default",
 	"echo-displaynotificationsconfiguration-enabled-default-existing-users-legend": "Existing users",
 	"echo-displaynotificationsconfiguration-enabled-default-new-users-legend": "New users",
@@ -101,16 +112,14 @@
 	"echo-specialpage-section-markread": "Mark group as read",
 	"echo-specialpage-markasread": "Notification: Mark as read",
 	"echo-specialpage-markasread-invalid-id": "Invalid event ID",
+	"echo-specialpage-pagefilterwidget-aria-label": "Filter by wiki and page title",
+	"echo-specialpage-special-help-menu-widget-aria-label": "Additional options and Notifications preferences.",
 	"echo-specialpage-pagination-numnotifications": "$1 {{PLURAL:$1|notification|notifications}}",
 	"echo-specialpage-pagination-range": "$1 - $2",
 	"echo-specialpage-pagefilters-title": "Recent activity",
 	"echo-specialpage-pagefilters-subtitle": "Pages with unread notifications",
 	"notificationsmarkread-legend": "Mark notification as read",
-	"echo-anon": "To receive notifications, [$1 create an account] or [$2 log in].",
 	"echo-none": "You have no notifications.",
-	"echo-more-info": "More info",
-	"echo-feedback": "Feedback",
-	"echo-quotation-marks": "\"$1\"",
 	"echo-api-failure": "Failed to fetch notifications.",
 	"echo-api-failure-cross-wiki": "Access to the remote domain was denied.",
 	"echo-notification-placeholder": "There are no notifications.",
@@ -121,6 +130,12 @@
 	"echo-notification-markasunread": "Mark as unread",
 	"echo-notification-markasread-tooltip": "Mark as read",
 	"echo-notification-more-options-tooltip": "More options",
+	"notification-dynamic-actions-mute-page-linked": "{{GENDER:$2|Mute}} link notifications on \"$1\"",
+	"notification-dynamic-actions-mute-page-linked-confirmation": "\"Page link\" notifications are now disabled for the page \"$1\"",
+	"notification-dynamic-actions-mute-page-linked-confirmation-description": "{{GENDER:$2|You}} can manage your muted pages in [$1 your preferences] anytime.",
+	"notification-dynamic-actions-unmute-page-linked": "{{GENDER:$2|Unmute}} link notifications on \"$1\"",
+	"notification-dynamic-actions-unmute-page-linked-confirmation": "\"Page link\" notifications are now enabled for the page \"$1\"",
+	"notification-dynamic-actions-unmute-page-linked-confirmation-description": "{{GENDER:$2|You}} can manage your muted pages in [$1 your preferences] anytime.",
 	"notification-dynamic-actions-unwatch": "{{GENDER:$3|Stop}} watching new activity on \"$1\"",
 	"notification-dynamic-actions-unwatch-confirmation": "{{GENDER:$3|You}} are no longer watching the page \"$1\"",
 	"notification-dynamic-actions-unwatch-confirmation-description": "{{GENDER:$3|You}} can watch [$2 this page] anytime.",
@@ -172,6 +187,16 @@
 	"notification-header-user-rights-expiry-change": "The expiry of {{GENDER:$4|your}} membership in the following {{PLURAL:$3|group|groups}} has been {{GENDER:$1|changed}}: $2.",
 	"notification-header-welcome": "{{GENDER:$2|Welcome}} to {{SITENAME}}, $1! We're glad {{GENDER:$2|you're}} here.",
 	"notification-header-mention-summary": "$1 {{GENDER:$2|mentioned}} {{GENDER:$3|you}} in an edit summary on <strong>$4</strong>.",
+	"notification-header-watchlist-changed": "$1 {{GENDER:$2|changed}} <strong>$3</strong>, a page on {{GENDER:$4|your}} watchlist{{PLURAL:$5||, $5 times}}.",
+	"notification-header-watchlist-created": "$1 {{GENDER:$2|created}} <strong>$3</strong>, a page on {{GENDER:$4|your}} watchlist{{PLURAL:$5||, $5 times}}.",
+	"notification-header-watchlist-deleted": "$1 {{GENDER:$2|deleted}} <strong>$3</strong>, a page on {{GENDER:$4|your}} watchlist{{PLURAL:$5||, $5 times}}.",
+	"notification-header-watchlist-moved": "$1 {{GENDER:$2|moved}} <strong>$3</strong>, a page on {{GENDER:$4|your}} watchlist{{PLURAL:$5||, $5 times}}.",
+	"notification-header-watchlist-restored": "$1 {{GENDER:$2|restored}} <strong>$3</strong>, a page on {{GENDER:$4|your}} watchlist{{PLURAL:$5||, $5 times}}.",
+	"notification-header-watchlist-multiuser-changed": "<strong>$1</strong>, a page on {{GENDER:$2|your}} watchlist, was changed $3 {{PLURAL:$3|time|times}}.",
+	"notification-header-watchlist-multiuser-created": "<strong>$1</strong>, a page on {{GENDER:$2|your}} watchlist, was created $3 {{PLURAL:$3|time|times}}.",
+	"notification-header-watchlist-multiuser-deleted": "<strong>$1</strong>, a page on {{GENDER:$2|your}} watchlist, was deleted $3 {{PLURAL:$3|time|times}}.",
+	"notification-header-watchlist-multiuser-moved": "<strong>$1</strong>, a page on {{GENDER:$2|your}} watchlist, was moved $3 {{PLURAL:$3|time|times}}.",
+	"notification-header-watchlist-multiuser-restored": "<strong>$1</strong>, a page on {{GENDER:$2|your}} watchlist, was restored $3 {{PLURAL:$3|time|times}}.",
 	"notification-welcome-link": "",
 	"notification-welcome-linktext": "Welcome",
 	"notification-header-thank-you-1-edit": "{{GENDER:$2|You}} just made {{GENDER:$2|your}} first edit; thank {{GENDER:$2|you}}, and welcome!",
@@ -181,6 +206,7 @@
 	"notification-header-thank-you-10000-edit": "{{GENDER:$2|You}} just made {{GENDER:$2|your}} ten thousandth edit; thank {{GENDER:$2|you}} so very much!",
 	"notification-header-thank-you-100000-edit": "{{GENDER:$2|You}} just made {{GENDER:$2|your}} hundred thousandth edit; thank {{GENDER:$2|you}} for an amazing contribution!",
 	"notification-header-thank-you-1000000-edit": "{{GENDER:$2|You}} just made {{GENDER:$2|your}} millionth edit; thank {{GENDER:$2|you}} for an astonishing contribution!",
+	"notification-header-thank-you-10000000-edit": "{{GENDER:$2|You}} just made {{GENDER:$2|your}} ten millionth edit; thank {{GENDER:$2|you}} for your brilliant dedication!",
 	"notification-link-thank-you-edit": "{{GENDER:$1|Your}} edit",
 	"notification-link-text-view-edit": "View edit",
 	"notification-link-article-reminder": "View page",
@@ -188,12 +214,11 @@
 	"notification-body-reverted": "$1",
 	"notification-header-emailuser": "$1 {{GENDER:$2|sent}} you an email.",
 	"notification-body-emailuser": "$1",
-	"notification-edit-talk-page-email-subject2": "$1 {{GENDER:$1|left}} you a message on {{SITENAME}}",
-	"notification-edit-talk-page-email-batch-body-with-section": "$1 {{GENDER:$1|left}} a message on your talk page in \"$2\".",
-	"notification-page-linked-email-subject": "A page you created was linked on {{SITENAME}}",
-	"notification-reverted-email-subject2": "Your {{PLURAL:$3|edit was|edits were}} {{GENDER:$1|reverted}} on {{SITENAME}}",
-	"notification-mention-email-subject": "$1 {{GENDER:$1|mentioned}} {{GENDER:$2|you}} on {{SITENAME}}",
-	"notification-user-rights-email-subject": "Your user rights have changed on {{SITENAME}}",
+	"notification-edit-talk-page-email-subject2": "$1 {{GENDER:$2|left}} {{GENDER:$3|you}} a message on {{SITENAME}}",
+	"notification-page-linked-email-subject": "A page {{GENDER:$3|you}} created was linked on {{SITENAME}}",
+	"notification-reverted-email-subject2": "{{GENDER:$3|Your}} {{PLURAL:$4|edit was|edits were}} {{GENDER:$2|reverted}} on {{SITENAME}}",
+	"notification-mention-email-subject": "$1 {{GENDER:$2|mentioned}} {{GENDER:$3|you}} on {{SITENAME}}",
+	"notification-user-rights-email-subject": "{{GENDER:$3|Your}} user rights have changed on {{SITENAME}}",
 	"notification-timestamp-ago-seconds": "{{PLURAL:$1|$1s}}",
 	"notification-timestamp-ago-minutes": "{{PLURAL:$1|$1m}}",
 	"notification-timestamp-ago-hours": "{{PLURAL:$1|$1h}}",
@@ -205,9 +230,7 @@
 	"notification-inbox-filter-read": "Read",
 	"notification-inbox-filter-unread": "Unread",
 	"notification-inbox-filter-all": "All",
-	"echo-email-body-default": "You have a new notification at {{SITENAME}}:\n\n$1",
-	"echo-email-footer-default-html": "To control which emails we send you, <a href=\"$2\" style=\"text-decoration:none; color: #3868B0;\">check your preferences</a>.<br />\n$1",
-	"echo-email-footer-default": "$2\n\nTo control which emails we send you, check your preferences:\n{{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}\n\n$1",
+	"echo-specialmute-label-mute-notifications": "Mute notifications from this {{GENDER:$1|user}}",
 	"echo-email-plain-footer": "To control which emails we send {{GENDER:$1|you}}, check {{GENDER:$1|your}} preferences:",
 	"echo-email-html-footer-preference-link-text": "check {{GENDER:$1|your}} preferences",
 	"echo-email-html-footer-with-link": "To control which emails we send {{GENDER:$2|you}}, $1.",
@@ -217,15 +240,13 @@
 	"echo-notification-notice-text-only": "Notices",
 	"echo-overlay-link": "All notifications",
 	"echo-overlay-title": "<b>Notifications</b>",
-	"echo-overlay-title-overflow": "<b>{{PLURAL:$1|Notification|Notifications}}</b> (showing $1 of $2 unread)",
 	"echo-mark-all-as-read": "Mark all as read",
 	"echo-mark-all-as-read-confirmation": "$1 {{PLURAL:$1|notification|notifications}} marked as read",
 	"echo-mark-wiki-as-read": "Mark all as read in selected wiki: $1",
+	"echo-displaysnippet-title": "New notification",
 	"echo-date-today": "Today",
 	"echo-date-yesterday": "Yesterday",
-	"echo-load-more-error": "An error occurred while fetching more results.",
 	"notification-bundle-header-edit-user-talk-v2": "{{PLURAL:$1|One new message|$1 new messages|100=99+ new messages}} on <strong>{{GENDER:$3|your}} talk page</strong>.",
-	"echo-email-batch-separator": "--",
 	"echo-email-batch-bullet": "•",
 	"echo-email-batch-subject-daily": "You have {{PLURAL:$2|a new notification|new notifications}} at {{SITENAME}}",
 	"echo-email-batch-subject-weekly": "You have {{PLURAL:$2|a new notification|new notifications}} at {{SITENAME}} this week",
@@ -237,5 +258,6 @@
 	"notification-header-foreign-all": "More notifications from {{PLURAL:$5|another wiki|$5 other wikis}}",
 	"notification-body-foreign": "$1",
 	"echo-foreign-wiki-lang": "$1 - $2",
-	"echo-badge-count": "{{PLURAL:$1|$1|100=99+}}"
+	"echo-badge-count": "{{PLURAL:$1|$1|100={{formatnum:99}}+}}",
+	"echo-blacklist": ""
 }