From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sat, 16 Apr 2016 10:18:43 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~1883
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d0f71085ced4020b6de7e212811941d9827ea7ca;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

d0f71085ced4020b6de7e212811941d9827ea7ca
diff --cc wcfsetup/install/lang/en.xml
index 2666a5d501,6f013dcc20..2234c3d5e7
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -655,22 -660,21 +655,22 @@@ Examples for medium ID detection
  		<item name="wcf.acp.notice.cssClassName.success"><![CDATA[Success Message]]></item>
  		<item name="wcf.acp.notice.cssClassName.warning"><![CDATA[Warning]]></item>
  		<item name="wcf.acp.notice.conditions"><![CDATA[Conditions]]></item>
- 		<item name="wcf.acp.notice.conditions.description"><![CDATA[If you choose no conditions, the notice will be shown for every user.]]></item>
+ 		<item name="wcf.acp.notice.conditions.description"><![CDATA[If you choose no conditions, the notice will be displayed for every user.]]></item>
  		<item name="wcf.acp.notice.conditions.page"><![CDATA[Page]]></item>
- 		<item name="wcf.acp.notice.conditions.page.description"><![CDATA[The requested page has to fulfill the following conditions for the notice to be shown.]]></item>
+ 		<item name="wcf.acp.notice.conditions.page.description"><![CDATA[The requested page has to fulfill the following conditions for the notice to be displayed.]]></item>
  		<item name="wcf.acp.notice.conditions.pointInTime"><![CDATA[Time]]></item>
- 		<item name="wcf.acp.notice.conditions.pointInTime.description"><![CDATA[Sets the point in time at which the notice is shown.]]></item>
+ 		<item name="wcf.acp.notice.conditions.pointInTime.description"><![CDATA[Sets the point in time at which the notice is displayed.]]></item>
 -		<item name="wcf.acp.notice.conditions.user"><![CDATA[Active user]]></item>
 +		<item name="wcf.acp.notice.conditions.user"><![CDATA[Active User]]></item>
  		<item name="wcf.acp.notice.conditions.user.description"><![CDATA[The active user has to fulfill the following conditions to see the notice.]]></item>
  		<item name="wcf.acp.notice.delete.confirmMessage"><![CDATA[Do you really want to delete the notice “{$notice->noticeName}”?]]></item>
  		<item name="wcf.acp.notice.edit"><![CDATA[Edit Notice]]></item>
  		<item name="wcf.acp.notice.example"><![CDATA[Example text of a notice]]></item>
  		<item name="wcf.acp.notice.isDisabled"><![CDATA[Disable Notice]]></item>
  		<item name="wcf.acp.notice.isDismissible"><![CDATA[User can dismiss notice]]></item>
- 		<item name="wcf.acp.notice.isDismissible.description"><![CDATA[A notice one dismissed by a user will not be shown again for them.]]></item>
+ 		<item name="wcf.acp.notice.isDismissible.description"><![CDATA[If a user dismisses a notice, it will not display for them again.]]></item>
  		<item name="wcf.acp.notice.list"><![CDATA[Notices]]></item>
  		<item name="wcf.acp.notice.notice"><![CDATA[Notice]]></item>
 +		<item name="wcf.acp.notice.notice.description"><![CDATA[<code>{literal}{$username}{/literal}</code> will be replaced by the name and <code>{literal}{$email}{/literal}</code> by the mail address of the active user.]]></item>
  		<item name="wcf.acp.notice.noticeUseHtml"><![CDATA[Enable HTML code in notice]]></item>
  		<item name="wcf.acp.notice.resetIsDismissed"><![CDATA[Dismissed notices will be shown again]]></item>
  		<item name="wcf.acp.notice.resetIsDismissed.description"><![CDATA[The notice will be shown again to users who dismissed the previous version. Guests who dismissed the notice will only see it in a new session.]]></item>
