Merge branch 'master' into next

diff --cc wcfsetup/install/lang/en.xml
index b7432f1dbc4663a4555a1bae01f5f2aac0155133,c9823ad3eb4ec188fb18a156face2e8006af208e..c064cc4bba100a7ca2ec6cd258673ac81fa3bf68
--- 1/wcfsetup/install/lang/en.xml
--- 2/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>