Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sat, 21 May 2016 07:15:56 +0000 (09:15 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 21 May 2016 07:15:56 +0000 (09:15 +0200)
1  2 
wcfsetup/install.php
wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
wcfsetup/install/files/js/WCF.Location.js
wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql

Simple merge
index a7aaaa8d1cd700b1855bd8fa24d13cbbcfddbf66,03aa41a471508e04cca11f438ac824a7f932b585..5d1f23c13de5e701310a31afb947f36cd09e69c9
        <p class="success">{lang}wcf.global.success.{@$action}{/lang}</p>
  {/if}
  
 -<div class="contentNavigation">
 -      <nav>
 -              <ul>
 -                      <li><a href="{link controller='UserGroupAssignmentList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.group.assignment.button.list{/lang}</span></a></li>
 -                      
 -                      {event name='contentNavigationButtons'}
 -              </ul>
 -      </nav>
 -</div>
 -
  <form method="post" action="{if $action == 'add'}{link controller='UserGroupAssignmentAdd'}{/link}{else}{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}{/if}">
 -      <div class="container containerPadding marginTop">
 -              <fieldset>
 -                      <legend>{lang}wcf.global.form.data{/lang}</legend>
 -                      
 -                      <dl{if $errorField == 'title'} class="formError"{/if}>
 -                              <dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
 -                              <dd>
 -                                      <input type="text" id="title" name="title" value="{$title}" class="long" />
 -                                      {if $errorField == 'title'}
 -                                              <small class="innerError">
 -                                                      {if $errorType == 'empty'}
 -                                                              {lang}wcf.global.form.error.empty{/lang}
 -                                                      {else}
 -                                                              {lang}wcf.acp.group.assignment.title.error.{@$errorType}{/lang}
 -                                                      {/if}
 -                                              </small>
 -                                      {/if}
 -                              </dd>
 -                      </dl>
 -                      
 -                      <dl{if $errorField == 'groupID'} class="formError"{/if}>
 -                              <dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
 -                              <dd>
 -                                      {htmlOptions name='groupID' options=$userGroups selected=$groupID}
 -                                      {if $errorField == 'groupID'}
 -                                              {if $errorType == 'noValidSelection'}
 -                                                      <small class="innerError">{lang}wcf.global.form.error.noValidSelection{/lang}</small>
 +      <div class="section">
 +              <dl{if $errorField == 'title'} class="formError"{/if}>
 +                      <dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
 +                      <dd>
 +                              <input type="text" id="title" name="title" value="{$title}" class="long" />
 +                              {if $errorField == 'title'}
 +                                      <small class="innerError">
 +                                              {if $errorType == 'empty'}
 +                                                      {lang}wcf.global.form.error.empty{/lang}
                                                {else}
 -                                                      <small class="innerError">{lang}wcf.acp.group.assignment.groupID.error.{@$errorType}{/lang}</small>
 +                                                      {lang}wcf.acp.group.assignment.title.error.{@$errorType}{/lang}
                                                {/if}
-                                       <small class="innerError">{lang}wcf.acp.group.assignment.groupID.error.{@$errorType}{/lang}</small>
 +                                      </small>
 +                              {/if}
 +                      </dd>
 +              </dl>
 +              
 +              <dl{if $errorField == 'groupID'} class="formError"{/if}>
 +                      <dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
 +                      <dd>
 +                              {htmlOptions name='groupID' options=$userGroups selected=$groupID}
 +                              {if $errorField == 'groupID'}
 -                              </dd>
 -                      </dl>
 -                      
 -                      <dl class="formError">
 -                              <dt></dt>
 -                              <dd>
 -                                      <label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
 -                              </dd>
 -                      </dl>
 -                      
 -                      {event name='dataFields'}
 -              </fieldset>
++                                      {if $errorType == 'noValidSelection'}
++                                              <small class="innerError">{lang}wcf.global.form.error.noValidSelection{/lang}</small>
++                                      {else}
++                                              <small class="innerError">{lang}wcf.acp.group.assignment.groupID.error.{@$errorType}{/lang}</small>
+                                       {/if}
 +                              {/if}
 +                      </dd>
 +              </dl>
 +              
 +              <dl class="formError">
 +                      <dt></dt>
 +                      <dd>
 +                              <label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
 +                      </dd>
 +              </dl>
                
 -              {event name='fieldsets'}
 +              {event name='dataFields'}
        </div>
        
 -      <header class="boxHeadline boxSubHeadline">
 -              <h2>{lang}wcf.acp.group.assignment.conditions{/lang}</h2>
 -              <small>{lang}wcf.acp.group.assignment.conditions.description{/lang}</small>
 -      </header>
 -      
 -      {if $errorField == 'conditions'}
 -              <p class="error">{lang}wcf.acp.group.assignment.error.noConditions{/lang}</p>
 -      {/if}
 +      {event name='sections'}
        
 -      {include file='userConditions'}
 +      <section class="section">
 +              <header class="sectionHeader">
 +                      <h2 class="sectionTitle">{lang}wcf.acp.group.assignment.conditions{/lang}</h2>
 +                      <small class="sectionDescription">{lang}wcf.acp.group.assignment.conditions.description{/lang}</small>
 +              </header>
 +              
 +              {if $errorField == 'conditions'}
 +                      <p class="error">{lang}wcf.acp.group.assignment.error.noConditions{/lang}</p>
 +              {/if}
 +              
 +              {include file='userConditions'}
 +      </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index abcd54378fc6259ab2f0a4e56299d24336f39909,0283e3910cbb7e4408c566b34d1002f62704c358..99953b4a1aec06a5ca9980ffdf535a9c188ad338
@@@ -226,10 -226,9 +226,9 @@@ class MySQLDatabaseEditor extends Datab
         * 
         * @param       string          $indexName
         * @param       array           $indexData
 -       * @param       string
 +       * @return      string
         */
        protected function buildIndexDefinition($indexName, $indexData) {
-               $definition = "";
                // index type
                if ($indexData['type'] == 'PRIMARY') $definition = "PRIMARY KEY";
                else if ($indexData['type'] == 'UNIQUE') $definition = "UNIQUE KEY";
Simple merge
index de37302ca825753edaa01baf286b88da94597dc7,d9906097d47c62d5b98859fcb53ca90541f9e683..08208993bef0df5222206d940fc92b3ec9e40183
@@@ -342,7 -348,8 +342,7 @@@ Examples for medium ID detection
                <item name="wcf.acp.group.option.user.message.canUseHtml"><![CDATA[Can use HTML]]></item>
                <item name="wcf.acp.group.option.user.message.canUseBBCodes"><![CDATA[Can use BBCodes]]></item>
                <item name="wcf.acp.group.option.user.message.allowedBBCodes"><![CDATA[Allowed BBCodes]]></item>
-               <item name="wcf.acp.group.option.user.message.allowedBBCodes.description"><![CDATA[Selected BBCodes may be used by members of this group.]]></item>
+               <item name="wcf.acp.group.option.user.message.allowedBBCodes.description"><![CDATA[All selected BBCodes can be used by the users of this user group.]]></item>
 -              <item name="wcf.acp.group.option.admin.content.dashboard.canEditDashboard"><![CDATA[Can manage dashboard boxes]]></item>
                <item name="wcf.acp.group.option.admin.user.rank.canManageRank"><![CDATA[Can manage user ranks]]></item>
                <item name="wcf.acp.group.option.admin.user.canEditActivityPoints"><![CDATA[Can manage activity points]]></item>
                <item name="wcf.acp.group.option.admin.user.canViewInvisible"><![CDATA[Can see invisible users]]></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.noticeUseHtml.description"><![CDATA[]]></item>
                <item name="wcf.acp.notice.resetIsDismissed"><![CDATA[Dismissed notices will be displayed again.]]></item>
                <item name="wcf.acp.notice.resetIsDismissed.description"><![CDATA[The notice will be displayed again to users who dismissed the previous version. Guests who dismissed the notice will only see it in a new session.]]></item>
                <item name="wcf.acp.notice.showOrder"><![CDATA[Display Order]]></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-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"><![CDATA[Administrator’s 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"><![CDATA[Sender’s Email]]></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"><![CDATA[Sender’s Name]]></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"><![CDATA[Sender’s Signature]]></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_order"><![CDATA[Sort Order]]></item>
                <item name="wcf.acp.option.users_online_default_sort_order.description"><![CDATA[The default sort order for the “Users Online” list.]]></item>
                <item name="wcf.acp.option.users_online_page_refresh"><![CDATA[Refresh Page]]></item>
-               <item name="wcf.acp.option.users_online_page_refresh.description"><![CDATA[“Users Online” will be refreshed in the selected seconds. Use 0 to disable.]]></item>
+               <item name="wcf.acp.option.users_online_page_refresh.description"><![CDATA[“Users Online” will be refreshed in the following seconds. Use 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[Notifications]]></item>
-               <item name="wcf.acp.option.user_cleanup_notification_lifetime.description"><![CDATA[Notifications will be removed after the selected days.]]></item>
+               <item name="wcf.acp.option.user_cleanup_notification_lifetime.description"><![CDATA[Notifications will be removed after the following 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[Recent Activities will be removed after the selected days.]]></item>
+               <item name="wcf.acp.option.user_cleanup_activity_event_lifetime.description"><![CDATA[Recent Activities will be removed after the following days.]]></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 removed after the selected days.]]></item>
+               <item name="wcf.acp.option.user_cleanup_profile_visitor_lifetime.description"><![CDATA[Profile Visitors will be removed after the following days.]]></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[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>
+               <item name="wcf.acp.option.like_show_summary"><![CDATA[Display like summary]]></item>
                <item name="wcf.acp.option.module_user_profile_wall"><![CDATA[User profile wall]]></item>
                <item name="wcf.acp.option.category.message.sidebar"><![CDATA[Sidebar]]></item>
-               <item name="wcf.acp.option.message_sidebar_enable_online_status"><![CDATA[Show online status]]></item>
-               <item name="wcf.acp.option.message_sidebar_enable_likes_received"><![CDATA[Show author’s likes received]]></item>
-               <item name="wcf.acp.option.message_sidebar_enable_activity_points"><![CDATA[Show author’s activity points]]></item>
-               <item name="wcf.acp.option.message_sidebar_user_options"><![CDATA[Show Selected Author Profile Fields]]></item>
 -              <item name="wcf.acp.option.message_sidebar_enable_avatar"><![CDATA[Display avatar]]></item>
+               <item name="wcf.acp.option.message_sidebar_enable_online_status"><![CDATA[Display online status]]></item>
 -              <item name="wcf.acp.option.message_sidebar_enable_rank"><![CDATA[Display user rank]]></item>
 -              <item name="wcf.acp.option.message_sidebar_enable_message_group_starter_icon"><![CDATA[Highlight thread starter]]></item>
+               <item name="wcf.acp.option.message_sidebar_enable_likes_received"><![CDATA[Display author’s likes received]]></item>
+               <item name="wcf.acp.option.message_sidebar_enable_activity_points"><![CDATA[Display author’s activity points]]></item>
+               <item name="wcf.acp.option.message_sidebar_user_options"><![CDATA[Display Selected Author Profile Fields]]></item>
                <item name="wcf.acp.option.module_tagging"><![CDATA[Tags]]></item>
                <item name="wcf.acp.option.module_tagging.description"><![CDATA[Enables the use of tags for content.]]></item>
                <item name="wcf.acp.option.tagging_max_tag_length"><![CDATA[Maximum Length of a Tag]]></item>
@@@ -1007,9 -1018,11 +1010,9 @@@ GmbH=Gesellschaft mit beschränkter Haf
                <item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Enable Zoom by Double-Clicking]]></item>
                <item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Default Map Position (Latitude)]]></item>
                <item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Default Map Position (Longitude)]]></item>
