Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 13 Apr 2016 18:08:41 +0000 (20:08 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 13 Apr 2016 18:08:41 +0000 (20:08 +0200)
# Conflicts:
# com.woltlab.wcf/templates/wysiwyg.tpl
# wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
# wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
# wcfsetup/install/files/js/WCF.Combined.min.js
# wcfsetup/install/files/style/redactor.less
# wcfsetup/install/lang/en.xml

1  2 
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

Simple merge
Simple merge
index ee39813a9e4edf17b06f3eea078acee9df285513,03bbee5863e6e5577fdea2442a0236a434514e43..19fb4674ca017138b45e69878efd27f2c65e4121
@@@ -293,10 -300,8 +293,10 @@@ Examples for medium ID detection
                <item name="wcf.acp.group.option.admin.user.canEditUser"><![CDATA[Can edit users]]></item>
                <item name="wcf.acp.group.option.admin.user.canMailUser"><![CDATA[Can send emails to users]]></item>
                <item name="wcf.acp.group.option.admin.user.canSearchUser"><![CDATA[Can search users]]></item>
-               <item name="wcf.acp.group.option.category.admin"><![CDATA[Administrative Permissions]]></item>
+               <item name="wcf.acp.group.option.category.admin"><![CDATA[Administrator Permissions]]></item>
 -              <item name="wcf.acp.group.option.category.admin.display"><![CDATA[Appearance]]></item>
 +              <item name="wcf.acp.group.option.category.admin.configuration"><![CDATA[Configuration]]></item>
 +              <item name="wcf.acp.group.option.category.admin.customization"><![CDATA[Customization]]></item>
 +              <item name="wcf.acp.group.option.category.admin.management"><![CDATA[Management]]></item>
                <item name="wcf.acp.group.option.category.admin.display.pageMenu"><![CDATA[Page Menu]]></item>
                <item name="wcf.acp.group.option.category.admin.general"><![CDATA[General Permissions]]></item>
                <item name="wcf.acp.group.option.category.admin.language"><![CDATA[Languages]]></item>
        
        <category name="wcf.acp.option">
                <item name="wcf.acp.option.blacklist_hostnames"><![CDATA[Block by hostname]]></item>
-               <item name="wcf.acp.option.blacklist_hostnames.description"><![CDATA[One hostname per line]]></item>
+               <item name="wcf.acp.option.blacklist_hostnames.description"><![CDATA[Enter one hostname per line.]]></item>
                <item name="wcf.acp.option.blacklist_ip_addresses"><![CDATA[Block by IP address]]></item>
-               <item name="wcf.acp.option.blacklist_ip_addresses.description"><![CDATA[One address per line]]></item>
+               <item name="wcf.acp.option.blacklist_ip_addresses.description"><![CDATA[Enter one address per line.]]></item>
                <item name="wcf.acp.option.blacklist_user_agents"><![CDATA[Block by User-Agent]]></item>
-               <item name="wcf.acp.option.blacklist_user_agents.description"><![CDATA[One user-agent per line]]></item>
+               <item name="wcf.acp.option.blacklist_user_agents.description"><![CDATA[Enter one user-agent per line.]]></item>
                <item name="wcf.acp.option.cache_source_memcached_host"><![CDATA[Memcached-Server]]></item>
                <item name="wcf.acp.option.cache_source_memcached_host.description"><![CDATA[One server per line, you can additionally specify a weight factor to allow load balancing, for example “localhost:11211:67” or “10.0.13.37:31337:33”.]]></item>
 +              <item name="wcf.acp.option.cache_source_redis_host"><![CDATA[Redis-Server]]></item>
 +              <item name="wcf.acp.option.cache_source_redis_host.description"><![CDATA[The server’s address, for example “localhost” or “10.0.13.37:1337”.]]></item>
                <item name="wcf.acp.option.cache_source_type"><![CDATA[Caching Method]]></item>
                <item name="wcf.acp.option.cache_source_type.description"><![CDATA[Caching methods different from “Filesystem” require special extensions or services running on your machine.]]></item>
                <item name="wcf.acp.option.cache_source_type.disk"><![CDATA[Filesystem (default)]]></item>
                <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.mail_admin_address"><![CDATA[Administrator]]></item>
-               <item name="wcf.acp.option.mail_admin_address.description"><![CDATA[Administrator’s email address]]></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>
                <item name="wcf.acp.option.mail_from_address"><![CDATA[Sender Email]]></item>
-               <item name="wcf.acp.option.mail_from_address.description"><![CDATA[Email used as a sender for all generated emails]]></item>
+               <item name="wcf.acp.option.mail_from_address.description"><![CDATA[The email address used by the sender for all generated emails.]]></item>
                <item name="wcf.acp.option.mail_from_name"><![CDATA[Sender Name]]></item>
-               <item name="wcf.acp.option.mail_from_name.description"><![CDATA[Sender name used for all generated emails]]></item>
+               <item name="wcf.acp.option.mail_from_name.description"><![CDATA[The name of the sender used for all generated emails.]]></item>
                <item name="wcf.acp.option.mail_send_method"><![CDATA[Send Method]]></item>
                <item name="wcf.acp.option.mail_send_method.debug"><![CDATA[Debug]]></item>
                <item name="wcf.acp.option.mail_send_method.php"><![CDATA[PHP]]></item>
                <item name="wcf.acp.option.mail_send_method.smtp"><![CDATA[SMTP]]></item>
                <item name="wcf.acp.option.mail_signature"><![CDATA[Signature]]></item>
-               <item name="wcf.acp.option.mail_signature.description"><![CDATA[Signature will be appended to every message.]]></item>
+               <item name="wcf.acp.option.mail_signature.description"><![CDATA[The signature that will be appended to every message.]]></item>
                <item name="wcf.acp.option.mail_smtp_host"><![CDATA[SMTP Server]]></item>
 -              <item name="wcf.acp.option.mail_smtp_password"><![CDATA[SMTP Password]]></item>
                <item name="wcf.acp.option.mail_smtp_port"><![CDATA[SMTP Port]]></item>
 +              <item name="wcf.acp.option.mail_smtp_starttls"><![CDATA[SMTP Encryption]]></item>
 +              <item name="wcf.acp.option.mail_smtp_starttls.none"><![CDATA[Disabled]]></item>
 +              <item name="wcf.acp.option.mail_smtp_starttls.may"><![CDATA[If supported]]></item>
 +              <item name="wcf.acp.option.mail_smtp_starttls.encrypt"><![CDATA[Required]]></item>
 +              <item name="wcf.acp.option.mail_smtp_starttls.description"><![CDATA[This option controls the usage of “STARTTLS”. Disable it, if you are using SSL (port 465)!]]></item>
                <item name="wcf.acp.option.mail_smtp_user"><![CDATA[SMTP Username]]></item>
 +              <item name="wcf.acp.option.mail_smtp_password"><![CDATA[SMTP Password]]></item>
                <item name="wcf.acp.option.mail_use_f_param"><![CDATA[Use “-f” parameter]]></item>
 -              <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[Some servers require the “-f” parameter to send emails. Enable this option if you have any trouble sending emails.]]></item>
 -              <item name="wcf.acp.option.mail_use_formatted_address"><![CDATA[Use formatted email address]]></item>
 -              <item name="wcf.acp.option.mail_use_formatted_address.description"><![CDATA[Sender and receiver addresses will be converted into “Name &lt;email@example.com&gt;”. This option is not supported by most mail-servers, try turning it off if you experience any issues.]]></item>
 +              <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[The “-f” parameter sets the proper sender of the email if the PHP send method is used. This parameter may not be supported by every server. Try disabling it, if you have trouble sending emails.]]></item>
                <item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
                <item name="wcf.acp.option.meta_keywords"><![CDATA[Meta Keywords]]></item>
                <item name="wcf.acp.option.module_master_password"><![CDATA[Enable master password]]></item>
                <item name="wcf.acp.option.users_online_default_sort_field"><![CDATA[Default Sort Field]]></item>
                <item name="wcf.acp.option.users_online_default_sort_order"><![CDATA[Default Sort Order]]></item>
                <item name="wcf.acp.option.users_online_page_refresh"><![CDATA[Refresh Page Every]]></item>
 -              <item name="wcf.acp.option.users_online_page_refresh.description"><![CDATA[Page will be periodically refreshed. [time in seconds, 0 to disable]]]></item>
 +              <item name="wcf.acp.option.users_online_page_refresh.description"><![CDATA[Page will be periodically refreshed. [0 to disable]]]></item>
                <item name="wcf.acp.option.users_online_record_no_guests"><![CDATA[Exclude guests from the most-online record]]></item>
