Merge branch 'refs/heads/pr/2062'

# Conflicts:
#	wcfsetup/install/lang/en.xml

diff --cc wcfsetup/install/lang/en.xml
index 9927feaf425ed0c10141098f06178fe28c144164,d44f22d5d4dc8c35b5085f2e61f08034123813e6..c44c772e22bcc7c0c6018ba7e444595b40b81685
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -831,7 -829,7 +829,7 @@@ Examples for medium ID detection
                <item name="wcf.acp.option.category.general.system.packageServer"><![CDATA[Update Server]]></item>
                <item name="wcf.acp.option.package_server_auth_code"><![CDATA[Authentication Code]]></item>
                <item name="wcf.acp.option.package_server_auth_code.description"><![CDATA[Your authentication code is available in the customers area on woltlab.com.]]></item>
-               <item name="wcf.acp.option.enable_woltlab_news"><![CDATA[Display WoltLab News]]></item>
 -              <item name="wcf.acp.option.enable_woltlab_news"><![CDATA[Display woltlab news]]></item>
++              <item name="wcf.acp.option.enable_woltlab_news"><![CDATA[Display WoltLab news]]></item>
                <item name="wcf.acp.option.enable_woltlab_news.description"><![CDATA[Displays the current WoltLab News on the Administration Control Panel’s start page.]]></item>
                <item name="wcf.acp.option.category.security.antispam.recaptcha"><![CDATA[reCAPTCHA]]></item>
                <item name="wcf.acp.option.recaptcha_publickey"><![CDATA[Public API Key]]></item>
@@@ -2302,9 -2301,7 +2301,9 @@@ Errors are
                <item name="wcf.like.objectType.com.woltlab.wcf.comment"><![CDATA[Comment]]></item>
                <item name="wcf.like.objectType.com.woltlab.wcf.comment.response"><![CDATA[Comment Reply]]></item>
                <item name="wcf.like.likes.more"><![CDATA[More Likes]]></item>
-               <item name="wcf.like.likes.noMoreEntries"><![CDATA[There are no more likes]]></item>
+               <item name="wcf.like.likes.noMoreEntries"><![CDATA[There are not any new likes at the moment.]]></item>
 +              <item name="wcf.like.dislikes.more"><![CDATA[More Dislikes]]></item>
-               <item name="wcf.like.dislikes.noMoreEntries"><![CDATA[There are no more dislikes]]></item>
++              <item name="wcf.like.dislikes.noMoreEntries"><![CDATA[There are not any new dislikes at the moment.]]></item>
                <item name="wcf.like.title.com.woltlab.wcf.user.profileComment"><![CDATA[{if $like->isDislike()}Dislikes{else}Likes{/if} the comment by {if $commentAuthor}<a href="{link controller='User' object=$commentAuthor}{/link}">{$commentAuthor->username}</a>{else}a guest{/if} on <a href="{link controller='User' object=$user}#wall{/link}">{$user->username}’s wall</a>.]]></item>
                <item name="wcf.like.title.com.woltlab.wcf.user.profileComment.response"><![CDATA[{if $like->isDislike()}Dislikes{else}Likes{/if} the response by {if $responseAuthor}<a href="{link controller='User' object=$responseAuthor}{/link}">{$responseAuthor->username}</a>{else}a guest{/if} on the comment by {if $commentAuthor}<a href="{link controller='User' object=$commentAuthor}{/link}">{$commentAuthor->username}</a>{else}a guest{/if} on <a href="{link controller='User' object=$user}#wall{/link}">{$user->username}’s wall</a>.]]></item>
        </category>