From: Tim Düsterhus Date: Thu, 2 May 2013 14:56:35 +0000 (+0200) Subject: Merge branch 'master' of git://github.com/WoltLab/WCF into WoltLab-master X-Git-Tag: 2.0.0_Beta_1~171^2~2^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=03b2597eac7c5aac4a2f81307becb9a81e787d37;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'master' of git://github.com/WoltLab/WCF into WoltLab-master Conflicts: wcfsetup/install/lang/en.xml --- 03b2597eac7c5aac4a2f81307becb9a81e787d37 diff --cc wcfsetup/install/lang/en.xml index 592b8c3c15,70166774ad..27e9d8069e --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@@ -123,10 -123,9 +123,9 @@@ - + - @@@ -195,15 -194,14 +194,14 @@@ - - - - - - - - + + + + + + + @@@ -453,9 -462,11 +462,11 @@@ + + - - + + @@@ -621,9 -671,16 +671,16 @@@ + + + + + + + username}â?]]> - + Character Separated Values)]]> @@@ -664,9 -721,50 +721,50 @@@ - + + + + + categoryName}{/lang}â?]]> + + + + + + + + optionName}{/lang}â?]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@@ -707,23 -805,24 +805,24 @@@ - 1}{#$days} days{else}A day{/if} ago]]> - 1}{#$years} years{else}A year{/if}{/if}{if $months}{if $firstElement != 'months'}{if $firstElement != 'months'}{if $lastElement == 'months'} and {else}, {/if}{/if}{#$months} months{else}{if $firstElement == 'months'}A{else}a{/if} month{/if}{/if}{if $weeks}{if $firstElement != 'weeks'}{if $lastElement == 'weeks'} and {else}, {/if}{/if}{if $weeks > 1}{#$weeks} weeks{else}{if $firstElement == 'weeks'}A{else}a{/if} week{/if}{/if}{if $days}{if $firstElement != 'days'}{if $lastElement == 'days'} and {else}, {/if}{/if}{if $days > 1}{#$days} days{else}{if $firstElement == 'days'}A{else}a{/if} day{/if}{/if}{if $hours}{if $firstElement != 'hours'}{if $lastElement == 'hours'} and {else}, {/if}{/if}{if $hours > 1}{#$hours} hours{else}{if $firstElement == 'hours'}An{else}an{/if} hour{/if}{/if}{if $minutes}{if $firstElement != 'minutes' && $lastElement == 'minutes'} and {/if}{if $minutes > 1}{#$minutes} minutes{else}{if $firstElement == 'minutes'}A{else}a{/if} minute{/if}{/if} ago]]> - 1}{#$hours} hours{else}An hour{/if} ago]]> - 1}{#$minutes} minutes{else}A minute{/if} ago]]> - 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} ago]]> + 1}{#$years} years{else}a year{/if}{/if}{if $months}{if $firstElement != 'months'}{if $firstElement != 'months'}{if $lastElement == 'months'} and {else}, {/if}{/if}{#$months} months{else}{if $firstElement == 'months'}A{else}a{/if} month{/if}{/if}{if $weeks}{if $firstElement != 'weeks'}{if $lastElement == 'weeks'} and {else}, {/if}{/if}{if $weeks > 1}{#$weeks} weeks{else}{if $firstElement == 'weeks'}A{else}a{/if} week{/if}{/if}{if $days}{if $firstElement != 'days'}{if $lastElement == 'days'} and {else}, {/if}{/if}{if $days > 1}{#$days} days{else}{if $firstElement == 'days'}A{else}a{/if} day{/if}{/if}{if $hours}{if $firstElement != 'hours'}{if $lastElement == 'hours'} and {else}, {/if}{/if}{if $hours > 1}{#$hours} hours{else}{if $firstElement == 'hours'}An{else}an{/if} hour{/if}{/if}{if $minutes}{if $firstElement != 'minutes' && $lastElement == 'minutes'} and {/if}{if $minutes > 1}{#$minutes} minutes{else}{if $firstElement == 'minutes'}A{else}a{/if} minute{/if}{/if} ago]]> + 1}{#$hours} hours{else}an hour{/if} ago]]> + 1}{#$minutes} minutes{else}a minute{/if} ago]]> + 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}{#$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}]]> - 1}{#$minutes} minutes{else}A minute{/if}]]> - 1}{#$months} months{else}A Month{/if}]]> - 1}{#$weeks} weeks{else}A week{/if}]]> - 1}{#$years} years{else}A year{/if}]]> + 1}{#$hours} hours{else}an hour{/if}]]> + 1}{#$minutes} minutes{else}a minute{/if}]]> + 1}{#$months} months{else}a Month{/if}]]> + 1}{#$weeks} weeks{else}a week{/if}]]> + 1}{#$years} years{else}a year{/if}]]> + 1) ? $minutes + ' minutes' : 'A minute') + ' ago']]> 1) ? $hours + ' hours' : 'An hour' ) + ' ago']]> 1) ? '%day%' : 'Yesterday' ) + ', %time%']]>