Merge branch 'master' of git://github.com/WoltLab/WCF into WoltLab-master

Conflicts:
	wcfsetup/install/lang/en.xml

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
index 592b8c3c155b2fac1ea486af0ae075d4794b69a5,70166774adafe398e6bde0ecfec6094e902c3f2a..27e9d8069e79b92b6b975d3e3859893a2ff54eea
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -123,10 -123,9 +123,9 @@@
                <item name="wcf.acp.group.members"><![CDATA[Members]]></item>
                <item name="wcf.acp.group.option.admin.display.canManagePageMenu"><![CDATA[Can manage page menu]]></item>
                <item name="wcf.acp.group.option.admin.general.canUseAcp"><![CDATA[Can enter Administration Control Panel]]></item>
 -              <item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Users of this group may access the Administration Control Panel based upon their granted permissions. This option must be enabled if you wish to grant access to any administrative option.]]></item>
 +              <item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Users of this group may access the Administration Control Panel, based on their granted permissions. This option must be enabled if you wish to grant access to any administrative option.]]></item>
                <item name="wcf.acp.group.option.admin.general.canViewPrivateUserOptions"><![CDATA[Can view private user options]]></item>
                <item name="wcf.acp.group.option.admin.language.canManageLanguage"><![CDATA[Can manage languages]]></item>
-               <item name="wcf.acp.group.option.admin.language.canManageServer"><![CDATA[Can manage language servers]]></item>
                <item name="wcf.acp.group.option.admin.system.canEditOption"><![CDATA[Can edit system options]]></item>
                <item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Can view disabled styles]]></item>
                <item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Can view log files]]></item>
@@@ -195,15 -194,14 +194,14 @@@
                <item name="wcf.acp.language.users"><![CDATA[Used by]]></item>
                <item name="wcf.acp.language.import"><![CDATA[Import Language]]></item>
                <item name="wcf.acp.language.item.list"><![CDATA[Manage Phrases]]></item>