-               <item name="wcf.acp.option.google_maps_access_user_location"><![CDATA[Use Current User Location]]></item>
+               <item name="wcf.acp.option.google_maps_access_user_location"><![CDATA[Use current user location]]></item>
                <item name="wcf.acp.option.google_maps_access_user_location.description"><![CDATA[When entering a location, the current location of the user is used as start point on the map.]]></item>
-               <item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[Apply “Users Online” markings for usernames]]></item>
+               <item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[Apply the “Users Online” marking for usernames]]></item>
 -              <item name="wcf.acp.option.module_privacy_policy_page"><![CDATA[Enable Privacy Policy Page]]></item>
 -              <item name="wcf.acp.option.module_privacy_policy_page.description"><![CDATA[Inform users regarding the use of their personal data.]]></item>
                <item name="wcf.acp.option.module_cookie_policy_page"><![CDATA[Enable explanation on “Cookie Usage”]]></item>
                <item name="wcf.acp.option.module_cookie_policy_page.description"><![CDATA[Displays a notice on cookie usage according to EU Directive 2009/136/EG upon first visit.]]></item>
                <item name="wcf.acp.option.url_omit_index_php"><![CDATA[Enable URL-Rewrite]]></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[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[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.user_authentication_failure_expiration.description"><![CDATA[Failed login attempt logs will be removed after the following 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>
                <item name="wcf.acp.option.paypal_email_address.description"><![CDATA[Receiving payments requires a PayPal business account with enabled “Instant Payment Notification” (IPN).]]></item>
                <item name="wcf.acp.option.module_paid_subscription"><![CDATA[Enable paid subscriptions]]></item>
                <item name="wcf.acp.option.module_paid_subscription.description"><![CDATA[Enables the <a href="{link controller='PaidSubscriptionList'}{/link}">management for paid subscriptions</a>.]]></item>
-               <item name="wcf.acp.option.paid_subscription_enable_tos_confirmation"><![CDATA[Users are required to accept your Terms of Service prior to any purchase]]></item>
+               <item name="wcf.acp.option.paid_subscription_enable_tos_confirmation"><![CDATA[Users are required to accept your Terms of Service before purchasing]]></item>
                <item name="wcf.acp.option.paid_subscription_tos_url"><![CDATA[Terms of Service URL]]></item>
                <item name="wcf.acp.option.category.general.payment.paidSubscription"><![CDATA[Paid Subscriptions]]></item>
 +              <item name="wcf.acp.option.suffix.days"><![CDATA[Days]]></item>
 +              <item name="wcf.acp.option.suffix.minutes"><![CDATA[Minutes]]></item>
 +              <item name="wcf.acp.option.suffix.pixel"><![CDATA[Pixel]]></item>
 +              <item name="wcf.acp.option.suffix.seconds"><![CDATA[Seconds]]></item>
 +              <item name="wcf.acp.option.suffix.years"><![CDATA[Years]]></item>
 +              <item name="wcf.acp.option.type.boolean.never"><![CDATA[Never]]></item>
 +              <item name="wcf.acp.option.type.boolean.no"><![CDATA[No]]></item>
 +              <item name="wcf.acp.option.type.boolean.yes"><![CDATA[Yes]]></item>
        </category>
        
        <category name="wcf.acp.package">
                <item name="wcf.acp.user.merge.destination.description"><![CDATA[The selected users will be merged into this user account.]]></item>
                <item name="wcf.acp.user.merge.markedUsers"><![CDATA[Merge the following users]]></item>
                <item name="wcf.acp.user.revertChanges"><![CDATA[Revert Changes To Contents]]></item>
-               <item name="wcf.acp.user.revertChanges.timeframe"><![CDATA[Time Frame]]></item>
+               <item name="wcf.acp.user.revertChanges.timeframe"><![CDATA[Time Period]]></item>
                <item name="wcf.acp.user.revertChanges.timeframe.description"><![CDATA[Changes made in this time frame will be reverted to the newest version that is either older than the given timeframe or made by an unrelated user [time in days]]]></item>
                <item name="wcf.acp.user.revertChanges.markedUsers"><![CDATA[Revert changes by the following users]]></item>
 -              <item name="wcf.acp.user.bulkProcessing"><![CDATA[Bulk Processing]]></item>
 -              <item name="wcf.acp.user.bulkProcessing.action"><![CDATA[Actions]]></item>
 -              <item name="wcf.acp.user.bulkProcessing.conditions"><![CDATA[Conditions]]></item>
 -              <item name="wcf.acp.user.bulkProcessing.success"><![CDATA[Executed action affected {#$affectedUsers} user{if $affectedUsers != 1}s{/if}.]]></item>
 -              <item name="wcf.acp.user.bulkProcessing.warning"><![CDATA[Heads up! The bulk processing executes all actions below without any further confirmation prompt!]]></item>
                <item name="wcf.acp.user.search"><![CDATA[Search Users]]></item>
                <item name="wcf.acp.user.search.conditions.general"><![CDATA[General]]></item>
                <item name="wcf.acp.user.search.conditions.profile"><![CDATA[Profile]]></item>
                <item name="wcf.acp.user.search.matches"><![CDATA[{#$items} result{if $items != 1}s{/if}]]></item>
                <item name="wcf.acp.user.sendMail"><![CDATA[Send email to users]]></item>
                <item name="wcf.acp.user.sendMail.all"><![CDATA[Send email to all users]]></item>
-               <item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[Enable HTML for email]]></item>
-               <item name="wcf.acp.user.sendMail.from"><![CDATA[Sender Email]]></item>
+               <item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[Enable HTML code in email message]]></item>
 -              <item name="wcf.acp.user.sendMail.enableHTML.description"><![CDATA[]]></item>
+               <item name="wcf.acp.user.sendMail.from"><![CDATA[Sender’s Email]]></item>
 -              <item name="wcf.acp.user.sendMail.from.description"><![CDATA[Specify the sender’s email address.{if MAIL_USE_FORMATTED_ADDRESS} It is possible to use the following format:{/if}<br />
 -{if MAIL_USE_FORMATTED_ADDRESS}<em>Sender Name &lt;email@example.com&gt;</em><br />{/if}
 +              <item name="wcf.acp.user.sendMail.from.description"><![CDATA[Specify the sender’s email address.<br />
  You can define the default sender in <em>System -&gt; Options -&gt; General -&gt; Emails</em>. The sender’s email must be known to the server if using SMTP, otherwise it would be rejected.]]></item>
                <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.option.editable.1"><![CDATA[Owner]]></item>
                <item name="wcf.acp.user.option.editable.2"><![CDATA[Administrator]]></item>
                <item name="wcf.acp.user.option.editable.3"><![CDATA[Owner and Administrator]]></item>
 +              <item name="wcf.acp.user.option.editable.6"><![CDATA[Owner during registration and Administrator]]></item>
                <item name="wcf.acp.user.option.optionType"><![CDATA[Option Type]]></item>
                <item name="wcf.acp.user.option.optionType.description"><![CDATA[Option names usually equal the HTML-tag used as input element.]]></item>
-               <item name="wcf.acp.user.option.askDuringRegistration"><![CDATA[Field will be visible during registration.]]></item>
-               <item name="wcf.acp.user.option.required"><![CDATA[Owner must provide a valid value.]]></item>
+               <item name="wcf.acp.user.option.askDuringRegistration"><![CDATA[Field will be visible during registration]]></item>
+               <item name="wcf.acp.user.option.required"><![CDATA[Owner must provide a valid value]]></item>
                <item name="wcf.acp.user.option.searchable"><![CDATA[Field values are searchable in the member search]]></item>
                <item name="wcf.acp.user.option.selectOptions"><![CDATA[Select Options]]></item>
                <item name="wcf.acp.user.option.selectOptions.description"><![CDATA[One select option per line, e.g. for use with a select-box. Note: The left hand side of a colon is used as an internal identifier. It allows you to change the text of the option without invalidating former selections.]]></item>
@@@ -2219,10 -2231,9 +2222,10 @@@ Errors are
                <item name="wcf.global.worker.executing"><![CDATA[Executing …]]></item>
                <item name="wcf.global.filter"><![CDATA[Filter]]></item>
                <item name="wcf.global.noItems"><![CDATA[There are no items.]]></item>
-               <item name="wcf.global.button.showAll"><![CDATA[Show All]]></item>
+               <item name="wcf.global.button.showAll"><![CDATA[Display All]]></item>
                <item name="wcf.global.reason"><![CDATA[Reason]]></item>
                <item name="wcf.global.settings"><![CDATA[Settings]]></item>
 +              <item name="wcf.global.search"><![CDATA[Search]]></item>
        </category>
        
        <category name="wcf.global.form">
                <item name="wcf.moderation.lastChangeTime"><![CDATA[Last Change]]></item>
                <item name="wcf.moderation.markAllAsRead.confirmMessage"><![CDATA[Do you really want to mark all entries as read?]]></item>
                <item name="wcf.moderation.moderation"><![CDATA[Moderation]]></item>
-               <item name="wcf.moderation.noMoreItems"><![CDATA[No more items]]></item>
+               <item name="wcf.moderation.noMoreItems"><![CDATA[No more items.]]></item>
 +              <item name="wcf.moderation.notification.comment.mail"><![CDATA[{if !$author->userID}a guest{else}{@$author->username}{/if} wrote a comment on the moderation entry "{$moderationQueue->getTitle()}":
 +{if $notificationType == 'instant'}
 +---------------------------------
 +{@$comment->message} 
 +---------------------------------
 +{/if}{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.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 moderation entry "{$moderationQueue->getTitle()}":
 +{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.notification.comment.message"><![CDATA[{if !$author->userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on the moderation entry <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a>.]]></item>
 +              <item name="wcf.moderation.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 moderation entry <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a>.]]></item>
 +              <item name="wcf.moderation.notification.comment.title"><![CDATA[New comment (Moderation)]]></item>
 +              <item name="wcf.moderation.notification.comment.title.stacked"><![CDATA[{#$timesTriggered} new comments (Moderation)]]></item>
 +              <item name="wcf.moderation.notification.commentResponse.mail"><![CDATA[{if !$author->userID}a guest{else}{@$author->username}{/if} wrote a reply to {@$commentAuthor->username}’s comment on the moderation entry "{$moderationQueue->getTitle()}":
 +{if $notificationType == 'instant'}
 +---------------------------------
 +{@$response->message} 
 +---------------------------------
 +{/if}{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.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 moderation entry "{$moderationQueue->getTitle()}":
 +{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.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 moderation entry <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a>.]]></item>
 +              <item name="wcf.moderation.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()} and {#$others} other users{/if} wrote replies to comments on the moderation entry <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a>.]]></item>
 +              <item name="wcf.moderation.notification.commentResponse.title"><![CDATA[New reply (Moderation)]]></item>
 +              <item name="wcf.moderation.notification.commentResponse.title.stacked"><![CDATA[{#$timesTriggered} new replies (Moderation)]]></item>
                <item name="wcf.moderation.status"><![CDATA[Status]]></item>
                <item name="wcf.moderation.status.outstanding"><![CDATA[Pending]]></item>
                <item name="wcf.moderation.status.processing"><![CDATA[In Progress]]></item>
        <category name="wcf.moderation.activation">
                <item name="wcf.moderation.activation"><![CDATA[Approval]]></item>
                <item name="wcf.moderation.activation.details"><![CDATA[Information]]></item>
-               <item name="wcf.moderation.activation.content"><![CDATA[Content Awaiting Approval]]></item>
+               <item name="wcf.moderation.activation.content"><![CDATA[Content awaiting approval]]></item>
                <item name="wcf.moderation.activation.enableContent"><![CDATA[Approve]]></item>
                <item name="wcf.moderation.activation.enableContent.confirmMessage"><![CDATA[Do you really want to approve this content?]]></item>
 +              <item name="wcf.moderation.activation.notification.comment.mail"><![CDATA[{if !$author->userID}a guest{else}{@$author->username}{/if} wrote a comment on "{$moderationQueue->getTitle()}" waiting for approval:
 +{if $notificationType == 'instant'}
 +---------------------------------
 +{@$comment->message} 
 +---------------------------------
 +{/if}{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.activation.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 "{$moderationQueue->getTitle()}" waiting for approval:
 +{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.activation.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.activation.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 <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a> waiting for approval.]]></item>
 +              <item name="wcf.moderation.activation.notification.comment.title"><![CDATA[New comment (Approval)]]></item>
 +              <item name="wcf.moderation.activation.notification.comment.title.stacked"><![CDATA[{#$timesTriggered} new comments (Approval)]]></item>
 +              <item name="wcf.moderation.activation.notification.commentResponse.mail"><![CDATA[{if !$author->userID}a guest{else}{@$author->username}{/if} wrote a reply to {@$commentAuthor->username}’s comment on "{$moderationQueue->getTitle()}" waiting for approval:
 +{if $notificationType == 'instant'}
 +---------------------------------
 +{@$response->message} 
 +---------------------------------
 +{/if}{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.activation.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 "{$moderationQueue->getTitle()}" waiting for approval:
 +{$moderationQueue->getLink()}#comments]]></item>
 +              <item name="wcf.moderation.activation.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 <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a> waiting for approval.]]></item>
 +              <item name="wcf.moderation.activation.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()} and {#$others} other users{/if} wrote replies to comments on <a href="{@$moderationQueue->getLink()}">{$moderationQueue->getTitle()}</a> waiting for approval.]]></item>
 +              <item name="wcf.moderation.activation.notification.commentResponse.title"><![CDATA[New reply (Approval)]]></item>
 +              <item name="wcf.moderation.activation.notification.commentResponse.title.stacked"><![CDATA[{#$timesTriggered} new replies (Approval)]]></item>
                <item name="wcf.moderation.activation.removeContent"><![CDATA[Delete Content]]></item>
                <item name="wcf.moderation.activation.removeContent.confirmMessage"><![CDATA[Do you really want to delete this content?]]></item>
        </category>
@@@ -2816,7 -2808,7 +2819,7 @@@ You can change your password any time a
                *}{if REGISTER_PASSWORD_MUST_CONTAIN_SPECIAL_CHAR}{if REGISTER_PASSWORD_MUST_CONTAIN_LOWER_CASE || REGISTER_PASSWORD_MUST_CONTAIN_UPPER_CASE || REGISTER_PASSWORD_MUST_CONTAIN_DIGIT} and {/if}special chars{/if}{/if}.]]></item>
                <item name="wcf.user.changeUsername.success"><![CDATA[Username was changed.]]></item>
                <item name="wcf.user.changeEmail.success"><![CDATA[Email Address was changed.]]></item>
-               <item name="wcf.user.changeEmail.needReactivation"><![CDATA[Your new email address{if $newEmail|isset} (“{$newEmail}”){/if} must be verified first. You should’ve received an email sent to your new email address containing an activation link. Open the link to verify your new email address.]]></item>
 -              <item name="wcf.user.changeEmail.needReactivation"><![CDATA[Your new email address must be verified first. You should have received an email which was sent to your new email address containing an activation link. Open the link to verify your new email address.]]></item>
++              <item name="wcf.user.changeEmail.needReactivation"><![CDATA[Your new email address{if $newEmail|isset} (“{$newEmail}”){/if} must be verified first. You should have received an email sent to your new email address containing an activation link. Open the link to verify your new email address.]]></item>
                <item name="wcf.user.changeEmail.needReactivation.mail"><![CDATA[Dear {@$username},
  
  you’ve changed your email address on: {@PAGE_TITLE|language}. It is required to open the link below in order to verify this email address.
@@@ -2911,11 -2904,7 +2914,11 @@@ If you cannot activate your email addre
                <item name="wcf.user.panel.markAllAsRead"><![CDATA[Mark All as Read]]></item>
                <item name="wcf.user.panel.markAsRead"><![CDATA[Mark as Read]]></item>
                <item name="wcf.user.panel.settings"><![CDATA[Settings]]></item>
-               <item name="wcf.user.panel.showAll"><![CDATA[Show All]]></item>
+               <item name="wcf.user.panel.showAll"><![CDATA[Display All]]></item>
 +              <item name="wcf.user.boxList.description.activityPoints"><![CDATA[{#$boxUser->activityPoints} Point{if $boxUser->activityPoints != 1}s{/if}]]></item>
 +              <item name="wcf.user.boxList.description.likesReceived"><![CDATA[{#$boxUser->likesReceived} Like{if $boxUser->likesReceived != 1}s{/if}]]></item>
 +              <item name="wcf.user.boxList.description.registrationDate"><![CDATA[{@$boxUser->registrationDate|time}]]></item>
 +              <item name="wcf.user.mostOnlineUsers"><![CDATA[Most Online Users]]></item>
        </category>
        
        <category name="wcf.user.menu">
@@@ -3151,15 -3155,12 +3154,15 @@@ If you do not want to receive further e
                <item name="wcf.user.notification.markAllAsConfirmed"><![CDATA[Mark All as Read]]></item>
                <item name="wcf.user.notification.markAllAsConfirmed.confirmMessage"><![CDATA[Do you really want to mark all notifications as read?]]></item>
                <item name="wcf.user.notification.markAsConfirmed"><![CDATA[Mark as Read]]></item>
-               <item name="wcf.user.notification.noMoreNotifications"><![CDATA[No recent notifications]]></item>
+               <item name="wcf.user.notification.noMoreNotifications"><![CDATA[No recent notifications.]]></item>
                <item name="wcf.user.notification.noNotifications"><![CDATA[You have no notifications.]]></item>
                <item name="wcf.user.notification.notifications"><![CDATA[Notifications]]></item>
-               <item name="wcf.user.notification.showAll"><![CDATA[Show All Notifications]]></item>
 +              <item name="wcf.user.notification.notifications.description"><![CDATA[Email notifications may not be supported for every available notification]]></item>
 +              <item name="wcf.user.notification.notifications.disabled"><![CDATA[Disabled]]></item>
 +              <item name="wcf.user.notification.notifications.enabled"><![CDATA[Enabled]]></item>
+               <item name="wcf.user.notification.showAll"><![CDATA[Display All Notifications]]></item>
                <item name="wcf.user.notification.com.woltlab.wcf.user"><![CDATA[User Profiles]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.user.follow.following"><![CDATA[New follower]]></item>
+               <item name="wcf.user.notification.com.woltlab.wcf.user.follow.following"><![CDATA[Notify when I receive a new follower]]></item>
                <item name="wcf.user.notification.comment.title"><![CDATA[New Comment (Wall)]]></item>
                <item name="wcf.user.notification.comment.title.stacked"><![CDATA[{#$timesTriggered} new comments (Wall)]]></item>
                <item name="wcf.user.notification.comment.message"><![CDATA[{if !$author->userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on <a href="{link controller='User' object=$__wcf->getUser()}#wall{/link}">your wall</a>.]]></item>
  {/if}{link controller='User' object=$owner isEmail=true}#wall{/link}]]></item>
                <item name="wcf.user.notification.commentResponseOwner.mail.stacked"><![CDATA[{if $count < 4}{@$authors[0]->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}]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.notification.comment"><![CDATA[New comment on your wall]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.response.notification.commentResponse"><![CDATA[New reply to one of your comments]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.response.notification.commentResponseOwner"><![CDATA[New reply to a comment on your wall]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.like.notification.like"><![CDATA[Your comment was liked]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.response.like.notification.like"><![CDATA[Reply to your comment was liked]]></item>
+               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.notification.comment"><![CDATA[Notify when I receive new comments on my wall]]></item>
+               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.response.notification.commentResponse"><![CDATA[Notify when I receive new replies to my comments]]></item>
+               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.response.notification.commentResponseOwner"><![CDATA[Notify when I receive new replies to comments on my wall]]></item>
+               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.like.notification.like"><![CDATA[Notify when my comments are liked]]></item>
+               <item name="wcf.user.notification.com.woltlab.wcf.user.profileComment.response.like.notification.like"><![CDATA[Notify when replies to my comments are liked]]></item>
 +              
 +              <item name="wcf.user.notification.com.woltlab.wcf.moderation"><![CDATA[Moderation]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.moderation.queue.notification.comment"><![CDATA[New comment in moderation]]></item>
-               <item name="wcf.user.notification.com.woltlab.wcf.moderation.queue.response.notification.commentResponse"><![CDATA[New reply to a comment in moderation]]></item>
++              <item name="wcf.user.notification.com.woltlab.wcf.moderation.queue.notification.comment"><![CDATA[Notify when new comments are written in moderation]]></item>
++              <item name="wcf.user.notification.com.woltlab.wcf.moderation.queue.response.notification.commentResponse"><![CDATA[Notify when new replies to comments are written in moderation]]></item>
        </category>
        
        <category name="wcf.user.profile">
Simple merge