Unify 'Watched' Vs 'Subscribed'

diff --git a/com.woltlab.wcf/menuItem.xml b/com.woltlab.wcf/menuItem.xml
index 99b84d3e7e7083bc55bf3e2a0c4d9f1f1e0fc0ba..2e416620e54339ddb99d378fdefba20e9113d010 100644 (file)
--- a/com.woltlab.wcf/menuItem.xml
+++ b/com.woltlab.wcf/menuItem.xml
@@ -22,7 +22,7 @@
                <item identifier="com.woltlab.wcf.WatchedArticleList">
                        <parent>com.woltlab.wcf.ArticleList</parent>
                        <title language="de">Abonnierte Artikel</title>
-                       <title language="en">Watched Articles</title>
+                       <title language="en">Subscribed Articles</title>
                        <page>com.woltlab.wcf.WatchedArticleList</page>
                </item>
                <item identifier="com.woltlab.wcf.MembersList">

diff --git a/com.woltlab.wcf/page.xml b/com.woltlab.wcf/page.xml
index 66bcb70c464d28d50abf5d2bdf95de15a92b8efa..b8692bac158f3ce30a4f106324feaaebae883fae 100644 (file)
--- a/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@ -569,12 +569,12 @@
                        <pageType>system</pageType>
                        <controller>wcf\page\WatchedArticleListPage</controller>
                        <name language="de">Abonnierte Artikel</name>
-                       <name language="en">Watched Articles</name>
+                       <name language="en">Subscribed Articles</name>
                        <handler>wcf\system\page\handler\WatchedArticleListPageHandler</handler>
                        <parent>com.woltlab.wcf.ArticleList</parent>
                        <options>module_article</options>
                        <content language="en">
-                               <title>Watched Articles</title>
+                               <title>Subscribed Articles</title>
                        </content>
                        <content language="de">
                                <title>Abonnierte Artikel</title>

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a7d6da3067ab8315c10a35696cd2bc6bb530f44e..45df83b1d32f7a09456e616d18bc2e6f96a9f83f 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -5488,9 +5488,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <category name="wcf.user.objectWatch">
                <item name="wcf.user.objectWatch.button.subscribe"><![CDATA[Abonnieren]]></item>
                <item name="wcf.user.objectWatch.manageSubscription"><![CDATA[Abonnement verwalten]]></item>
-               <item name="wcf.user.objectWatch.subscribe.com.woltlab.wcf.article.category"><![CDATA[Kategorie abonnieren]]></item>
-               <item name="wcf.user.objectWatch.enableNotification.com.woltlab.wcf.article.category"><![CDATA[Benachrichtigung über neue Artikel aus dieser Kategorie aktivieren]]></item>
-               <item name="wcf.user.objectWatch.unsubscribe.com.woltlab.wcf.article.category"><![CDATA[Kategorie nicht abonnieren]]></item>
                <item name="wcf.user.objectWatch.button.subscribed"><![CDATA[Abonniert]]></item>
                <item name="wcf.user.objectWatch.notSubscribed"><![CDATA[Nicht abonniert]]></item>
                <item name="wcf.user.objectWatch.notSubscribed.description"><![CDATA[Erhalte{if !LANGUAGE_USE_INFORMAL_VARIANT}n Sie{/if} Benachrichtigungen für Erwähnungen, Zitate und Reaktionen.]]></item>
@@ -7560,5 +7557,8 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <item name="wcf.comment.response.add"/>
        <item name="wcf.dialog.confirmation.softDelete.reason"/>
        <item name="wcf.dialog.confirmation.reason"/>
+       <item name="wcf.user.objectWatch.subscribe.com.woltlab.wcf.article.category"/>
+       <item name="wcf.user.objectWatch.enableNotification.com.woltlab.wcf.article.category"/>
+       <item name="wcf.user.objectWatch.unsubscribe.com.woltlab.wcf.article.category"/>
 </delete>
 </language>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 4303defdb5d999ec166e0c7b314e6ea8250496d7..7fa2d38e7f0e9a4d02c1bd5093038f4cb830812c 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2189,7 +2189,7 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
                <item name="wcf.acp.pip.objectType.definitionName.com.woltlab.wcf.statDailyHandler.description"><![CDATA[This object type definition is used to register types of statistics entries shown in the ACP statistics.]]></item>
                <item name="wcf.acp.pip.objectType.definitionName.com.woltlab.wcf.tagging.taggableObject.description"><![CDATA[This object type definition is used to register types of objects that can be tagged.]]></item>
                <item name="wcf.acp.pip.objectType.definitionName.com.woltlab.wcf.user.activityPointEvent.description"><![CDATA[This object type definition is used to register events for which users are awarded activity points.]]></item>