-               <item name="wcf.acp.option.user_cleanup_notification_lifetime"><![CDATA[Notification]]></item>
-               <item name="wcf.acp.option.user_cleanup_notification_lifetime.description"><![CDATA[Notifications will be discarded if they are older than the given period.]]></item>
+               <item name="wcf.acp.option.user_cleanup_notification_lifetime"><![CDATA[Notifications]]></item>
+               <item name="wcf.acp.option.user_cleanup_notification_lifetime.description"><![CDATA[Notifications will be discarded if they are older than the given period. [time in days]]]></item>
                <item name="wcf.acp.option.user_cleanup_activity_event_lifetime"><![CDATA[Recent Activity]]></item>
 -              <item name="wcf.acp.option.user_cleanup_activity_event_lifetime.description"><![CDATA[Activities will be discarded if they are older than the given period. [time in days]]]></item>
 +              <item name="wcf.acp.option.user_cleanup_activity_event_lifetime.description"><![CDATA[Activities will be discarded if they are older than the given period.]]></item>
                <item name="wcf.acp.option.user_cleanup_profile_visitor_lifetime"><![CDATA[Profile Visitors]]></item>
 -              <item name="wcf.acp.option.user_cleanup_profile_visitor_lifetime.description"><![CDATA[Profile visitors will be discarded if they are older than the given period. [time in days]]]></item>
 +              <item name="wcf.acp.option.user_cleanup_profile_visitor_lifetime.description"><![CDATA[Profile visitors will be discarded if they are older than the given period.]]></item>
                <item name="wcf.acp.option.recent_activity_items"><![CDATA[Number of Entries]]></item>
                <item name="wcf.acp.option.recent_activity_sidebar_items"><![CDATA[Number of Entries]]></item>