@@@ -762,8 -757,14 +762,8 @@@
  		<item name="wcf.acp.option.image_adapter_type.gd"><![CDATA[GD Graphics Library (default)]]></item>
  		<item name="wcf.acp.option.image_adapter_type.imagick"><![CDATA[ImageMagick]]></item>
  		<item name="wcf.acp.option.image_adapter_type.description"><![CDATA[Library used for image processing, e.g. scaling uploaded images. “ImageMagick” is a lot faster, but is not available on every machine.]]></item>
 -		<item name="wcf.acp.option.import"><![CDATA[Restore Options]]></item>
 -		<item name="wcf.acp.option.import.error.importFailed"><![CDATA[Unable to restore options.]]></item>
 -		<item name="wcf.acp.option.import.success"><![CDATA[Options have been restored.]]></item>
 -		<item name="wcf.acp.option.import.upload"><![CDATA[Upload Options]]></item>
 -		<item name="wcf.acp.option.import.upload.description"><![CDATA[Upload previously downloaded options file.]]></item>
 -		<item name="wcf.acp.option.importAndExport"><![CDATA[Save &amp; Restore Options]]></item>
  		<item name="wcf.acp.option.log_ip_address"><![CDATA[Store IP addresses]]></item>
- 		<item name="wcf.acp.option.log_ip_address.description"><![CDATA[Stores IP addresses for user-generated content, e.g. sessions, profiles or forum posts.]]></item>
+ 		<item name="wcf.acp.option.log_ip_address.description"><![CDATA[Stores IP addresses for user-created content, e.g. sessions, profiles, or forum posts.]]></item>
  		<item name="wcf.acp.option.mail_admin_address"><![CDATA[Administrator Email]]></item>
  		<item name="wcf.acp.option.mail_admin_address.description"><![CDATA[Enter the administrator’s email address here.]]></item>
  		<item name="wcf.acp.option.mail_debug_logfile_path"><![CDATA[Debug Log Filename]]></item>
@@@ -796,11 -794,12 +796,11 @@@
  		<item name="wcf.acp.option.page_title"><![CDATA[Page Title]]></item>
  		<item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
  		<item name="wcf.acp.option.session_timeout"><![CDATA[Session Timeout]]></item>
 -		<item name="wcf.acp.option.session_timeout.description"><![CDATA[User sessions expire after the selected seconds.]]></item>
  		<item name="wcf.acp.option.session_validate_ip_address"><![CDATA[Validate IP address]]></item>
- 		<item name="wcf.acp.option.session_validate_ip_address.description"><![CDATA[Enabling this validation might cause troubles for users with rotating IP addresses.]]></item>
+ 		<item name="wcf.acp.option.session_validate_ip_address.description"><![CDATA[Enabling this validation might cause issues for users with a rotating IP address.]]></item>
  		<item name="wcf.acp.option.session_validate_user_agent"><![CDATA[Validate user-agent]]></item>
  		<item name="wcf.acp.option.session_enable_virtualization"><![CDATA[Allow session sharing]]></item>
- 		<item name="wcf.acp.option.session_enable_virtualization.description"><![CDATA[Users can log-in from multiple devices (PC, tablet, smartphone, etc) concurrently, all devices will share the same session. Disabling this option will restrict users to be logged-in with only one device at once, causing every login to terminate sessions used by the user’s other devices. It is not recommended to disable this option and you should be well aware of the consequences if you decide to disable it.]]></item>
+ 		<item name="wcf.acp.option.session_enable_virtualization.description"><![CDATA[Users can login from multiple devices (PC, tablet, smartphone, etc) concurrently, all devices will share the same session. Disabling this will restrict users to only one device (session) at a time, causing all other device sessions to terminate. It is not recommended to disable this option.]]></item>
  		<item name="wcf.acp.option.show_clock"><![CDATA[Show current time in page footer]]></item>
  		<item name="wcf.acp.option.timezone"><![CDATA[Timezone]]></item>
  		<item name="wcf.acp.option.timezone.description"><![CDATA[The default timezone of your page.]]></item>