-               <item name="wcf.acp.pip.objectType.definitionName.com.woltlab.wcf.user.objectWatch.description"><![CDATA[This object type definition is used to register types of objects that can be watched/subscribed to resulting in notifications for updates of the watched/subscribed objects.]]></item>
+               <item name="wcf.acp.pip.objectType.definitionName.com.woltlab.wcf.user.objectWatch.description"><![CDATA[This object type definition is used to register types of objects that can be subscribed to resulting in notifications for updates of the subscribed objects.]]></item>
                <item name="wcf.acp.pip.objectType.definitionName.com.woltlab.wcf.user.recentActivityEvent.description"><![CDATA[This object type definition is used to register events for which a recent activity entry can be created.]]></item>
                <item name="wcf.acp.pip.objectType.definitionName.com.woltlab.wcf.versionTracker.objectType.description"><![CDATA[This object type definition is used to register types of objects of which different versions can be tracked using the version tracker API.]]></item>
                <item name="wcf.acp.pip.objectType.definitionName.com.woltlab.wcf.visitTracker.objectType.description"><![CDATA[This object type definition is used to register types of objects for which it can be tracked if and when users have already seen or accessed them (the last time).]]></item>
@@ -5446,7 +5446,7 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
                <item name="wcf.user.notification.articleComment.responseOwner.message.stacked"><![CDATA[{@'wcf.user.notification.stacked.authorList'|language} replied to a comment by <strong>{$commentAuthor}</strong> on your article <strong>{$article->getTitle()}</strong>.]]></item>
                <item name="wcf.user.notification.articleComment.responseOwner.mail.plaintext"><![CDATA[{@$authorList} replied to {@$commentAuthor}’s comment on your article “{@$article->getTitle()}” [URL:{@$article->getLink()}#comments/comment{@$commentID}/response{@$responseID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]></item>
                <item name="wcf.user.notification.articleComment.responseOwner.mail.html"><![CDATA[<p>{@$authorList} replied to <strong>{$commentAuthor}</strong>’s comment on your article <a href="{$article->getLink()}#comments/comment{@$commentID}/response{@$responseID}">{$article->getTitle()}</a>:</p>]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.article.notification.article"><![CDATA[Notify me of new articles in watched categories]]></item>
+               <item name="wcf.user.notification.com.woltlab.wcf.article.notification.article"><![CDATA[Notify me of new articles in subscribed categories]]></item>
                <item name="wcf.user.notification.article.title"><![CDATA[New Article]]></item>
                <item name="wcf.user.notification.article.message"><![CDATA[{if $author->userID}<strong>{$author}</strong>{else}A guest{/if} wrote the article <strong>{$article->getTitle()}</strong>.]]></item>
                <item name="wcf.user.notification.article.mail.plaintext"><![CDATA[{@$author} wrote the article “{@$articleContent->getTitle()}” [URL:{@$articleContent->getLink()}]:]]></item>
@@ -5493,9 +5493,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
        <category name="wcf.user.objectWatch">
                <item name="wcf.user.objectWatch.button.subscribe"><![CDATA[Subscribe]]></item>
                <item name="wcf.user.objectWatch.manageSubscription"><![CDATA[Manage Subscription]]></item>
-               <item name="wcf.user.objectWatch.subscribe.com.woltlab.wcf.article.category"><![CDATA[Watch this category]]></item>
-               <item name="wcf.user.objectWatch.enableNotification.com.woltlab.wcf.article.category"><![CDATA[Notify me of new articles.]]></item>
-               <item name="wcf.user.objectWatch.unsubscribe.com.woltlab.wcf.article.category"><![CDATA[Unwatch this category]]></item>
                <item name="wcf.user.objectWatch.button.subscribed"><![CDATA[Subscribed]]></item>
                <item name="wcf.user.objectWatch.notSubscribed"><![CDATA[Not subscribed]]></item>
                <item name="wcf.user.objectWatch.notSubscribed.description"><![CDATA[Receive notifications for mentions, quotes and reactions.]]></item>
@@ -7454,5 +7451,8 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
        <item name="wcf.comment.response.add"/>
        <item name="wcf.dialog.confirmation.softDelete.reason"/>
        <item name="wcf.dialog.confirmation.reason"/>
+       <item name="wcf.user.objectWatch.subscribe.com.woltlab.wcf.article.category"/>
+       <item name="wcf.user.objectWatch.enableNotification.com.woltlab.wcf.article.category"/>
+       <item name="wcf.user.objectWatch.unsubscribe.com.woltlab.wcf.article.category"/>
 </delete>
 </language>