From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 16 Jul 2019 16:08:38 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0bb4c2431f4cbaa8c94c0317a343259f596f6dd2;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

0bb4c2431f4cbaa8c94c0317a343259f596f6dd2
diff --cc wcfsetup/install/lang/en.xml
index b7432f1dbc,c9823ad3eb..c064cc4bba
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -270,7 -257,7 +270,7 @@@
  		<item name="wcf.acp.captcha.question.answers"><![CDATA[Answers]]></item>
  		<item name="wcf.acp.captcha.question.answers.description"><![CDATA[Answers beginning and ending with “~” will be interpreted as regular expressions. Enter one answer per line.]]></item>
  		<item name="wcf.acp.captcha.question.answers.error.invalidRegex"><![CDATA[The regular expression “{$invalidRegex}” is invalid.]]></item>
- 		<item name="wcf.acp.captcha.question.delete.confirmMessage"><![CDATA[Do you really want to delete the question “{$question->getQuestion()}”?]]></item>
 -		<item name="wcf.acp.captcha.question.delete.confirmMessage"><![CDATA[Do you really want to delete the question <span class="confirmationObject">{$question->question|language}</span>?]]></item>
++		<item name="wcf.acp.captcha.question.delete.confirmMessage"><![CDATA[Do you really want to delete the question <span class="confirmationObject">{$question->getQuestion()}</span>?]]></item>
  		<item name="wcf.acp.captcha.question.edit"><![CDATA[Edit Captcha Question]]></item>
  		<item name="wcf.acp.captcha.question.isDisabled"><![CDATA[Disable Captcha Question]]></item>
  		<item name="wcf.acp.captcha.question.list"><![CDATA[Captcha Questions]]></item>