@@@ -1035,17 -1042,15 +1041,17 @@@ GmbH=Gesellschaft mit beschränkter Haf
  		<item name="wcf.acp.option.category.security.general.authentication"><![CDATA[User Authentication]]></item>
  		<item name="wcf.acp.option.enable_user_authentication_failure"><![CDATA[Log failed login attempts]]></item>
  		<item name="wcf.acp.option.user_authentication_failure_timeout"><![CDATA[Grace Period]]></item>
- 		<item name="wcf.acp.option.user_authentication_failure_timeout.description"><![CDATA[Failed login attempts are not put into consideration if they happened more than the configured amount of seconds ago.]]></item>
+ 		<item name="wcf.acp.option.user_authentication_failure_timeout.description"><![CDATA[Failed login attempts are not considered after the selected seconds.]]></item>
  		<item name="wcf.acp.option.user_authentication_failure_ip_captcha"><![CDATA[Captcha After Failed Attempts (IP)]]></item>
- 		<item name="wcf.acp.option.user_authentication_failure_ip_captcha.description"><![CDATA[Once there have been more than the configured amount of failed attempts from the same IP address, the user will be forced so solve a captcha.]]></item>
+ 		<item name="wcf.acp.option.user_authentication_failure_ip_captcha.description"><![CDATA[Failed login attempts allowed from the same IP address until the user is forced to solve a captcha.]]></item>
  		<item name="wcf.acp.option.user_authentication_failure_ip_block"><![CDATA[Block from Login (IP)]]></item>
- 		<item name="wcf.acp.option.user_authentication_failure_ip_block.description"><![CDATA[Once there have been more than the configured amount of failed attempts from the same IP address, the IP addresses will be temporarily blocked from logging in.]]></item>
+ 		<item name="wcf.acp.option.user_authentication_failure_ip_block.description"><![CDATA[Failed login attempts allowed from the same IP address until the IP address is temporarily blocked from logging in.]]></item>
  		<item name="wcf.acp.option.user_authentication_failure_user_captcha"><![CDATA[Captcha After Failed Attempts (User)]]></item>
- 		<item name="wcf.acp.option.user_authentication_failure_user_captcha.description"><![CDATA[Once there have been more than the configured amount of failed attempts for the same user account, a captcha will be enforced regardless of the IP address.]]></item>
+ 		<item name="wcf.acp.option.user_authentication_failure_user_captcha.description"><![CDATA[Failed login attempts allowed from the same user account until a captcha is enforced, regardless of the IP address.]]></item>
  		<item name="wcf.acp.option.user_authentication_failure_expiration"><![CDATA[Prune Log Entries]]></item>
- 		<item name="wcf.acp.option.user_authentication_failure_expiration.description"><![CDATA[Logs of failed login attempts will be automatically pruned after the configured amount of days, raising the limit will provide a longer history in expense for increased database storage usage.]]></item>
+ 		<item name="wcf.acp.option.user_authentication_failure_expiration.description"><![CDATA[Failed login attempt logs will be removed after the selected days. Raising the limit will provide a longer history, but at the expense of increased database storage usage.]]></item>
 +		<item name="wcf.acp.option.signature_secret"><![CDATA[Secret Key]]></item>
 +		<item name="wcf.acp.option.signature_secret.description"><![CDATA[A secret key that serves the purpose of validating data to prevent tampering. Keep this key secret! A random key was generated for you during installation, you don't need to change it. Note: This key must be at least 15 characters long.]]></item>
  		<item name="wcf.acp.option.gravatar_default_type"><![CDATA[Default Gravatar Type]]></item>
  		<item name="wcf.acp.option.gravatar_default_type.description"><![CDATA[The <a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url=https://de.gravatar.com/site/implement/images/#default-image">default Gravatar type</a> used if no matching Gravatar was found.]]></item>
  		<item name="wcf.acp.option.gravatar_default_type.404"><![CDATA[No default Gravatar]]></item>