-               <item name="wcf.acp.language.item.list.filter"><![CDATA[Filter]]></item>
                <item name="wcf.acp.language.category"><![CDATA[Category]]></item>
 -              <item name="wcf.acp.language.item.value"><![CDATA[TODO: Inhalt]]></item>
 -              <item name="wcf.acp.language.item.customValue"><![CDATA[TODO: Eigener Inhalt]]></item>
 -              <item name="wcf.acp.language.item.useCustomValue"><![CDATA[TODO: Eigene Version verwenden]]></item>
 -              <item name="wcf.acp.language.item.hasCustomValue"><![CDATA[TODO: Inhalte mit eigener Version]]></item>
 -              <item name="wcf.acp.language.item.customValues"><![CDATA[TODO: Veränderte Inhalte finden]]></item>
 -              <item name="wcf.acp.language.name.description"><![CDATA[TODO: Name der Sprache]]></item>
 -              <item name="wcf.acp.language.add.source.description"><![CDATA[TODO: Die ausgewählte Sprache wird als Vorlage benutzt. Alle Sprachvariablen werden in die neue Sprache kopiert.]]></item>
 +              <item name="wcf.acp.language.item.value"><![CDATA[Content]]></item>
 +              <item name="wcf.acp.language.item.customValue"><![CDATA[One's Own Content]]></item>
 +              <item name="wcf.acp.language.item.useCustomValue"><![CDATA[Use One's Own Version]]></item>
 +              <item name="wcf.acp.language.item.hasCustomValue"><![CDATA[Contents Containing One's Own Version]]></item>
 +              <item name="wcf.acp.language.item.customValues"><![CDATA[Find Changed Contents]]></item>
 +              <item name="wcf.acp.language.name.description"><![CDATA[Language Name]]></item>
 +              <item name="wcf.acp.language.add.source.description"><![CDATA[The chosen language is used a pattern. All language variables will be copied into the new language.]]></item>
        </category>
        
        <category name="wcf.acp.masterPassword">
@@@ -453,9 -462,11 +462,11 @@@
                <item name="wcf.acp.package.search.packageDescription"><![CDATA[Package Description]]></item>
                <item name="wcf.acp.package.search.packageName"><![CDATA[Package Name]]></item>
                <item name="wcf.acp.package.search.resultList"><![CDATA[Search Results]]></item>
+               <item name="wcf.acp.package.searchForUpdates"><![CDATA[Search for Updates]]></item>
+               <item name="wcf.acp.package.searchForUpdates.noResults"><![CDATA[Your system is up to date, there are no outstanding updates.]]></item>
                <item name="wcf.acp.package.source"><![CDATA[Data Source]]></item>
 -              <item name="wcf.acp.package.source.download"><![CDATA[Paket herunterladen]]></item>
 -              <item name="wcf.acp.package.source.download.description"><![CDATA[Geben Sie den direkten Pfad zur Paketdatei an. Dabei kann es sich um die Internetadresse der Paketdatei oder alternativ den Pfad zur Paketdatei im Dateisystem handeln.]]></item>
 +              <item name="wcf.acp.package.source.download"><![CDATA[Download Package]]></item>
 +              <item name="wcf.acp.package.source.download.description"><![CDATA[Enter the direct path to the package data. It is possible to use the package data's internet address or, alternatively, the path to the package data within the file system.]]></item>
                <item name="wcf.acp.package.source.upload"><![CDATA[Upload Package]]></item>
                <item name="wcf.acp.package.source.upload.description"><![CDATA[Upload package archive from your local machine.]]></item>
                <item name="wcf.acp.package.startInstall"><![CDATA[Install Package]]></item>
@@@ -621,9 -671,16 +671,16 @@@
                <item name="wcf.acp.user.add"><![CDATA[Add User]]></item>
                <item name="wcf.acp.user.assignToGroup"><![CDATA[Assign to User Group]]></item>
                <item name="wcf.acp.user.assignToGroup.markedUsers"><![CDATA[Assigning the following users to user groups selected below]]></item>
+               <item name="wcf.acp.user.banUser"><![CDATA[TODO: Benutzer sperren]]></item>
+               <item name="wcf.acp.user.banUser.description"><![CDATA[TODO: Der Benutzer wird dauerhaft von der Nutzung aller Funktionen ausgeschlossen und erhält beim Aufruf der Seite eine entsprechende Fehlermeldung.]]></item>
+               <item name="wcf.acp.user.banReason"><![CDATA[TODO: Begründung]]></item>
+               <item name="wcf.acp.user.banReason.description"><![CDATA[TODO: Die Begründung wird dem gesperrten Benutzer beim Aufruf der Seite angezeigt.]]></item>
+               <item name="wcf.acp.user.ban"><![CDATA[TODO: Sperren]]></item>
+               <item name="wcf.acp.user.unban"><![CDATA[TODO: Sperrung aufheben]]></item>
+               <item name="wcf.acp.user.ban.sure"><![CDATA[TODO: Wollen Sie den/die Benutzer wirklich sperren?]]></item>
                <item name="wcf.acp.user.delete.sure"><![CDATA[Do you really want to delete the user “{$user->username}”?]]></item>
                <item name="wcf.acp.user.edit"><![CDATA[Edit User]]></item>
 -              <item name="wcf.acp.user.edit.warning.selfEdit"><![CDATA[Heads up! You’re editing your own user account and changes might result in yourself being locked out from the Administration Control Panel.]]></item>
 +              <item name="wcf.acp.user.edit.warning.selfEdit"><![CDATA[Mind! You’re editing your own user account and changes might result in yourself being locked out from the Administration Control Panel.]]></item>
                <item name="wcf.acp.user.exportEmailAddress"><![CDATA[Export Email Addresses]]></item>
                <item name="wcf.acp.user.exportEmailAddress.fileType"><![CDATA[Export Format]]></item>
                <item name="wcf.acp.user.exportEmailAddress.fileType.csv"><![CDATA[CSV (<em>Character Separated Values</em>)]]></item>
@@@ -664,9 -721,50 +721,50 @@@
                <item name="wcf.acp.user.sendMail.group"><![CDATA[Email to user group]]></item>
                <item name="wcf.acp.user.sendMail.groups"><![CDATA[Send email to members of the following user groups]]></item>
                <item name="wcf.acp.user.sendMail.mail"><![CDATA[Email]]></item>
 -              <item name="wcf.acp.user.sendMail.markedUsers"><![CDATA[Send email to following users]]></item>
 +              <item name="wcf.acp.user.sendMail.markedUsers"><![CDATA[Send email to the following users]]></item>
                <item name="wcf.acp.user.sendMail.subject"><![CDATA[Subject]]></item>
                <item name="wcf.acp.user.sendMail.text"><![CDATA[Text]]></item>
+               <item name="wcf.acp.user.option.access"><![CDATA[TODO: Zugriff]]></item>
+               <item name="wcf.acp.user.option.add"><![CDATA[Add Custom User Field]]></item>
+               <item name="wcf.acp.user.option.category.add"><![CDATA[Add Custom User Field Category]]></item>
+               <item name="wcf.acp.user.option.category.delete.sure"><![CDATA[Do you really want to delete the category “{lang}wcf.user.option.category.{$category->categoryName}{/lang}”?]]></item>
+               <item name="wcf.acp.user.option.category.edit"><![CDATA[Edit Custom User Field Category]]></item>
+               <item name="wcf.acp.user.option.category.showOrder"><![CDATA[TODO: Reihenfolge]]></item>
+               <item name="wcf.acp.user.option.category.options"><![CDATA[Fields]]></item>
+               <item name="wcf.acp.user.option.category.list"><![CDATA[Custom User Field Categories]]></item>
+               <item name="wcf.acp.user.option.categoryName"><![CDATA[Category]]></item>
+               <item name="wcf.acp.user.option.defaultValue"><![CDATA[Default Value]]></item>
+               <item name="wcf.acp.user.option.defaultValue.description"><![CDATA[TODO: Wert, der beim erstmaligen Ausfüllen als Standard vorgegeben ist.]]></item>
+               <item name="wcf.acp.user.option.delete.sure"><![CDATA[Dou you really want to delete the field “{lang}wcf.user.option.{$option->optionName}{/lang}”?]]></item>
+               <item name="wcf.acp.user.option.description"><![CDATA[Description]]></item>
+               <item name="wcf.acp.user.option.edit"><![CDATA[Edit Custom User Field]]></item>
+               <item name="wcf.acp.user.option.editable"><![CDATA[TODO: Wer darf den Inhalt verändern?]]></item>
+               <item name="wcf.acp.user.option.editable.1"><![CDATA[TODO: Eigentümer]]></item>
+               <item name="wcf.acp.user.option.editable.2"><![CDATA[TODO: Administrator]]></item>
+               <item name="wcf.acp.user.option.editable.3"><![CDATA[TODO: Eigentümer und Administrator]]></item>
+               <item name="wcf.acp.user.option.optionType"><![CDATA[TODO: Feldtyp]]></item>
+               <item name="wcf.acp.user.option.optionType.description"><![CDATA[TODO: Die Namen entsprechen in der Regel den HTML-Elementen, die benötigt werden, um so ein Feld beim Benutzer abzufragen.]]></item>
+               <item name="wcf.acp.user.option.askDuringRegistration"><![CDATA[TODO: Das Feld wird im Registrierungs-Formular angezeigt.]]></item>
+               <item name="wcf.acp.user.option.required"><![CDATA[TODO: Das Feld muss zwingend durch den Eigentümer ausgefüllt werden.]]></item>
+               <item name="wcf.acp.user.option.searchable"><![CDATA[TODO: Das Feld kann über die Mitgliedersuche durchsucht werden.]]></item>
+               <item name="wcf.acp.user.option.selectOptions"><![CDATA[TODO: Auswahloptionen]]></item>
+               <item name="wcf.acp.user.option.selectOptions.description"><![CDATA[TODO: Hier können Sie pro Zeile Auswahloptionen eintragen, beispielsweise bei einer Select-Box.]]></item>
+               <item name="wcf.acp.user.option.setDefaults"><![CDATA[Manage User Field Settings]]></item>
+               <item name="wcf.acp.user.option.setDefaults.applyChangesToExistingUsers"><![CDATA[TODO: Änderungen auch auf bestehende Benutzerkonten anwenden]]></item>
+               <item name="wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description"><![CDATA[TODO: Die hier eingestellten Änderungen der Vorgabewerte für Benutzerprofil-Einstellungen werden auch in bestehende Benutzerkonten übernommen. Die entsprechenden Einstellungen der Benutzer werden dabei überschrieben.]]></item>
+               <item name="wcf.acp.user.option.showOrder"><![CDATA[TODO: Reihenfolge]]></item>
+               <item name="wcf.acp.user.option.validationPattern"><![CDATA[TODO: Regulärer Ausdruck zur Validierung]]></item>
+               <item name="wcf.acp.user.option.validationPattern.description"><![CDATA[TODO: Tragen Sie hier den Regulären Ausdruck ein, um die Eingabe der Benutzer zu validieren.]]></item>
+               <item name="wcf.acp.user.option.list"><![CDATA[Custom User Fields]]></item>
+               <item name="wcf.acp.user.option.visible"><![CDATA[TODO: Wer darf den Inhalt sehen?]]></item>
+               <item name="wcf.acp.user.option.visible.1"><![CDATA[TODO: Eigentümer]]></item>
+               <item name="wcf.acp.user.option.visible.2"><![CDATA[TODO: Administrator]]></item>
+               <item name="wcf.acp.user.option.visible.3"><![CDATA[TODO: Eigentümer und Administrator]]></item>
+               <item name="wcf.acp.user.option.visible.7"><![CDATA[TODO: Registrierte Benutzer]]></item>
+               <item name="wcf.acp.user.option.visible.15"><![CDATA[TODO: Jeder]]></item>
+               <item name="wcf.acp.user.option.typeData"><![CDATA[TODO: Eigenschaften]]></item>
+               <item name="wcf.acp.user.option.outputClass"><![CDATA[TODO: PHP-Klasse für Ausgabe]]></item>
+               <item name="wcf.acp.user.option.outputClass.description"><![CDATA[TODO: Erlaubt die Angabe einer speziellen PHP-Klasse für die Ausgabeformatierung bei der Anzeige des Feldes.]]></item>
        </category>
        
        <category name="wcf.ajax">
@@@ -707,23 -805,24 +805,24 @@@
                <item name="wcf.date.timeFormat"><![CDATA[g:ia]]></item>
                <item name="wcf.date.dateTimeFormat"><![CDATA[%date%, %time%]]></item>
                
 -              <item name="wcf.date.interval.days.past"><![CDATA[{if $days > 1}{#$days} days{else}A day{/if} ago]]></item>
 -              <item name="wcf.date.interval.full.past"><![CDATA[{if $years}{if $years > 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]]></item>
 -              <item name="wcf.date.interval.hours.past"><![CDATA[{if $hours > 1}{#$hours} hours{else}An hour{/if} ago]]></item>
 -              <item name="wcf.date.interval.minutes.past"><![CDATA[{if $minutes > 1}{#$minutes} minutes{else}A minute{/if} ago]]></item>
 -              <item name="wcf.date.interval.months.past"><![CDATA[{if $months > 1}{#$months} months{else}A Month{/if} ago]]></item>
 -              <item name="wcf.date.interval.weeks.past"><![CDATA[{if $weeks > 1}{#$weeks} weeks{else}A week{/if} ago]]></item>
 -              <item name="wcf.date.interval.years.past"><![CDATA[{if $years > 1}{#$years} years{else}A year{/if} ago]]></item>
 +              <item name="wcf.date.interval.days.past"><![CDATA[{if $days > 1}{#$days} days{else}a day{/if} ago]]></item>
 +              <item name="wcf.date.interval.full.past"><![CDATA[{if $years}{if $years > 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]]></item>
 +              <item name="wcf.date.interval.hours.past"><![CDATA[{if $hours > 1}{#$hours} hours{else}an hour{/if} ago]]></item>
 +              <item name="wcf.date.interval.minutes.past"><![CDATA[{if $minutes > 1}{#$minutes} minutes{else}a minute{/if} ago]]></item>
 +              <item name="wcf.date.interval.months.past"><![CDATA[{if $months > 1}{#$months} months{else}a Month{/if} ago]]></item>
 +              <item name="wcf.date.interval.weeks.past"><![CDATA[{if $weeks > 1}{#$weeks} weeks{else}a week{/if} ago]]></item>
 +              <item name="wcf.date.interval.years.past"><![CDATA[{if $years > 1}{#$years} years{else}a year{/if} ago]]></item>
                
 -              <item name="wcf.date.interval.days.future"><![CDATA[In {if $days > 1}{#$days} days{else}A day{/if}]]></item>
 +              <item name="wcf.date.interval.days.future"><![CDATA[In {if $days > 1}{#$days} days{else}a day{/if}]]></item>
                <item name="wcf.date.interval.full.future"><![CDATA[In {if $years}{if $years > 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}]]></item>
 -              <item name="wcf.date.interval.hours.future"><![CDATA[In {if $hours > 1}{#$hours} hours{else}An hour{/if}]]></item>
 -              <item name="wcf.date.interval.minutes.future"><![CDATA[In {if $minutes > 1}{#$minutes} minutes{else}A minute{/if}]]></item>
 -              <item name="wcf.date.interval.months.future"><![CDATA[In {if $months > 1}{#$months} months{else}A Month{/if}]]></item>
 -              <item name="wcf.date.interval.weeks.future"><![CDATA[In {if $weeks > 1}{#$weeks} weeks{else}A week{/if}]]></item>
 -              <item name="wcf.date.interval.years.future"><![CDATA[In {if $years > 1}{#$years} years{else}A year{/if}]]></item>
 +              <item name="wcf.date.interval.hours.future"><![CDATA[In {if $hours > 1}{#$hours} hours{else}an hour{/if}]]></item>
 +              <item name="wcf.date.interval.minutes.future"><![CDATA[In {if $minutes > 1}{#$minutes} minutes{else}a minute{/if}]]></item>
 +              <item name="wcf.date.interval.months.future"><![CDATA[In {if $months > 1}{#$months} months{else}a Month{/if}]]></item>
 +              <item name="wcf.date.interval.weeks.future"><![CDATA[In {if $weeks > 1}{#$weeks} weeks{else}a week{/if}]]></item>
 +              <item name="wcf.date.interval.years.future"><![CDATA[In {if $years > 1}{#$years} years{else}a year{/if}]]></item>
                
                <!-- variables for dynamic javascript datetime -->
+               <item name="wcf.date.relative.now"><![CDATA[A moment ago]]></item>
                <item name="wcf.date.relative.minutes"><![CDATA[(($minutes > 1) ? $minutes + ' minutes' : 'A minute') + ' ago']]></item>
                <item name="wcf.date.relative.hours"><![CDATA[(($hours > 1) ? $hours + ' hours' : 'An hour' ) + ' ago']]></item>
                <item name="wcf.date.relative.pastDays"><![CDATA[(($days > 1) ? '%day%' : 'Yesterday' ) + ', %time%']]></item>