From: Alexander Ebert Date: Wed, 5 Oct 2016 15:17:23 +0000 (+0200) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' into next X-Git-Tag: 3.0.0_Beta_3~50^2~84 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=103afeef3cf09b4fab1bbb9256bb1e141483cb44;p=GitHub%2FWoltLab%2FWCF.git Merge remote-tracking branch 'refs/remotes/origin/master' into next # Conflicts: # wcfsetup/install/lang/en.xml --- 103afeef3cf09b4fab1bbb9256bb1e141483cb44 diff --cc wcfsetup/install/lang/en.xml index f9edc233e5,c44c772e22..658ea9aa8a --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@@ -45,50 -39,29 +45,50 @@@ - - + - - + - ++ - - + + - getName()}”.]]> - - - packageID}{/link}">{$application->getPackage()->getName()}”]]> - + getName()}”.]]> + + + packageID}{/link}">{$application->getPackage()->getName()}”]]> + - - - getPackage()->getName()}” as the primary application?]]> + + + + + + + + + + + {$article->getTitle()}?]]> + + + + + + + + + + + + + + @@@ -102,14 -75,16 +102,14 @@@ - + - + - - + - ++ @@@ -124,21 -97,19 +124,19 @@@ - title}”?]]> + {$mediaProvider->title}?]]> - - Example:
- {$ID} will be replaced with the medium ID as shown above.{/literal}]]> + {$ID} will be replaced with the medium ID as shown above.{/literal}]]> - getPath()}acp/dereferrer.php?url=http%3A%2F%2Fen.wikipedia.org%2Fwiki%2FRegular_expression">regular expression. One expression per line.
+ getPath()}acp/dereferrer.php?url=http%3A%2F%2Fen.wikipedia.org%2Fwiki%2FRegular_expression">regular expression. Enter one expression per line. Examples for medium ID detection: -
    +
    • (?<ID>[0-9]+) detects a numeric ID.
      • -
    • (?<ID>[0-9a-zA-Z]+) detects an alphanumeric ID
      • +
    • (?<ID>[0-9a-zA-Z]+) detects an alphanumeric ID.
    ]]> - - ++ @@@ -237,9 -140,9 +235,9 @@@ - - - {$question->question|language}?]]> + - ++ + question|language}”?]]> @@@ -284,16 -187,22 +282,16 @@@ - + - - - - - - - - + + - + - + @@@ -307,9 -216,9 +305,8 @@@ -- {$exception->getMessage()}
    {$exception->getErrorDesc()}    ]]>     - -
    {$exception->getMessage()}
    {$exception->getErrorDesc()}    ]]> ++ {$exception->getMessage()}
    {$exception->getErrorDesc()}    ]]>     + @@@ -326,11 -235,11 +323,11 @@@ - delete the mappings. It is strongly recommended to keep these mappings as long as there is still data to be imported now or in the future.]]> + delete the mappings. It is strongly recommended to keep these mappings as long as there is still data to be imported now or in the future.]]> - + - +     @@@ -354,10 -261,10 +351,10 @@@ - groupName|language}”?]]> + {$group->groupName|language}?]]> - + @@@ -365,22 -272,22 +362,22 @@@ - + - + - + - - - - - - - + + + + + + + - + @@@ -436,35 -343,43 +433,35 @@@ - - - - - - + + cannot be used by the users of this user group.]]> - - + + - - - + + - - - - - - - - + + + + + + + + - - - - - + + cannot be used in the signature.]]> - - - <strong>%s</strong> results in a bolder appearance.]]> + + + <strong>%s</strong> results in a bolder appearance.]]> - + @@@ -500,10 -415,10 +497,10 @@@ - + - title}”?]]> + {$assignment->title}?]]> - + @@@ -514,11 -429,11 +511,11 @@@ - + {$group->groupName|language}?]]> - + - + @@@ -584,27 -473,24 +581,27 @@@ - - ++ - + {$label}?]]> add a label group before creating labels.]]> - groupName|language}”?]]> + {$group->groupName|language}?]]> - - ++ - + - + + + + @@@ -652,9 -538,9 +649,9 @@@ {@$relativeWcfDir}acp/masterPassword.inc.php.]]> - {@$relativeWcfDir}acp/masterPassword.inc.php.]]> - - - {@$relativeWcfDir}acp/masterPassword.inc.php.]]> ++ {@$relativeWcfDir}acp/masterPassword.inc.php.]]> + + @@@ -792,9 -653,9 +789,9 @@@ - + CSS class name.]]> - + @@@ -804,9 -665,9 +801,9 @@@ - - + + - noticeName}”?]]> + {$notice->noticeName}?]]> @@@ -818,26 -678,24 +815,26 @@@ - - + - + - + - + - + - + + + - + + @@@ -896,8 -745,13 +893,8 @@@ maxvalue !== null} of {#$option->maxvalue}{/if}.]]> minvalue !== null} of {#$option->minvalue}{/if}.]]> - - - - + - - getPath()}acp/dereferrer.php?url={'http://en.wikipedia.org/wiki/Clickjacking'|rawurlencode}" class="externalURL">“X-Frame-Options” header to prevent 3rd party sites from embedding this site in a frame (sends “SAMEORIGIN”).]]> @@@ -944,15 -801,16 +941,15 @@@ - - - - - - - - + + + + + + + @@@ -1029,9 -897,13 +1028,9 @@@ - - - - - + @@@ -1086,17 -960,22 +1085,17 @@@ - + - + - - - - + + - + - - - @@@ -1121,11 -998,18 +1120,12 @@@ - - Examples:
    - WBB=WoltLab Burning Board
    - GmbH=Gesellschaft mit beschränkter Haftung]]>     - + +
  • “WBB=WoltLab Burning Board”
    • +
  • “GmbH=Gesellschaft mit beschränkter Haftung”
    • -
]]> - - -
  • “board-list=forums”, the link “http://example.com/index.php?board-list/” will turn into “http://example.com/index.php?forums/”
    • -
  • “members-list=profiles”, the link “http://example.com/index.php?members-list/” will turn into “http://example.com/index.php?profiles/”
    • + ]]>     + @@@ -1144,17 -1028,22 +1144,14 @@@ - - + - - + - - - Please read the following article for instructions: Setting up user friendly URLs]]> - - + getPath()}acp/dereferrer.php?url=https%3A%2F%2Fblog.woltlab.com%2Fentry%2F67-setting-up-user-friendly-urls%2F" class="externalURL">Setting up user friendly URLs. Enabling this option will rewrite URLs into a better readable representation. Examples:
      -
    • WCF 2.0: “index.php/Thread/123-Title/”
      • -
    • WCF 2.1+: “index.php?thread/123-title/”
      • +
    • the link “http://example.com/index.php?thread/1-hello-i-am-john-doe/” will turn into “http://example.com/thread/1-hello-i-am-john-doe/”
      • +
    • the link “http://example.com/index.php?members-list/” will turn into “http://example.com/members-list/”
      • -
    ]]>     - - -
  • WCF 2.0: “index.php/Thread/123-Title/”
    • -
  • WCF 2.1+: “index.php?thread/123-title/”
    • ]]>     advertisement management.]]> @@@ -1378,8 -1233,9 +1375,8 @@@ - - + - + @@@ -1397,10 -1253,39 +1394,10 @@@ - title|language}” for the user “{$subscriptionUser->username}”?]]> + {$subscriptionUser->title|language} for the user {$subscriptionUser->username}?]]> - + - title|language}”?]]> -     - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {$subscription->title|language}?]]> @@@ -1509,7 -1379,7 +1506,7 @@@ - - ++ @@@ -1537,19 -1407,18 +1534,19 @@@ - - ++ - getPath()}”.]]> + getPath()}”.]]> - + + - + @@@ -1557,16 -1426,14 +1554,16 @@@ - - CSS. Furthermore, you can use LESS including all Mixins provided by Community Framework.]]> - - - - - - + + - ++ CSS. Furthermore, you can use SCSS including all Mixins provided by WoltLab Suite Core.]]> + + + - - - - ++ ++ ++ ++ @@@ -1629,13 -1497,8 +1626,13 @@@ - - - ++ + + disable this protection.]]> + +
    It is neither recommended nor necessary to remove the protection in most cases, styles can still be fully customized while preserving the preset declarations.

    Please save any unsaved changes before proceeding.]]>     + + @@@ -1725,9 -1574,9 +1722,9 @@@ - username}”?]]> + {$user->username}?]]> - + Character Separated Values)]]> @@@ -1747,9 -1596,15 +1744,9 @@@ - + - - - - - - @@@ -1784,17 -1642,16 +1781,17 @@@ You can define the default sender in - + - optionName}{/lang}”?]]> + {lang}wcf.user.option.{$option->optionName}{/lang}?]]> + - + @@@ -1828,9 -1686,10 +1825,9 @@@ CSS class name.]]> - - ++ - rankTitle|language}”?]]> + {$userRank->rankTitle|language}?]]> @@@ -1885,31 -1733,15 +1882,30 @@@ the lost password form - + getUser()->username},]]> + your account on the website: {PAGE_TITLE|language} has been approved +by an administrator. You are now able to use your user account to it’s full extend.

    ]]> + getUser()->username}, + +your account on the website: {@PAGE_TITLE|language} [URL:{link isEmail=true}{/link}] has been approved +by an administrator. You are now able to use your user account to it’s +full extend.]]> - + - + + + + + + + + + +     @@@ -1953,13 -1764,13 +1949,13 @@@ - - + + - - - getMaxCount()}
    - Maximum file size: {@$attachmentHandler->getMaxSize()|filesize}
    ++ + + - getMaxCount()}
    -Maximum file size: {@$attachmentHandler->getMaxSize()|filesize}
    ++ getMaxCount()}
    Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensions()}]]>     @@@ -2035,10 -1868,11 +2031,10 @@@ - + - - - ++ + - @@@ -2070,16 -1902,7 +2064,16 @@@ Errors are + + + + + + + + + - + @@@ -2111,14 -1931,39 +2105,14 @@@ - - + + - - + + - - - - - - - - - - - - - - - - - - activityPoints} Point{if $activeMember->activityPoints != 1}s{/if}]]> - - - likesReceived} Like{if $likedMember->likesReceived != 1}s{/if}]]> - - - - - - - + + + @@@ -2539,8 -2275,8 +2530,8 @@@ - + - + @@@ -2565,15 -2301,11 +2556,15 @@@ - + - + isDislike()}Dislikes{else}Likes{/if} the comment by {if $commentAuthor}{$commentAuthor->username}{else}a guest{/if} on {$user->username}’s wall.]]> isDislike()}Dislikes{else}Likes{/if} the response by {if $responseAuthor}{$responseAuthor->username}{else}a guest{/if} on the comment by {if $commentAuthor}{$commentAuthor->username}{else}a guest{/if} on {$user->username}’s wall.]]> + + isDislike()}Dislikes{else}Likes{/if} the article {$article->getTitle()}.]]> + isDislike()}Dislikes{else}Likes{/if} the comment by {if $commentAuthor}{$commentAuthor->username}{else}a guest{/if} on the article {$articleContent->getTitle()}.]]> + isDislike()}Dislikes{else}Likes{/if} the response by {if $responseAuthor}{$responseAuthor->username}{else}a guest{/if} on the comment by {if $commentAuthor}{$commentAuthor->username}{else}a guest{/if} on the blog article {$articleContent->getTitle()}.]]> @@@ -2651,22 -2360,10 +2642,22 @@@ - 1} ({#$number}×){/if}{/implode}.]]> - - - + 1} ({#$number}×){/if}{/implode}.]]> + + + + + + + + + + + + + + + @@@ -2684,19 -2381,7 +2675,19 @@@ - + + + + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on the moderation entry {$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()} and {#$others} other users{/if} wrote comments on the moderation entry {$moderationQueue->getTitle()}.]]> + getTitle()} [URL:{$notificationContent[variables][moderationQueue]->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> + {@$authorList} wrote {if $count == 1 && !$guestTimesTriggered}a comment{else}comments{/if} on the moderation entry {$notificationContent[variables][moderationQueue]->getTitle()}:

    ]]>     + + + 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 moderation entry {$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()} and {#$others} other users{/if} wrote replies to comments on the moderation entry {$moderationQueue->getTitle()}.]]> + username}’s{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on the moderation entry {$notificationContent[variables][moderationQueue]->getTitle()} [URL:{$notificationContent[variables][moderationQueue]->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> + {@$authorList} wrote {if $count == 1 && !$guestTimesTriggered}a reply{else}replies{/if} to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}’s comment on the moderation entry {$notificationContent[variables][moderationQueue]->getTitle()}:

    ]]>     @@@ -2750,21 -2423,9 +2741,21 @@@ + + + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment 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()} and {#$others} other users{/if} wrote comments on the report {$moderationQueue->getTitle()}.]]> + getTitle()} [URL:{$notificationContent[variables][moderationQueue]->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> + {@$authorList} wrote {if $count == 1 && !$guestTimesTriggered}a comment{else}comments{/if} on the report {$notificationContent[variables][moderationQueue]->getTitle()}:

    ]]>     + + + 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()}.]]> + username}’s{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on the report {$notificationContent[variables][moderationQueue]->getTitle()} [URL:{$notificationContent[variables][moderationQueue]->getLink()}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> + {@$authorList} wrote {if $count == 1 && !$guestTimesTriggered}a reply{else}replies{/if} to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}’s comment on the report {$notificationContent[variables][moderationQueue]->getTitle()}:

    ]]>     - + - + @@@ -2885,16 -2627,16 +2876,16 @@@ - - - maxVotes} options.]]> + - ++ + maxVotes} options.]]> - + - - + + - + votes} vote{if $poll->votes != 1}s{/if}]]> endTime|plainTime}]]> @@@ -2944,11 -2686,9 +2935,11 @@@ - + + + name}”]]> @@@ -2981,19 -2717,19 +2972,19 @@@ - - - + + - ++ user->username}]]> - - 1} ({#$number}×){/if}{/implode}.]]> + + 1} ({#$number}×){/if}{/implode}.]]> - user->banExpires != 0} until {@$__wcf->user->banExpires|plainTime}{/if}{if $__wcf->user->banReason}: {@$__wcf->user->banReason|htmlspecialchars|nl2br}{else}.{/if}]]> + user->banExpires != 0} until {@$__wcf->user->banExpires|plainTime}{/if}{if $__wcf->user->banReason}: {@$__wcf->user->banReason|newlineToBreak}{else}.{/if}]]> - + @@@ -3035,34 -2772,32 +3026,34 @@@ - + getUser()->username}, + +you (or someone else) claimed to have lost the password for the user account {@$mailbox->getUser()->username} on +the website {@PAGE_TITLE|language} [URL:{link isEmail=true}{/link}]. You can change your password after clicking +the following link: + + {link controller='NewPassword' object=$mailbox->getUser() isEmail=true}k={@$mailbox->getUser()->lostPasswordKey}{/link} {* this line ends with a space *} + +If you don’t want to change your password you can simply wait. The request will expire at {$mailbox->getUser()->lastLostPasswordRequestTime+86400|plainTime}.]]> + getUser()->username},]]> + you (or someone else) claimed to have lost the password for the user account {@$mailbox->getUser()->username} on +the website {@PAGE_TITLE|language}.

    ]]>     + + If you don’t want to change your password you can simply wait. The request will expire at {$mailbox->getUser()->lastLostPasswordRequestTime+86400|plainTime}.

    ]]>     - - ++ + + username}”.]]> + username}” has been changed successfully. You may now login with your new password.]]> - + - - - - + current password!]]> - - getUser()->lastUsernameChange}Last change was {@$__wcf->getUser()->lastUsernameChange|date}.{/if}]]> @@@ -3081,47 -2816,42 +3072,47 @@@ *}{if REGISTER_PASSWORD_MUST_CONTAIN_UPPER_CASE}{if REGISTER_PASSWORD_MUST_CONTAIN_LOWER_CASE}{if REGISTER_PASSWORD_MUST_CONTAIN_DIGIT || REGISTER_PASSWORD_MUST_CONTAIN_SPECIAL_CHAR},{else} and{/if} {/if}upper-case letters{/if}{* *}{if REGISTER_PASSWORD_MUST_CONTAIN_DIGIT}{if REGISTER_PASSWORD_MUST_CONTAIN_LOWER_CASE || REGISTER_PASSWORD_MUST_CONTAIN_UPPER_CASE}{if REGISTER_PASSWORD_MUST_CONTAIN_SPECIAL_CHAR},{else} and{/if} {/if}digits{/if}{* *}{if REGISTER_PASSWORD_MUST_CONTAIN_SPECIAL_CHAR}{if REGISTER_PASSWORD_MUST_CONTAIN_LOWER_CASE || REGISTER_PASSWORD_MUST_CONTAIN_UPPER_CASE || REGISTER_PASSWORD_MUST_CONTAIN_DIGIT} and {/if}special chars{/if}{/if}.]]>     - - - + + - - ++ + getUser()->username},]]> + you’ve changed your email address on: {PAGE_TITLE|language}. To complete +this change it is required to confirm your new email address once:

    ]]>     + + Your activation code is: {$mailbox->getUser()->reactivationCode}.

    +

    If you have troubles confirming your email address, please contact the administrator at: +{MAIL_ADMIN_ADDRESS}. Please ignore this email if +you did not register an account with us.

    ]]>     + getUser()->username}, + +you’ve changed your email address on: {@PAGE_TITLE|language} [URL:{link isEmail=true}{/link}]. To complete +this change it is required to confirm your new email address once: + + {link controller='EmailActivation' isEmail=true}u={@$mailbox->getUser()->userID}&a={@$mailbox->getUser()->reactivationCode}{/link} {* this line ends with a space *} + +Your activation code is: {@$mailbox->getUser()->reactivationCode} {* this line ends with a space *} + +If you have troubles confirming your email address, please contect the +administrator at: {@MAIL_ADMIN_ADDRESS}. Please ignore this email if you did +not register with us.]]> - + - - + + - + - - - - - user->email}”.]]> - getSession()->getPermission('user.profile.renamePeriod')} day.]]> + + + + + user->email}”.]]> + getSession()->getPermission('user.profile.renamePeriod')} day.]]> - user->disableSignatureReason}: {$__wcf->user->disableSignatureReason}{else}.{/if}]]> @@@ -3130,14 -2860,18 +3121,14 @@@ - - - - + - + - - - + + + - @@@ -3267,10 -2979,10 +3258,10 @@@ Open the link below to access the user

    Limitation of liability for external links

    Our website contains links to the websites of third parties (“external links”). As the content of these websites is not under our control, we cannot assume any liability for such external content. In all cases, the provider of information of the linked websites is liable for the content and accuracy of the information provided. At the point in time when the links were placed, no infringements of the law were recognisable to us. As soon as an infringement of the law becomes known to us, we will immediately remove the link in question.

    Copyright

    -

    The content and works published on this website are governed by the copyright laws of Germany. Any duplication, processing, distribution or any form of utilisation beyond the scope of copyright law shall require the prior written consent of the author or authors in question.

    +

    The content and works published on this website are governed by the copyright laws of of the country this site is hosted from. Any duplication, processing, distribution or any form of utilisation beyond the scope of copyright law shall require the prior written consent of the author or authors in question.

    Data protection

    -

    A visit to our website can result in the storage on our server of information about the access (date, time, page accessed). This does not represent any analysis of personal data (e.g., name, address or e-mail address). If personal data are collected, this only occurs – to the extent possible – with the prior consent of the user of the website. Any forwarding of the data to third parties without the express consent of the user shall not take place.

    -

    We would like to expressly point out that the transmission of data via the Internet (e.g., by e-mail) can offer security vulnerabilities. It is therefore impossible to safeguard the data completely against access by third parties. We cannot assume any liability for damages arising as a result of such security vulnerabilities.

    +

    A visit to our website can result in the storage on our server of information about the access (date, time, page accessed). This does not represent any analysis of personal data (e.g., name, address or email address). If personal data are collected, this only occurs – to the extent possible – with the prior consent of the user of the website. Any forwarding of the data to third parties without the express consent of the user shall not take place.

    +

    We would like to expressly point out that the transmission of data via the Internet (e.g., by email) can offer security vulnerabilities. It is therefore impossible to safeguard the data completely against access by third parties. We cannot assume any liability for damages arising as a result of such security vulnerabilities.

    The use by third parties of all published contact details for the purpose of advertising is expressly excluded. We reserve the right to take legal steps in the case of the unsolicited sending of advertising information; e.g., by means of spam mail.

    Source: Mustervorlage.net

    ]]>         @@@ -3322,8 -3041,8 +3313,8 @@@ -  GitHub.]]> - session->getVar('__githubUsername')} “{$__wcf->session->getVar('__githubUsername')}”{/if}]]> -  GitHub.]]> ++  GitHub.]]> + session->getVar('__githubUsername')} “{$__wcf->session->getVar('__githubUsername')}”{/if}.]]> @@@ -3331,8 -3050,8 +3322,8 @@@ -  Twitter.]]> - session->getVar('__twitterUsername')} “{$__wcf->session->getVar('__twitterUsername')}”{/if}]]> -  Twitter.]]> ++  Twitter.]]> + session->getVar('__twitterUsername')} “{$__wcf->session->getVar('__twitterUsername')}”{/if}.]]> @@@ -3340,8 -3059,8 +3331,8 @@@ -  Facebook.]]> - session->getVar('__facebookUsername')} “{$__wcf->session->getVar('__facebookUsername')}”{/if}]]> -  Facebook.]]> ++  Facebook.]]> + session->getVar('__facebookUsername')} “{$__wcf->session->getVar('__facebookUsername')}”{/if}.]]> @@@ -3349,8 -3068,8 +3340,8 @@@ -  Google.]]> - session->getVar('__googleUsername')} “{$__wcf->session->getVar('__googleUsername')}”{/if}]]> -  Google.]]> ++  Google.]]> + session->getVar('__googleUsername')} “{$__wcf->session->getVar('__googleUsername')}”{/if}.]]> @@@ -3414,73 -3137,40 +3405,73 @@@ - - + + + + + + + + + + + + + + getUser()->username},]]> + eventID}&userID={@$mailbox->getUser()->userID}&token={@$mailbox->getUser()->notificationMailToken}{/link}]]> + Dear {$mailbox->getUser()->username},]]> + This is an automatic notification, please do not reply to this email!

    + +

    Visit your notification settings to configure +your notifications on {PAGE_TITLE|language} as you wish.

    + +

    You can disable only this type of notification as well.

    ]]>     + + getUser()->username}, + +you currently have got {#$notifications|count} unread notifications that are older than 24 hours:]]> + $maximum}Visit your notification list [URL:{link controller='NotificationList' isEmail=true}{/link}] to view the remaining {#$remaining} notifications. + +{/if}This is an automatic notification, PLEASE DO NOT REPLY TO THIS EMAIL! + +Visit your notification settings [URL:{link controller='NotificationSettings' isEmail=true}{/link}] to configure +your notifications on {@PAGE_TITLE|language} [URL:{link isEmail=true}{/link}] as you wish. + +If you wish to disable all email notifications you can do so by visiting: +{link controller='NotificationDisable' isEmail=true}userID={@$mailbox->getUser()->userID}&token={@$mailbox->getUser()->notificationMailToken}{/link}]]> + Dear {@$mailbox->getUser()->username}, + +

    you currently have got {#$notifications|count} unread notifications that are older than 24 hours:

    ]]>     + {if $notifications|count > $maximum}Visit your notification list to view the remaining {#$remaining} notifications.

    {/if} + +

    This is an automatic notification, please do not reply to this email!

    + +

    Visit your notification settings to configure +your notifications on {PAGE_TITLE|language} as you wish.

    + +

    You can disable all email notifications as well.

    ]]>     + + getAuthor()->userID}A guest{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if}{if $count > 1 && $count < 4}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->username} [URL:{link controller='User' object=$authors[1] isEmail=true}{/link}]{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if}{@$authors[2]->username} [URL:{link controller='User' object=$authors[2] isEmail=true}{/link}]{/if}{elseif $count >= 4}{if $guestTimesTriggered},{else} and{/if} {#$count-1} weitere Benutzer{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}{#$guestTimesTriggered} guests{/if}{/if}]]> + getAuthor()->userID}A guest{else}{@$event->getAuthor()->username}{/if}{if $count > 1 && $count < 4}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if}{@$authors[2]->username}{/if}{elseif $count >= 4}{if $guestTimesTriggered},{else} and{/if} {#$count-1} other users{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}{#$guestTimesTriggered} guests{/if}{/if}]]> + + - + + + + getAnchorTag()} follows you.]]> + getAnchorTag()}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} others{/if} follow you.]]> + + {@$authorList} {if $authors|count == 1}follows{else}follow{/if} you:

    ]]>     userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on your wall.]]> @@@ -3505,17 -3207,19 +3496,17 @@@ userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a reply to {$commentAuthor->username}’s comment on your wall.]]> getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to the comment by {if $author->userID}{$author->username}{else}{$author->username}{/if} on your wall.]]> - userID}a guest{else}{@$author->username}{/if} wrote a reply to {@$commentAuthor->username}’s comment on your wall: -{if $notificationType == 'instant'} ---------------------------------- -{@$response->message} ---------------------------------- -{/if}{link controller='User' object=$owner isEmail=true}#wall{/link}]]> - username}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->username}{/if}{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->username}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to the comment by {$author->username} on your wall: -{link controller='User' object=$owner isEmail=true}#wall{/link}]]> + username}’s{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on your wall [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> + {@$authorList} wrote {if $count == 1 && !$guestTimesTriggered}a reply{else}replies{/if} to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}’s comment on your wall:

    ]]>     - - - - - + + + + + + + + + @@@ -3536,10 -3240,7 +3527,10 @@@ {$user->username}’s wall.]]> {$commentAuthor->username} on {$user->username}’s wall.]]> - + + + + @@@ -3592,22 -3293,17 +3583,22 @@@ - username}, + + getUser()->username}, + +“{@$username}” sent you a message on {@PAGE_TITLE|language} [URL:{link isEmail=true}{/link}]: -"{@$username}" sent you a message on "{@PAGE_TITLE|language}": {@$message}]]> - +Dear {$mailbox->getUser()->username}, + +

    „{$username}“ sent you a message on {PAGE_TITLE|language}:

    + +

    {@$message|newlineToBreak}

    ]]>     - username}.]]> + username}.]]> - username}]]>