From: Smooey Date: Fri, 15 Jul 2016 23:02:24 +0000 (-0400) Subject: latest wcf phrase adjustments (second wave) X-Git-Tag: 2.1.12~4^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0cf37c7ab5bf4a78bfa287dd1099ec821368b226;p=GitHub%2FWoltLab%2FWCF.git latest wcf phrase adjustments (second wave) probably could check and merge, but might be some more yet not sure --- diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 60c5b4698d..4c92871062 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -100,14 +100,12 @@ 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.
    ]]> @@ -142,7 +140,7 @@ Examples for medium ID detection: - + question|language}”?]]> @@ -289,7 +287,7 @@ Examples for medium ID detection: - + @@ -380,7 +378,7 @@ Examples for medium ID detection: - <strong>%s</strong> results in a bolder appearance.]]> + <strong>%s</strong> results in a bolder appearance.]]> @@ -687,13 +685,13 @@ Examples for medium ID detection: - + - + - + - + @@ -751,7 +749,7 @@ Examples for medium ID detection: - + @@ -772,9 +770,9 @@ Examples for medium ID detection: - + - + @@ -845,14 +843,16 @@ Examples for medium ID detection: - + - -Use “*” to match parts: “wolt*” matches “woltlab”
    -Use “~” to find splitted parts: “wolt~” matches “wolt-lab”]]>     + +
  • “*” to match parts: “wolt*” matches “woltlab”
    • +
  • “~” to find splitted parts: “wolt~” matches “wolt-lab”
    • +
]]> @@ -869,16 +869,16 @@ Examples for medium ID detection: - getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub. The Callback URL is: {link controller="GithubAuth" forceFrontend=true appendSession=false}{/link}.]]> + getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub. The Callback URL is: {link controller="GithubAuth" forceFrontend=true appendSession=false}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter. The Callback URL is: {link controller="TwitterAuth" forceFrontend=true appendSession=false}{/link}.]]> + getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter. The Callback URL is: {link controller="TwitterAuth" forceFrontend=true appendSession=false}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook. The OAuth redirect URI is: {link controller="FacebookAuth" forceFrontend=true appendSession=false}{/link}.]]> + getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook. The OAuth redirect URI is: {link controller="FacebookAuth" forceFrontend=true appendSession=false}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google. The Redirect-URI is: {link controller="GoogleAuth" forceFrontend=true appendSession=false}{/link}.]]> + getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google. The Redirect-URI is: {link controller="GoogleAuth" forceFrontend=true appendSession=false}{/link}]]> @@ -917,11 +917,11 @@ Examples for medium ID detection: - + - + - + @@ -940,7 +940,7 @@ Examples for medium ID detection: - + @@ -998,12 +998,13 @@ Examples for medium ID detection: - -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/”
    • @@ -1033,7 +1034,11 @@ GmbH=Gesellschaft mit beschränkter Haftung]]>     - 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: +
      +
    • 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/”
      • +
    ]]>     @@ -1221,16 +1226,16 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + - + - + @@ -1295,7 +1300,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]>     - + @@ -1374,7 +1379,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + @@ -1492,8 +1497,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - - + + @@ -1557,12 +1562,12 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + 1}s have{else} has{/if} successfully been assigned to the selected user group{if $groupIDs|count > 1}s{/if}.]]> - + @@ -1571,7 +1576,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> username}”?]]> - + Character Separated Values)]]> @@ -1591,12 +1596,12 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + - + @@ -1637,7 +1642,7 @@ You can define the default sender in System -> Options -> General -> - + optionName}{/lang}”?]]> @@ -1646,7 +1651,7 @@ You can define the default sender in System -> Options -> General -> - + @@ -1688,15 +1693,15 @@ You can define the default sender in System -> Options -> General -> - - + + - + @@ -1734,10 +1739,9 @@ your account on the website: {@PAGE_TITLE|language} has been approved by an admi You can now fully access the website.]]> - + - @@ -1889,10 +1893,8 @@ Errors are: - Failing commands - Core errors]]> - - @@ -1918,7 +1920,7 @@ Errors are: - getSession()->getPermission('user.comment.floodControlTime') > 1}{#$__wcf->getSession()->getPermission('user.comment.floodControlTime')} seconds{else}second{/if}. You have to wait at least {#$lastCommentTime+$__wcf->getSession()->getPermission('user.comment.floodControlTime')-TIME_NOW} second{if ($lastCommentTime+$__wcf->getSession()->getPermission('user.comment.floodControlTime')-TIME_NOW) != 1}s{/if} before attempting to write a new one.]]> + getSession()->getPermission('user.comment.floodControlTime') > 1}{#$__wcf->getSession()->getPermission('user.comment.floodControlTime')} seconds{else}second{/if}. You must wait at least {#$lastCommentTime+$__wcf->getSession()->getPermission('user.comment.floodControlTime')-TIME_NOW} second{if ($lastCommentTime+$__wcf->getSession()->getPermission('user.comment.floodControlTime')-TIME_NOW) != 1}s{/if} before attempting to write a new comment.]]> @@ -1977,7 +1979,6 @@ Errors are: 1}{#$months} months{else}A Month{/if} ago]]> 1}{#$weeks} weeks{else}A week{/if} ago]]> 1}{#$years} years{else}A year{/if} ago]]> - 1}{#$days} days{else}A day{/if}]]> 1}{#$years} years{else}a year{/if}{/if}{if $months}{if $firstElement != 'months'}{if $lastElement == 'months'} and {else}, {/if}{/if}{if $months > 1}{#$months} months{else}a month{/if}{/if}{if $weeks}{if $firstElement != 'weeks'}{if $lastElement == 'weeks'} and {else}, {/if}{/if}{if $weeks > 1}{#$weeks} weeks{else}a week{/if}{/if}{if $days}{if $firstElement != 'days'}{if $lastElement == 'days'} and {else}, {/if}{/if}{if $days > 1}{#$days} days{else}a day{/if}{/if}{if $hours}{if $firstElement != 'hours'}{if $lastElement == 'hours'} and {else}, {/if}{/if}{if $hours > 1}{#$hours} hours{else}an hour{/if}{/if}{if $minutes}{if $firstElement != 'minutes' && $lastElement == 'minutes'} and {/if}{if $minutes > 1}{#$minutes} minutes{else}a minute{/if}{/if}]]> 1}{#$hours} hours{else}An hour{/if}]]> @@ -2000,7 +2001,6 @@ Errors are: - @@ -2266,7 +2266,6 @@ Errors are: - @@ -2626,16 +2625,16 @@ Errors are: - - - maxVotes} options.]]> + + + maxVotes} options.]]> - + - - + + - + votes} vote{if $poll->votes != 1}s{/if}]]> endTime|plainTime}]]> @@ -2862,14 +2861,14 @@ If you cannot activate your email address or have any troubles following the ins - - - - + + + + - + @@ -3081,8 +3080,8 @@ You can safely ignore this email if you did not register with the website: {@PAG user->avatarID || $__wcf->user->enableGravatar}have banned your avatar and {/if}disallowed you from using an avatar{if $__wcf->user->disableAvatarReason}: {$__wcf->user->disableAvatarReason}{/if}.]]> - - session->getPermission('user.profile.avatar.allowedFileExtensions')}” for your avatar with a maximum file size of {@$__wcf->session->getPermission('user.profile.avatar.maxSize')|filesize}. The minimum dimensions are 96×96 pixel, it is recommended to provide a dimension of {@MAX_AVATAR_WIDTH}×{@MAX_AVATAR_HEIGHT} pixel. Any avatar that exceeds this limit will be scaled down if possible.]]> + + session->getPermission('user.profile.avatar.allowedFileExtensions')}” for your avatar with a maximum file size of {@$__wcf->session->getPermission('user.profile.avatar.maxSize')|filesize}. The minimum dimensions are 96×96 pixels, it is recommended to provide a dimension of {@MAX_AVATAR_WIDTH}×{@MAX_AVATAR_HEIGHT} pixels. Any avatar that exceeds this limit will be scaled down if possible.]]> user->email}”. Visit www.gravatar.com to set up or change your avatar.]]> @@ -3214,11 +3213,11 @@ If you do not want to receive further email notifications for this event, you ca {/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}]]> - - - - - + + + + +