From: Alexander Ebert Date: Wed, 13 Apr 2016 18:08:41 +0000 (+0200) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' into next X-Git-Tag: 3.0.0_Beta_1~1905 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93f6cd681cb2f507fca7cb105369b66bca846786;p=GitHub%2FWoltLab%2FWCF.git Merge remote-tracking branch 'refs/remotes/origin/master' into next # Conflicts: # com.woltlab.wcf/templates/wysiwyg.tpl # wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js # wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js # wcfsetup/install/files/js/WCF.Combined.min.js # wcfsetup/install/files/style/redactor.less # wcfsetup/install/lang/en.xml --- 93f6cd681cb2f507fca7cb105369b66bca846786 diff --cc wcfsetup/install/lang/en.xml index ee39813a9e,03bbee5863..19fb4674ca --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@@ -293,10 -300,8 +293,10 @@@ Examples for medium ID detection - + - + + + @@@ -680,15 -684,13 +680,15 @@@ - + - + - + + + @@@ -762,31 -757,35 +762,32 @@@ - - - - - - - - + + + - + - + - + - + + + + + + - - - + @@@ -941,18 -943,18 +942,18 @@@ - + - - + + - + - + - - + + @@@ -1273,27 -1294,17 +1274,27 @@@ GmbH=Gesellschaft mit beschränkter Haf - + - + - + - + - + + + + + + + + + + + @@@ -2498,32 -2404,8 +2501,32 @@@ Errors are + userID}a guest{else}{@$author->username}{/if} wrote a comment on the report "{$moderationQueue->getTitle()}": +{if $notificationType == 'instant'} +--------------------------------- +{@$comment->message} +--------------------------------- +{/if}{$moderationQueue->getLink()}#comments]]> + username}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->username}{if $count == 3} and {@$authors[2]->username}{/if}{/if}{else}{@$authors[0]->username} and {#$others} other users{/if} wrote comments on the report "{$moderationQueue->getTitle()}": +{$moderationQueue->getLink()}#comments]]> + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on {$moderationQueue->getTitle()} waiting for approval.]]> + getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} wrote comments on the report {$moderationQueue->getTitle()}.]]> + + + userID}a guest{else}{@$author->username}{/if} wrote a reply to {@$commentAuthor->username}’s comment on the report "{$moderationQueue->getTitle()}": +{if $notificationType == 'instant'} +--------------------------------- +{@$response->message} +--------------------------------- +{/if}{$moderationQueue->getLink()}#comments]]> + username}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->username}{if $count == 3} and {@$authors[2]->username}{/if}{/if}{else}{@$authors[0]->username} and {#$others} other users{/if} wrote replies to comments on the report "{$moderationQueue->getTitle()}": +{$moderationQueue->getLink()}#comments]]> + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a reply to a comment by {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} on the report {$moderationQueue->getTitle()}.]]> + getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} and{/if} {#$others} other users{/if} wrote replies to comments on the report {$moderationQueue->getTitle()}.]]> + + - +