-               <item name="wcf.acp.option.category.message.general.likes"><![CDATA[Like System]]></item>
-               <item name="wcf.acp.option.module_like"><![CDATA[Like system]]></item>
+               <item name="wcf.acp.option.category.message.general.likes"><![CDATA[Likes System]]></item>
+               <item name="wcf.acp.option.module_like"><![CDATA[Likes System]]></item>
                <item name="wcf.acp.option.like_allow_for_own_content"><![CDATA[Users can like their own content]]></item>
                <item name="wcf.acp.option.like_enable_dislike"><![CDATA[Users can dislike content]]></item>
                <item name="wcf.acp.option.like_show_summary"><![CDATA[Show like summary]]></item>
@@@ -1273,27 -1294,17 +1274,27 @@@ GmbH=Gesellschaft mit beschränkter Haf
                <item name="wcf.acp.rebuildData"><![CDATA[Rebuild Data]]></item>
                <item name="wcf.acp.rebuildData.description"><![CDATA[In order to ensure consistency, e.g. after a data import, it is highly recommended to perform all the actions below in their respective order, starting from top to bottom.]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.user"><![CDATA[Rebuild Users]]></item>
-               <item name="wcf.acp.rebuildData.com.woltlab.wcf.user.description"><![CDATA[Rebuilds user counters and ranks]]></item>
+               <item name="wcf.acp.rebuildData.com.woltlab.wcf.user.description"><![CDATA[Rebuilds the user counters and ranks.]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.like"><![CDATA[Rebuild Likes]]></item>
-               <item name="wcf.acp.rebuildData.com.woltlab.wcf.like.description"><![CDATA[Synchronizes activity points]]></item>
+               <item name="wcf.acp.rebuildData.com.woltlab.wcf.like.description"><![CDATA[Recalculates the activity points.]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.like.user"><![CDATA[Rebuild Like-Users]]></item>
-               <item name="wcf.acp.rebuildData.com.woltlab.wcf.like.user.description"><![CDATA[Rebuilds the list of like users]]></item>
+               <item name="wcf.acp.rebuildData.com.woltlab.wcf.like.user.description"><![CDATA[Rebuilds the users using the Likes System.]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.attachment"><![CDATA[Rebuild Attachments]]></item>
-               <item name="wcf.acp.rebuildData.com.woltlab.wcf.attachment.description"><![CDATA[Rebuilds attachment preview images]]></item>
+               <item name="wcf.acp.rebuildData.com.woltlab.wcf.attachment.description"><![CDATA[Rebuilds the attachment preview images.]]></item>
                <item name="wcf.acp.rebuildData.com.woltlab.wcf.statDaily"><![CDATA[Rebuild Statistics]]></item>
-               <item name="wcf.acp.rebuildData.com.woltlab.wcf.statDaily.description"><![CDATA[Rebuilds the daily statistics]]></item>
+               <item name="wcf.acp.rebuildData.com.woltlab.wcf.statDaily.description"><![CDATA[Rebuilds the daily statistics.]]></item>
        </category>
        
 +      <category name="wcf.acp.rescueMode">
 +              <item name="wcf.acp.rescueMode"><![CDATA[Rescue Mode]]></item>
 +              <item name="wcf.acp.rescueMode.application"><![CDATA[Installed Applications]]></item>
 +              <item name="wcf.acp.rescueMode.application.description"><![CDATA[Please adjust both domain and path for each application listed below to match the changed settings. The domain must be provided without an explicit protocol such as “http://” or “https://”.]]></item>
 +              <item name="wcf.acp.rescueMode.credentials"><![CDATA[Credentials]]></item>
 +              <item name="wcf.acp.rescueMode.credentials.description"><![CDATA[Changes to the configuration require valid credentials of an administrator with the permissions to manage installed applications.]]></item>
 +              <item name="wcf.acp.rescueMode.description"><![CDATA[The configured domains and/or paths do not match the address used to access this page. This can happen when moving to a new domain or changing the directory structure. Please use the form below to provide the new values.]]></item>
 +              <item name="wcf.acp.rescueMode.username.notAuthorized"><![CDATA[This user is not authorized to manage installed applications.]]></item>
 +      </category>
 +      
        <category name="wcf.acp.search">
                <item name="wcf.acp.search.noResults"><![CDATA[No results]]></item>
                <item name="wcf.acp.search.provider.com.woltlab.wcf.menuItem"><![CDATA[ACP Menu]]></item>
@@@ -2498,32 -2404,8 +2501,32 @@@ Errors are
                <item name="wcf.moderation.report"><![CDATA[Report]]></item>
                <item name="wcf.moderation.report.alreadyReported"><![CDATA[This content has already been reported.]]></item>
                <item name="wcf.moderation.report.details"><![CDATA[Information]]></item>
 +              <item name="wcf.moderation.report.notification.comment.mail"><![CDATA[{if !$author->userID}a guest{else}{@$author->username}{/if} wrote a comment on the report "{$moderationQueue->getTitle()}":
 +{if $notificationType == 'instant'}
 +---------------------------------
 +{@$comment->message} 
 +---------------------------------
 +{/if}{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.report.notification.comment.mail.stacked"><![CDATA[{if $count < 4}{@$authors[0]->username}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->username}{if $count == 3} and {@$authors[2]->username}{/if}{/if}{else}{@$authors[0]->username} and {#$others} other users{/if} wrote comments on the report "{$moderationQueue->getTitle()}":
 +{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.report.notification.comment.message"><![CDATA[{if !$author->userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a> waiting for approval.]]></item>
 +              <item name="wcf.moderation.report.notification.comment.message.stacked"><![CDATA[{if $count < 4}{@$authors[0]->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 <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a>.]]></item>
 +              <item name="wcf.moderation.report.notification.comment.title"><![CDATA[New comment (Report)]]></item>
 +              <item name="wcf.moderation.report.notification.comment.title.stacked"><![CDATA[{#$timesTriggered} new comments (Report)]]></item>
 +              <item name="wcf.moderation.report.notification.commentResponse.mail"><![CDATA[{if !$author->userID}a guest{else}{@$author->username}{/if} wrote a reply to {@$commentAuthor->username}’s comment on the report "{$moderationQueue->getTitle()}":
 +{if $notificationType == 'instant'}
 +---------------------------------
 +{@$response->message} 
 +---------------------------------
 +{/if}{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.report.notification.commentResponse.mail.stacked"><![CDATA[{if $count < 4}{@$authors[0]->username}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->username}{if $count == 3} and {@$authors[2]->username}{/if}{/if}{else}{@$authors[0]->username} and {#$others} other users{/if} wrote replies to comments on the report "{$moderationQueue->getTitle()}":
 +{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.report.notification.commentResponse.message"><![CDATA[{if !$author->userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a reply to a comment by {if $commentAuthor->userID}<a href="{link controller='User' object=$commentAuthor}{/link}" class="userLink" data-user-id="{@$commentAuthor->userID}">{$commentAuthor->username}</a>{else}{$commentAuthor->username}{/if} on the report <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a>.]]></item>
 +              <item name="wcf.moderation.report.notification.commentResponse.message.stacked"><![CDATA[{if $count < 4}{@$authors[0]->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 <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a>.]]></item>
 +              <item name="wcf.moderation.report.notification.commentResponse.title"><![CDATA[New reply (Report)]]></item>
 +              <item name="wcf.moderation.report.notification.commentResponse.title.stacked"><![CDATA[{#$timesTriggered} new replies (Report)]]></item>
                <item name="wcf.moderation.report.reason"><![CDATA[Reason]]></item>
-               <item name="wcf.moderation.report.reason.description"><![CDATA[This function is reserved for: Spam, Advertisement and other questionable (racism, glorification of violence, offending or sexist) content]]></item>
+               <item name="wcf.moderation.report.reason.description"><![CDATA[This function is reserved for: Spam, Advertisement and other questionable (racism, glorification of violence, offending, or sexist) content.]]></item>
                <item name="wcf.moderation.report.removeContent"><![CDATA[Delete Reported Content]]></item>
                <item name="wcf.moderation.report.removeContent.confirmMessage"><![CDATA[Do you really want to delete the reported content?]]></item>
                <item name="wcf.moderation.report.removeContent.reason"><![CDATA[Reason (optional)]]></item>