From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 17 Aug 2019 11:17:09 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Beta_1~16^2~7^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3328f54b53c6f312645750995cffca8baafac0aa;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

3328f54b53c6f312645750995cffca8baafac0aa
diff --cc wcfsetup/install/lang/en.xml
index dba55ec74e,c2eb596a91..06aae8cfa3
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -1198,10 -958,10 +1198,10 @@@ This protocol file contains {$data[coun
  		<item name="wcf.acp.notice.example"><![CDATA[Example text of a notice]]></item>
  		<item name="wcf.acp.notice.isDisabled"><![CDATA[Disable notice]]></item>
  		<item name="wcf.acp.notice.isDismissible"><![CDATA[User can dismiss notice]]></item>
- 		<item name="wcf.acp.notice.isDismissible.description"><![CDATA[If a user dismisses a notice, it will not display for them again.]]></item>
+ 		<item name="wcf.acp.notice.isDismissible.description"><![CDATA[If a user dismisses a notice, it will not be displayed for them again.]]></item>
  		<item name="wcf.acp.notice.list"><![CDATA[Notices]]></item>
  		<item name="wcf.acp.notice.notice"><![CDATA[Notice]]></item>
 -		<item name="wcf.acp.notice.notice.description"><![CDATA[<code>{literal}{$username}{/literal}</code> will be replaced by the name and <code>{literal}{$email}{/literal}</code> by the mail address of the active user.]]></item>
 +		<item name="wcf.acp.notice.notice.description"><![CDATA[<kbd>{literal}{$username}{/literal}</kbd> will be replaced by the name and <kbd>{literal}{$email}{/literal}</kbd> by the mail address of the active user.]]></item>
  		<item name="wcf.acp.notice.noticeUseHtml"><![CDATA[Enable HTML code in notice]]></item>
  		<item name="wcf.acp.notice.resetIsDismissed"><![CDATA[Dismissed notices will be displayed again.]]></item>
  		<item name="wcf.acp.notice.resetIsDismissed.description"><![CDATA[The notice will be displayed again to users who dismissed the previous version. Guests who dismissed the notice will only view it in a new session.]]></item>