diff --git a/.eslintignore b/.eslintignore
index 47d86595d9..a520c62c91 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -7,7 +7,7 @@ app/assets/javascripts/vendor.js
 app/assets/javascripts/locales/i18n.js
 app/assets/javascripts/defer/html-sanitizer-bundle.js
 app/assets/javascripts/ember-addons/
-app/assets/javascripts/admin/lib/autosize.js.es6
+app/assets/javascripts/discourse/lib/autosize.js.es6
 lib/javascripts/locale/
 lib/javascripts/messageformat.js
 lib/javascripts/moment.js
diff --git a/.gitignore b/.gitignore
index 3bdbb95c84..95d44c86f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,9 @@ log/
 # Ignore Eclipse .buildpath file
 /.buildpath
 
+# Ignore byebug history
+/.byebug_history
+
 # Ignore RubyMine settings
 /.idea
 
diff --git a/Gemfile b/Gemfile
index 8d2f214737..74c6d6a99f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem 'aws-sdk', require: false
 gem 'excon', require: false
 gem 'unf', require: false
 
-gem 'email_reply_trimmer', '0.1.1'
+gem 'email_reply_trimmer', '0.1.2'
 
 # note: for image_optim to correctly work you need to follow
 # https://github.com/toy/image_optim
diff --git a/Gemfile.lock b/Gemfile.lock
index 1bfaa7ae12..d21aedc8e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,38 +1,38 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
-      actionview (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activejob (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.5.2)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -76,7 +76,7 @@ GEM
     docile (1.1.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    email_reply_trimmer (0.1.1)
+    email_reply_trimmer (0.1.2)
     ember-data-source (1.0.0.beta.16.1)
       ember-source (~> 1.8)
     ember-handlebars-template (0.1.5)
@@ -150,12 +150,12 @@ GEM
       thor (~> 0.15)
     libv8 (3.16.14.13)
     listen (0.7.3)
-    logster (1.1.1)
+    logster (1.2.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     memory_profiler (0.9.6)
     message_bus (2.0.0.beta.5)
       rack (>= 1.1.3)
@@ -172,7 +172,7 @@ GEM
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mustache (1.0.2)
+    mustache (1.0.3)
     netrc (0.11.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
@@ -214,7 +214,8 @@ GEM
     omniauth-twitter (1.2.1)
       json (~> 1.3)
       omniauth-oauth (~> 1.1)
-    onebox (1.5.35)
+    onebox (1.5.37)
+      htmlentities (~> 4.3.4)
       moneta (~> 0.8)
       multi_json (~> 1.11)
       mustache
@@ -232,7 +233,7 @@ GEM
       pry (>= 0.9.10, < 0.11.0)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (2.15.3)
+    puma (3.2.0)
     r2 (0.2.6)
     rack (1.6.4)
     rack-mini-profiler (0.9.9.2)
@@ -244,16 +245,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.2)
-      actionmailer (= 4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activerecord (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -266,9 +267,9 @@ GEM
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     rails_multisite (1.0.3)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.15.0)
@@ -414,7 +415,7 @@ DEPENDENCIES
   byebug
   certified
   discourse-qunit-rails
-  email_reply_trimmer (= 0.1.1)
+  email_reply_trimmer (= 0.1.2)
   ember-rails
   ember-source (= 1.12.2)
   excon
diff --git a/app/assets/javascripts/admin/components/expanding-text-area.js.es6 b/app/assets/javascripts/admin/components/expanding-text-area.js.es6
index 3b5a260690..f7259e8301 100644
--- a/app/assets/javascripts/admin/components/expanding-text-area.js.es6
+++ b/app/assets/javascripts/admin/components/expanding-text-area.js.es6
@@ -1,5 +1,5 @@
 import { on, observes } from 'ember-addons/ember-computed-decorators';
-import autosize from 'admin/lib/autosize';
+import autosize from 'discourse/lib/autosize';
 
 export default Ember.TextArea.extend({
   @on('didInsertElement')
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
index 46f4548ebd..5ec2cb4541 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -14,7 +14,6 @@ export default Ember.Controller.extend(BufferedContent, {
 
   readOnly: Ember.computed.alias('buffered.system'),
   showDisplayName: propertyNotEqual('name', 'displayName'),
-  canEditDescription: Em.computed.none('buffered.translatedDescription'),
 
   hasQuery: function() {
     const bQuery = this.get('buffered.query');
@@ -37,6 +36,7 @@ export default Ember.Controller.extend(BufferedContent, {
                      'listable', 'auto_revoke',
                      'enabled', 'show_posts',
                      'target_posts', 'name', 'description',
+                     'long_description',
                      'icon', 'image', 'query', 'badge_grouping_id',
                      'trigger', 'badge_type_id'],
             self = this;
diff --git a/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
index deb7f0771c..a6acd9af78 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
@@ -1,11 +1,21 @@
 import IncomingEmail from 'admin/models/incoming-email';
 
 export default Ember.Controller.extend({
-  loadMore() {
-    return IncomingEmail.findAll(this.get("filter"), this.get("model.length"))
-                   .then(incoming => {
-                      if (incoming.length < 50) { this.get("model").set("allLoaded", true); }
-                      this.get("model").addObjects(incoming);
-                   });
+  loading: false,
+
+  actions: {
+
+    loadMore() {
+      if (this.get("loading") || this.get("model.allLoaded")) { return; }
+      this.set('loading', true);
+
+      IncomingEmail.findAll(this.get("filter"), this.get("model.length"))
+                     .then(incoming => {
+                        if (incoming.length < 50) { this.get("model").set("allLoaded", true); }
+                        this.get("model").addObjects(incoming);
+                     }).finally(() => {
+                       this.set('loading', false);
+                     });
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
index 2506a0cd99..44a38dfa32 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
@@ -1,11 +1,20 @@
 import EmailLog from 'admin/models/email-log';
 
 export default Ember.Controller.extend({
-  loadMore() {
-    return EmailLog.findAll(this.get("filter"), this.get("model.length"))
-                   .then(logs => {
-                      if (logs.length < 50) { this.get("model").set("allLoaded", true); }
-                      this.get("model").addObjects(logs);
-                   });
+  loading: false,
+
+  actions: {
+    loadMore() {
+      if (this.get("loading") || this.get("model.allLoaded")) { return; }
+
+      this.set('loading', true);
+      return EmailLog.findAll(this.get("filter"), this.get("model.length"))
+                     .then(logs => {
+                        if (logs.length < 50) { this.get("model").set("allLoaded", true); }
+                        this.get("model").addObjects(logs);
+                     }).finally(() => {
+                       this.set('loading', false);
+                     });
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
index de9b3cc982..8d919e5f26 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -61,7 +61,7 @@ export default Ember.ArrayController.extend({
       }
     });
 
-    return _.sortBy(badges, badge => badge.get('displayName'));
+    return _.sortBy(badges, badge => badge.get('name'));
   }.property('badges.@each', 'model.@each'),
 
   /**
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index 173b8c60d1..419dc47c07 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -44,10 +44,19 @@
 
     <div>
       <label for="description">{{i18n 'admin.badges.description'}}</label>
-      {{#if canEditDescription}}
-        {{textarea name="description" value=buffered.description}}
-      {{else}}
+      {{#if buffered.system}}
         {{textarea name="description" value=buffered.displayDescription disabled=true}}
+      {{else}}
+        {{textarea name="description" value=buffered.description}}
+      {{/if}}
+    </div>
+
+    <div>
+      <label for="long_description">{{i18n 'admin.badges.long_description'}}</label>
+      {{#if buffered.system}}
+        {{textarea name="long_description" value=buffered.long_description disabled=true}}
+      {{else}}
+        {{textarea name="long_description" value=buffered.long_description}}
       {{/if}}
     </div>
 
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index 95e0cb2dc5..e6e3bcbec9 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -1,55 +1,57 @@
-<table class='table email-list'>
-  <thead>
-    <tr>
-      <th>{{i18n 'admin.email.time'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
+    <thead>
+      <tr>
+        <th>{{i18n 'admin.email.time'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
+      </tr>
+    </thead>
+
+    <tr class="filters">
+      <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+      <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
+      <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
+      <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
     </tr>
-  </thead>
 
-  <tr class="filters">
-    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
-    <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
-    <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
-    <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
-  </tr>
-
-  {{#each email in model}}
-    <tr>
-      <td class="time">{{format-date email.created_at}}</td>
-      <td class="username">
-        <div>
-          {{#if email.user}}
-            {{#link-to 'adminUser' email.user}}
-              {{avatar email.user imageSize="tiny"}}
-              {{email.from_address}}
-            {{/link-to}}
+    {{#each email in model}}
+      <tr>
+        <td class="time">{{format-date email.created_at}}</td>
+        <td class="username">
+          <div>
+            {{#if email.user}}
+              {{#link-to 'adminUser' email.user}}
+                {{avatar email.user imageSize="tiny"}}
+                {{email.from_address}}
+              {{/link-to}}
+            {{else}}
+              &mdash;
+            {{/if}}
+          </div>
+        </td>
+        <td class="addresses">
+          {{#each to in email.to_addresses}}
+            <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
+          {{/each}}
+          {{#each cc in email.cc_addresses}}
+            <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
+          {{/each}}
+        </td>
+        <td>
+          {{#if email.post_url}}
+            <a href="{{email.post_url}}">{{email.subject}}</a>
           {{else}}
-            &mdash;
+            {{email.subject}}
           {{/if}}
-        </div>
-      </td>
-      <td class="addresses">
-        {{#each to in email.to_addresses}}
-          <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
-        {{/each}}
-        {{#each cc in email.cc_addresses}}
-          <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
-        {{/each}}
-      </td>
-      <td>
-        {{#if email.post_url}}
-          <a href="{{email.post_url}}">{{email.subject}}</a>
-        {{else}}
-          {{email.subject}}
-        {{/if}}
-      </td>
-    </tr>
-  {{else}}
-    <tr><td colspan="4">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
-  {{/each}}
+        </td>
+      </tr>
+    {{else}}
+      <tr><td colspan="4">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
+    {{/each}}
 
-</table>
+  </table>
+{{/load-more}}
 
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/email-rejected.hbs b/app/assets/javascripts/admin/templates/email-rejected.hbs
index 3c5f3cba8e..664eb72866 100644
--- a/app/assets/javascripts/admin/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/templates/email-rejected.hbs
@@ -1,54 +1,56 @@
-<table class='table email-list'>
-  <thead>
-    <tr>
-      <th>{{i18n 'admin.email.time'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.error'}}</th>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
+    <thead>
+      <tr>
+        <th>{{i18n 'admin.email.time'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.error'}}</th>
+      </tr>
+    </thead>
+
+    <tr class="filters">
+      <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+      <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
+      <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
+      <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
+      <td>{{text-field value=filter.error placeholderKey="admin.email.incoming_emails.filters.error_placeholder"}}</td>
     </tr>
-  </thead>
 
-  <tr class="filters">
-    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
-    <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
-    <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
-    <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
-    <td>{{text-field value=filter.error placeholderKey="admin.email.incoming_emails.filters.error_placeholder"}}</td>
-  </tr>
+    {{#each email in model}}
+      <tr>
+        <td class="time">{{format-date email.created_at}}</td>
+        <td class="username">
+          <div>
+            {{#if email.user}}
+              {{#link-to 'adminUser' email.user}}
+                {{avatar email.user imageSize="tiny"}}
+                {{email.from_address}}
+              {{/link-to}}
+            {{else}}
+              &mdash;
+            {{/if}}
+          </div>
+        </td>
+        <td class="addresses">
+          {{#each to in email.to_addresses}}
+            <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
+          {{/each}}
+          {{#each cc in email.cc_addresses}}
+            <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
+          {{/each}}
+        </td>
+        <td>{{email.subject}}</td>
+        <td class="error">
+          <a {{action "showIncomingEmail" email.id}}>{{email.error}}</a>
+        </td>
+      </tr>
+    {{else}}
+      <tr><td colspan="5">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
+    {{/each}}
 
-  {{#each email in model}}
-    <tr>
-      <td class="time">{{format-date email.created_at}}</td>
-      <td class="username">
-        <div>
-          {{#if email.user}}
-            {{#link-to 'adminUser' email.user}}
-              {{avatar email.user imageSize="tiny"}}
-              {{email.from_address}}
-            {{/link-to}}
-          {{else}}
-            &mdash;
-          {{/if}}
-        </div>
-      </td>
-      <td class="addresses">
-        {{#each to in email.to_addresses}}
-          <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
-        {{/each}}
-        {{#each cc in email.cc_addresses}}
-          <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
-        {{/each}}
-      </td>
-      <td>{{email.subject}}</td>
-      <td class="error">
-        <a {{action "showIncomingEmail" email.id}}>{{email.error}}</a>
-      </td>
-    </tr>
-  {{else}}
-    <tr><td colspan="5">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
-  {{/each}}
+  </table>
+{{/load-more}}
 
-</table>
-
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 2f8785c6f5..ca5fb4aaa2 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -1,47 +1,49 @@
-<table class='table email-list'>
-  <thead>
-    <tr>
-      <th>{{i18n 'admin.email.sent_at'}}</th>
-      <th>{{i18n 'admin.email.user'}}</th>
-      <th>{{i18n 'admin.email.to_address'}}</th>
-      <th>{{i18n 'admin.email.email_type'}}</th>
-      <th>{{i18n 'admin.email.reply_key'}}</th>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
+    <thead>
+      <tr>
+        <th>{{i18n 'admin.email.sent_at'}}</th>
+        <th>{{i18n 'admin.email.user'}}</th>
+        <th>{{i18n 'admin.email.to_address'}}</th>
+        <th>{{i18n 'admin.email.email_type'}}</th>
+        <th>{{i18n 'admin.email.reply_key'}}</th>
+      </tr>
+    </thead>
+
+    <tr class="filters">
+      <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+      <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
+      <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
+      <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
+      <td>{{text-field value=filter.reply_key placeholderKey="admin.email.logs.filters.reply_key_placeholder"}}</td>
     </tr>
-  </thead>
 
-  <tr class="filters">
-    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
-    <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
-    <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
-    <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
-    <td>{{text-field value=filter.reply_key placeholderKey="admin.email.logs.filters.reply_key_placeholder"}}</td>
-  </tr>
+    {{#each l in model}}
+      <tr>
+        <td>{{format-date l.created_at}}</td>
+        <td>
+          {{#if l.user}}
+            {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+            {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+          {{else}}
+            &mdash;
+          {{/if}}
+        </td>
+        <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
+        <td>{{l.email_type}}</td>
+        <td>
+          {{#if l.post_url}}
+            <a href="{{l.post_url}}">{{l.reply_key}}</a>
+          {{else}}
+            {{l.reply_key}}
+          {{/if}}
+        </td>
+      </tr>
+    {{else}}
+      <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
+    {{/each}}
 
-  {{#each l in model}}
-    <tr>
-      <td>{{format-date l.created_at}}</td>
-      <td>
-        {{#if l.user}}
-          {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-          {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
-        {{else}}
-          &mdash;
-        {{/if}}
-      </td>
-      <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
-      <td>{{l.email_type}}</td>
-      <td>
-        {{#if l.post_url}}
-          <a href="{{l.post_url}}">{{l.reply_key}}</a>
-        {{else}}
-          {{l.reply_key}}
-        {{/if}}
-      </td>
-    </tr>
-  {{else}}
-    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
-  {{/each}}
+  </table>
+{{/load-more}}
 
-</table>
-
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index 6ef4872566..9c21c428cd 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -1,47 +1,49 @@
-<table class='table email-list'>
-  <thead>
-    <tr>
-      <th>{{i18n 'admin.email.time'}}</th>
-      <th>{{i18n 'admin.email.user'}}</th>
-      <th>{{i18n 'admin.email.to_address'}}</th>
-      <th>{{i18n 'admin.email.email_type'}}</th>
-      <th>{{i18n 'admin.email.skipped_reason'}}</th>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
+    <thead>
+      <tr>
+        <th>{{i18n 'admin.email.time'}}</th>
+        <th>{{i18n 'admin.email.user'}}</th>
+        <th>{{i18n 'admin.email.to_address'}}</th>
+        <th>{{i18n 'admin.email.email_type'}}</th>
+        <th>{{i18n 'admin.email.skipped_reason'}}</th>
+      </tr>
+    </thead>
+
+    <tr class="filters">
+      <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+      <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
+      <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
+      <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
+      <td>{{text-field value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
     </tr>
-  </thead>
 
-  <tr class="filters">
-    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
-    <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
-    <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
-    <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
-    <td>{{text-field value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
-  </tr>
+    {{#each l in model}}
+      <tr>
+        <td>{{format-date l.created_at}}</td>
+        <td>
+          {{#if l.user}}
+            {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+            {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+          {{else}}
+            &mdash;
+          {{/if}}
+        </td>
+        <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
+        <td>{{l.email_type}}</td>
+        <td>
+          {{#if l.post_url}}
+            <a href="{{l.post_url}}">{{l.skipped_reason}}</a>
+          {{else}}
+            {{l.skipped_reason}}
+          {{/if}}
+        </td>
+      </tr>
+    {{else}}
+      <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
+    {{/each}}
 
-  {{#each l in model}}
-    <tr>
-      <td>{{format-date l.created_at}}</td>
-      <td>
-        {{#if l.user}}
-          {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-          {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
-        {{else}}
-          &mdash;
-        {{/if}}
-      </td>
-      <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
-      <td>{{l.email_type}}</td>
-      <td>
-        {{#if l.post_url}}
-          <a href="{{l.post_url}}">{{l.skipped_reason}}</a>
-        {{else}}
-          {{l.skipped_reason}}
-        {{/if}}
-      </td>
-    </tr>
-  {{else}}
-    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
-  {{/each}}
+  </table>
+{{/load-more}}
 
-</table>
-
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 5c1c402d42..608d7c38ba 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -386,15 +386,15 @@
 
   <div class='display-row'>
     <div class='field'>{{i18n 'created'}}</div>
-    <div class='value'>{{{model.created_at_age}}}</div>
+    <div class='value'>{{format-date model.created_at leaveAgo="true"}}</div>
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'admin.users.last_emailed'}}</div>
-    <div class='value'>{{{model.last_emailed_age}}}</div>
+    <div class='value'>{{format-date model.last_emailed_at leaveAgo="true"}}</div>
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'last_seen'}}</div>
-    <div class='value'>{{{model.last_seen_age}}}</div>
+    <div class='value'>{{format-date model.last_seen_at leaveAgo="true"}}</div>
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'admin.user.like_count'}}</div>
diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user_badges.hbs
index 281a37e08c..772360d21a 100644
--- a/app/assets/javascripts/admin/templates/user_badges.hbs
+++ b/app/assets/javascripts/admin/templates/user_badges.hbs
@@ -16,7 +16,7 @@
     <form class="form-horizontal">
       <div>
       <label>{{i18n 'admin.badges.badge'}}</label>
-      {{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges nameProperty="displayName"}}
+      {{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges nameProperty="name"}}
       </div>
       <label>
       <label>{{i18n 'admin.badges.reason'}}</label>
diff --git a/app/assets/javascripts/admin/views/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/views/admin-email-incomings.js.es6
deleted file mode 100644
index 6360f857b7..0000000000
--- a/app/assets/javascripts/admin/views/admin-email-incomings.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: ".email-list tr",
-
-  actions: {
-    loadMore() {
-      if (this.get("loading") || this.get("model.allLoaded")) { return; }
-      this.set("loading", true);
-      return this.get("controller").loadMore().then(() => this.set("loading", false));
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-logs.js.es6 b/app/assets/javascripts/admin/views/admin-email-logs.js.es6
deleted file mode 100644
index 6360f857b7..0000000000
--- a/app/assets/javascripts/admin/views/admin-email-logs.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: ".email-list tr",
-
-  actions: {
-    loadMore() {
-      if (this.get("loading") || this.get("model.allLoaded")) { return; }
-      this.set("loading", true);
-      return this.get("controller").loadMore().then(() => this.set("loading", false));
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-received.js.es6 b/app/assets/javascripts/admin/views/admin-email-received.js.es6
deleted file mode 100644
index da0d8de157..0000000000
--- a/app/assets/javascripts/admin/views/admin-email-received.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminEmailIncomingsView from "admin/views/admin-email-incomings";
-
-export default AdminEmailIncomingsView.extend({
-  templateName: "admin/templates/email-received"
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/views/admin-email-rejected.js.es6
deleted file mode 100644
index b89fe8d46a..0000000000
--- a/app/assets/javascripts/admin/views/admin-email-rejected.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminEmailIncomingsView from "admin/views/admin-email-incomings";
-
-export default AdminEmailIncomingsView.extend({
-  templateName: "admin/templates/email-rejected"
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-sent.js.es6 b/app/assets/javascripts/admin/views/admin-email-sent.js.es6
deleted file mode 100644
index d007a79644..0000000000
--- a/app/assets/javascripts/admin/views/admin-email-sent.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminEmailLogsView from "admin/views/admin-email-logs";
-
-export default AdminEmailLogsView.extend({
-  templateName: "admin/templates/email-sent"
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/views/admin-email-skipped.js.es6
deleted file mode 100644
index e3c4467099..0000000000
--- a/app/assets/javascripts/admin/views/admin-email-skipped.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminEmailLogsView from "admin/views/admin-email-logs";
-
-export default AdminEmailLogsView.extend({
-  templateName: "admin/templates/email-skipped"
-});
diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index ab0a429832..f791de454c 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -6,6 +6,8 @@ define('ember', ['exports'], function(__exports__) {
   __exports__.default = Ember;
 });
 
+var _pluginCallbacks = [];
+
 window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
   rootElement: '#main',
   _docTitle: document.title,
@@ -127,6 +129,18 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
       }
     });
 
+    // Plugins that are registered via `<script>` tags.
+    var withPluginApi = require('discourse/lib/plugin-api').withPluginApi;
+    var initCount = 0;
+    _pluginCallbacks.forEach(function(cb) {
+      Discourse.instanceInitializer({
+        name: "_discourse_plugin_" + (++initCount),
+        after: 'inject-objects',
+        initialize: function() {
+          withPluginApi(cb.version, cb.code);
+        }
+      });
+    });
   },
 
   requiresRefresh: function(){
@@ -134,6 +148,9 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
     return desired && Discourse.get("currentAssetVersion") !== desired;
   }.property("currentAssetVersion", "desiredAssetVersion"),
 
+  _registerPluginCode: function(version, code) {
+    _pluginCallbacks.push({ version: version, code: code });
+  },
 
   assetVersion: Ember.computed({
     get: function() {
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js.es6
index 10f1da31bd..c32e1f1cbb 100644
--- a/app/assets/javascripts/discourse/components/badge-button.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-button.js.es6
@@ -1,7 +1,9 @@
 export default Ember.Component.extend({
   tagName: 'span',
   classNameBindings: [':user-badge', 'badge.badgeTypeClassName'],
-  title: Em.computed.alias('badge.displayDescription'),
+  title: function(){
+    return $("<div>"+this.get('badge.description')+"</div>").text();
+  }.property('badge.description'),
   attributeBindings: ['data-badge-name', 'title'],
   'data-badge-name': Em.computed.alias('badge.name')
 });
diff --git a/app/assets/javascripts/discourse/components/badge-card.js.es6 b/app/assets/javascripts/discourse/components/badge-card.js.es6
new file mode 100644
index 0000000000..7366d05ef8
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/badge-card.js.es6
@@ -0,0 +1,45 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import DiscourseURL from 'discourse/lib/url';
+
+export default Ember.Component.extend({
+  size: 'medium',
+  classNameBindings: [':badge-card', 'size', 'navigateOnClick:hyperlink'],
+
+  click(e){
+    if (e.target && e.target.nodeName === "A") {
+      return true;
+    }
+
+    if (!this.get('navigateOnClick')) {
+      return false;
+    }
+
+    var url = this.get('badge.url');
+    const username = this.get('username');
+    if (username) {
+      url = url + "?username=" + encodeURIComponent(username);
+    }
+    DiscourseURL.routeTo(url);
+    return true;
+  },
+
+  @computed('count', 'badge.grant_count')
+  displayCount(count, grantCount) {
+    const c = parseInt(count || grantCount || 0);
+    if (c > 1) {
+      return c;
+    }
+  },
+
+  @computed('size')
+  summary(size) {
+    if (size === 'large') {
+      const longDescription = this.get('badge.long_description');
+      if (!_.isEmpty(longDescription)) {
+        return Discourse.Emoji.unescape(longDescription);
+      }
+    }
+    return this.get('badge.description');
+  }
+
+});
diff --git a/app/assets/javascripts/discourse/components/check-mark.js.es6 b/app/assets/javascripts/discourse/components/check-mark.js.es6
new file mode 100644
index 0000000000..a934a490a4
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/check-mark.js.es6
@@ -0,0 +1,16 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: 'span',
+  classNameBindings: [':check-display', 'status'],
+
+  @computed('checked')
+  status(checked) {
+    return checked ? 'status-checked' : 'status-unchecked';
+  },
+
+  render(buffer) {
+    const icon = this.get('checked') ? 'check' : 'times';
+    buffer.push(`<i class='fa fa-${icon}'></i>`);
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 852f19ecd8..f61798163f 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -27,9 +27,9 @@ export default Ember.Component.extend(StringBuffer, {
 
     if (notices.length > 0) {
       buffer.push(_.map(notices, n => {
-        var html = `<div class='row'><div class='alert alert-info ${n[1]}'>${n[0]}`;
+        var html = `<div class='row'><div class='alert alert-info ${n[1]}'>`;
         if (n[2]) html += n[2];
-        html += '</div></div>';
+        html += `${n[0]}</div></div>`;
         return html;
       }).join(""));
     }
diff --git a/app/assets/javascripts/discourse/components/home-logo.js.es6 b/app/assets/javascripts/discourse/components/home-logo.js.es6
index c0846e268b..4798205e2e 100644
--- a/app/assets/javascripts/discourse/components/home-logo.js.es6
+++ b/app/assets/javascripts/discourse/components/home-logo.js.es6
@@ -1,38 +1,58 @@
 import DiscourseURL from 'discourse/lib/url';
-import { setting } from 'discourse/lib/computed';
+import { iconHTML } from 'discourse/helpers/fa-icon';
+import { observes } from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
-  classNames: ["title"],
+  widget: 'home-logo',
+  showMobileLogo: null,
+  linkUrl: null,
+  classNames: ['title'],
 
-  targetUrl: function() {
-    // For overriding by customizations
-    return '/';
-  }.property(),
+  init() {
+    this._super();
+    this.showMobileLogo = this.site.mobileView && !Ember.isEmpty(this.siteSettings.mobile_logo_url);
+    this.linkUrl = this.get('targetUrl') || '/';
+  },
 
-  linkUrl: function() {
-    return Discourse.getURL(this.get('targetUrl'));
-  }.property('targetUrl'),
+  @observes('minimized')
+  _updateLogo() {
+    // On mobile we don't minimize the logo
+    if (!this.site.mobileView) {
+      this.rerender();
+    }
+  },
 
-  showSmallLogo: function() {
-    return !this.site.mobileView && this.get("minimized");
-  }.property("minimized"),
-
-  showMobileLogo: function() {
-    return this.site.mobileView && !Ember.isBlank(this.get('mobileBigLogoUrl'));
-  }.property(),
-
-  smallLogoUrl: setting('logo_small_url'),
-  bigLogoUrl: setting('logo_url'),
-  mobileBigLogoUrl: setting('mobile_logo_url'),
-  title: setting('title'),
-
-  click: function(e) {
+  click(e) {
     // if they want to open in a new tab, let it so
     if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { return true; }
 
     e.preventDefault();
 
-    DiscourseURL.routeTo(this.get('targetUrl'));
+    DiscourseURL.routeTo(this.linkUrl);
     return false;
+  },
+
+  render(buffer) {
+    const { siteSettings } = this;
+    const logoUrl = siteSettings.logo_url || '';
+    const title = siteSettings.title;
+
+    buffer.push(`<a href="${this.linkUrl}" data-auto-route="true">`);
+    if (!this.site.mobileView && this.get('minimized')) {
+      const logoSmallUrl = siteSettings.logo_small_url || '';
+      if (logoSmallUrl.length) {
+        buffer.push(`<img id='site-logo' class="logo-small" src="${logoSmallUrl}" width="33" height="33" alt="${title}">`);
+      } else {
+        buffer.push(iconHTML('home'));
+      }
+    } else if (this.showMobileLogo) {
+      buffer.push(`<img id="site-logo" class="logo-big" src="${siteSettings.mobile_logo_url}" alt="${title}">`);
+    } else if (logoUrl.length) {
+      buffer.push(`<img id="site-logo" class="logo-big" src="${logoUrl}" alt="${title}">`);
+    } else {
+      buffer.push(`<h2 id="site-text-logo" class="text-logo">${title}</h2>`);
+    }
+    buffer.push('</a>');
   }
+
 });
diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js.es6
new file mode 100644
index 0000000000..4b355a5b0a
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/load-more.js.es6
@@ -0,0 +1,16 @@
+import LoadMore from "discourse/mixins/load-more";
+
+export default Ember.Component.extend(LoadMore, {
+  _viaComponent: true,
+
+  init() {
+    this._super();
+    this.set('eyelineSelector', this.get('selector'));
+  },
+
+  actions: {
+    loadMore() {
+      this.sendAction();
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index 8958cfd057..b7a8fdb020 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -56,6 +56,8 @@ export default Ember.Component.extend({
   rerenderWidget() {
     Ember.run.cancel(this._timeout);
     if (this._rootNode) {
+      const t0 = new Date().getTime();
+
       const opts = { model: this.get('model') };
       const newTree = new this._widgetClass(this.get('args'), this.container, opts);
 
@@ -86,6 +88,10 @@ export default Ember.Component.extend({
       }
 
       renderedKey('*');
+      if (this.profileWidget) {
+        console.log(new Date().getTime() - t0);
+      }
+
     }
   }
 
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
index 98dc570796..6b76240951 100644
--- a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
@@ -3,5 +3,16 @@ export default Em.Component.extend({
 
   label: function() {
     return I18n.t(this.get('labelKey'));
-  }.property('labelKey')
+  }.property('labelKey'),
+
+  click() {
+    const warning = this.get('warning');
+
+    if (warning && !this.get('checked')) {
+      this.sendAction('warning');
+      return false;
+    }
+
+    return true;
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
index e5303d3d84..38ad5fea69 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -2,6 +2,7 @@ import DiscourseURL from 'discourse/lib/url';
 import { keyDirty } from 'discourse/widgets/widget';
 import MountWidget from 'discourse/components/mount-widget';
 import { cloak, uncloak } from 'discourse/widgets/post-stream';
+import { isWorkaroundActive } from 'discourse/lib/safari-hacks';
 
 function findTopView($posts, viewportTop, min, max) {
   if (max < min) { return min; }
@@ -38,6 +39,7 @@ export default MountWidget.extend({
 
   scrolled() {
     if (this.isDestroyed || this.isDestroying) { return; }
+    if (isWorkaroundActive()) { return; }
 
     const $w = $(window);
     const windowHeight = window.innerHeight ? window.innerHeight : $w.height();
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js.es6
new file mode 100644
index 0000000000..05dde9fffe
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-info.js.es6
@@ -0,0 +1,23 @@
+import { url } from 'discourse/lib/computed';
+import computed from 'ember-addons/ember-computed-decorators';
+
+function normalize(name) {
+  return name.replace(/[\-\_ \.]/g, '').toLowerCase();
+}
+
+export default Ember.Component.extend({
+  classNameBindings: [':user-info', 'size'],
+  size: 'small',
+  userPath: url('user.username', '/users/%@'),
+
+  // TODO: In later ember releases `hasBlock` works without this
+  hasBlock: Ember.computed.alias('template'),
+
+  @computed('user.name', 'user.username')
+  name(name, username) {
+    if (name && normalize(username) !== normalize(name)) {
+      return name;
+    }
+  }
+
+});
diff --git a/app/assets/javascripts/discourse/components/user-small.js.es6 b/app/assets/javascripts/discourse/components/user-small.js.es6
deleted file mode 100644
index 9dc0699381..0000000000
--- a/app/assets/javascripts/discourse/components/user-small.js.es6
+++ /dev/null
@@ -1,15 +0,0 @@
-import { url } from 'discourse/lib/computed';
-
-export default Ember.Component.extend({
-  classNames: ['user-small'],
-
-  userPath: url('user.username', '/users/%@'),
-
-  name: function() {
-    const name = this.get('user.name');
-    if (name && this.get('user.username') !== name) {
-      return name;
-    }
-  }.property('user.name')
-
-});
diff --git a/app/assets/javascripts/discourse/controllers/badges/index.js.es6 b/app/assets/javascripts/discourse/controllers/badges/index.js.es6
index 862ac75c41..f811ebb754 100644
--- a/app/assets/javascripts/discourse/controllers/badges/index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/index.js.es6
@@ -3,7 +3,7 @@ export default Ember.Controller.extend({
     var sorted = _.sortBy(this.get('model'), function(badge){
       var pos = badge.get('badge_grouping.position');
       var type = badge.get('badge_type_id');
-      var name = badge.get('displayName');
+      var name = badge.get('name');
 
       return ("000" + pos).slice(-4) + (10-type) + name;
     });
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index afe640bc63..5df73481ac 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,4 +1,5 @@
 import UserBadge from 'discourse/models/user-badge';
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend({
   queryParams: ['username'],
@@ -6,63 +7,50 @@ export default Ember.Controller.extend({
   userBadges: null,
   needs: ["application"],
 
-  user: function(){
-    if (this.get("username")) {
+  @computed('username')
+  user(username) {
+    if (username) {
       return this.get('userBadges')[0].get('user');
     }
-  }.property("username"),
+  },
 
-  grantCount: function() {
-    if (this.get("username")) {
-      return this.get('userBadges.grant_count');
-    } else {
-      return this.get('model.grant_count');
-    }
-  }.property('username', 'model', 'userBadges'),
+  @computed('username', 'model.grant_count', 'userBadges.grant_count')
+  grantCount(username, modelCount, userCount) {
+    return username ? userCount : modelCount;
+  },
 
   actions: {
     loadMore() {
-      const self = this;
+      if (this.get('loadingMore')) {
+        return;
+      }
+      this.set('loadingMore', true);
+
       const userBadges = this.get('userBadges');
 
       UserBadge.findByBadgeId(this.get('model.id'), {
         offset: userBadges.length,
         username: this.get('username'),
-      }).then(function(result) {
+      }).then(result => {
         userBadges.pushObjects(result);
-        if(userBadges.length === 0){
-          self.set('noMoreBadges', true);
+        if (userBadges.length === 0){
+          this.set('noMoreBadges', true);
         }
+      }).finally(()=>{
+        this.set('loadingMore', false);
       });
     }
   },
 
-  layoutClass: function(){
-    var user = this.get("user") ? " single-user" : "";
-    var ub = this.get("userBadges");
-    if(ub && ub[0] && ub[0].post_id){
-      return "user-badge-with-posts" + user;
-    } else {
-      return "user-badge-no-posts" + user;
-    }
-  }.property("userBadges"),
+  @computed('noMoreBadges', 'grantCount', 'userBadges.length')
+  canLoadMore(noMoreBadges, grantCount, userBadgeLength) {
+    if (noMoreBadges) { return false; }
+    return grantCount > (userBadgeLength || 0);
+  },
 
-  canLoadMore: function() {
-    if (this.get('noMoreBadges')) { return false; }
-
-    if (this.get('userBadges')) {
-      return this.get('grantCount') > this.get('userBadges.length');
-    } else {
-      return false;
-    }
-  }.property('noMoreBadges', 'model.grant_count', 'userBadges.length'),
-
-  _showFooter: function() {
+  @observes('canLoadMore')
+  _showFooter() {
     this.set("controllers.application.showFooter", !this.get("canLoadMore"));
-  }.observes("canLoadMore"),
-
-  showLongDescription: function(){
-    return window.location.search.match("long-description");
-  }.property('userBadges')
+  }
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index 2adcff6c0f..a44d0b9c93 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -11,7 +11,8 @@ var ButtonBackBright = {
     ButtonTryAgain = {
       classes: "btn-primary",
       action: "tryLoading",
-      key: "errors.buttons.again"
+      key: "errors.buttons.again",
+      icon: "refresh"
     },
     ButtonLoadPage = {
       classes: "btn-primary",
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index 005ff085a8..b237017f26 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -106,6 +106,22 @@ export default Ember.Controller.extend(CanCheckEmails, {
 
   actions: {
 
+    checkMailingList(){
+      Em.run.next(()=>{
+        const postsPerDay = this.get('model.mailing_list_posts_per_day');
+        if (!postsPerDay || postsPerDay < 2) {
+          this.set('model.user_option.mailing_list_mode', true);
+          return;
+        }
+
+        bootbox.confirm(I18n.t("user.enable_mailing_list", {count: postsPerDay}), I18n.t("no_value"), I18n.t("yes_value"), (success) => {
+          if (success) {
+            this.set('model.user_option.mailing_list_mode', true);
+          }
+        });
+      });
+    },
+
     save() {
       this.set('saved', false);
 
diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
index b946cef8ea..76c6cb2e3a 100644
--- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
@@ -62,6 +62,9 @@ export default Ember.Controller.extend({
     markerElement.appendChild(document.createTextNode("\ufeff"));
 
     const isMobileDevice = this.site.isMobileDevice;
+    const capabilities = this.capabilities,
+          isIOS = capabilities.isIOS,
+          isAndroid = capabilities.isAndroid;
 
     // collapse the range at the beginning/end of the selection
     range.collapse(!isMobileDevice);
@@ -85,7 +88,7 @@ export default Ember.Controller.extend({
       let topOff = markerOffset.top;
       let leftOff = markerOffset.left;
 
-      if (isMobileDevice) {
+      if (isMobileDevice || isIOS || isAndroid) {
         topOff = topOff + 20;
         leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth());
       } else {
diff --git a/app/assets/javascripts/discourse/dialects/bbcode_dialect.js b/app/assets/javascripts/discourse/dialects/bbcode_dialect.js
index 079bb014ac..b13441cfd1 100644
--- a/app/assets/javascripts/discourse/dialects/bbcode_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/bbcode_dialect.js
@@ -169,11 +169,6 @@ Discourse.BBCode.replaceBBCodeParamsRaw("email", function(param, contents) {
   return ['a', {href: "mailto:" + param, 'data-bbcode': true}].concat(contents);
 });
 
-Discourse.BBCode.register('size', function(contents, params) {
-  return ['span', {'class': "bbcode-size-" + (parseInt(params, 10) || 1)}].concat(contents);
-});
-Discourse.Markdown.whiteListTag('span', 'class', /^bbcode-size-\d+$/);
-
 // Handles `[code] ... [/code]` blocks
 Discourse.Dialect.replaceBlock({
   start: /(\[code\])([\s\S]*)/igm,
diff --git a/app/assets/javascripts/discourse/helpers/format-date.js.es6 b/app/assets/javascripts/discourse/helpers/format-date.js.es6
index 7c68a51722..1937c44199 100644
--- a/app/assets/javascripts/discourse/helpers/format-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-date.js.es6
@@ -25,3 +25,5 @@ registerUnbound('format-date', function(val, params) {
     return new Handlebars.SafeString(autoUpdatingRelativeAge(date, {format: format, title: title, leaveAgo: leaveAgo}));
   }
 });
+
+
diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js.es6 b/app/assets/javascripts/discourse/helpers/inline-date.js.es6
new file mode 100644
index 0000000000..874434fd3c
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/inline-date.js.es6
@@ -0,0 +1,6 @@
+import { relativeAge } from 'discourse/lib/formatter';
+
+export default function(dt, params) {
+  dt = params.data.view.getStream(dt).value();
+  return relativeAge(new Date(dt));
+}
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
new file mode 100644
index 0000000000..d870f52531
--- /dev/null
+++ b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
@@ -0,0 +1,15 @@
+export function autoLoadModules() {
+  Ember.keys(requirejs.entries).forEach(entry => {
+    if ((/\/helpers\//).test(entry)) {
+      require(entry, null, null, true);
+    }
+    if ((/\/widgets\//).test(entry)) {
+      require(entry, null, null, true);
+    }
+  });
+}
+
+export default {
+  name: 'auto-load-modules',
+  initialize: autoLoadModules
+};
diff --git a/app/assets/javascripts/discourse/initializers/load-all-helpers.js.es6 b/app/assets/javascripts/discourse/initializers/load-all-helpers.js.es6
deleted file mode 100644
index 9347778775..0000000000
--- a/app/assets/javascripts/discourse/initializers/load-all-helpers.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-export function loadAllHelpers() {
-  Ember.keys(requirejs.entries).forEach(entry => {
-    if ((/\/helpers\//).test(entry)) {
-      require(entry, null, null, true);
-    }
-  });
-}
-
-export default {
-  name: 'load-all-helpers',
-  initialize: loadAllHelpers
-};
diff --git a/app/assets/javascripts/admin/lib/autosize.js.es6 b/app/assets/javascripts/discourse/lib/autosize.js.es6
similarity index 100%
rename from app/assets/javascripts/admin/lib/autosize.js.es6
rename to app/assets/javascripts/discourse/lib/autosize.js.es6
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index b8eeb0fe7f..8c04517965 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -75,7 +75,9 @@ class PluginApi {
    * ```
    **/
   addPosterIcon(cb) {
-    decorateWidget('poster-name:after', dec => {
+    const mobileView = this.container.lookup('site:main').mobileView;
+    const loc = mobileView ? 'before' : 'after';
+    decorateWidget(`poster-name:${loc}`, dec => {
       const attrs = dec.attrs;
 
       const result = cb(attrs.userCustomFields || {}, attrs);
@@ -102,7 +104,7 @@ class PluginApi {
         }
 
 
-        return dec.h('span',
+        return dec.h('span.poster-icon',
                      { className: result.className, attributes: { title: result.title } },
                      iconBody);
       }
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 3506b06d6b..888bf34fc6 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -6,6 +6,11 @@ function applicable() {
          !navigator.userAgent.match(/Trident/g);
 }
 
+let workaroundActive = false;
+export function isWorkaroundActive() {
+  return workaroundActive;
+}
+
 // per http://stackoverflow.com/questions/29001977/safari-in-ios8-is-scrolling-screen-when-fixed-elements-get-focus/29064810
 function positioningWorkaround($fixedElement) {
   if (!applicable()) {
@@ -37,12 +42,12 @@ function positioningWorkaround($fixedElement) {
     if (evt) {
       evt.target.removeEventListener('blur', blurred);
     }
+    workaroundActive = false;
   };
 
   var blurred = _.debounce(blurredNow, 250);
 
   var positioningHack = function(evt){
-
     const self = this;
     done = false;
 
@@ -76,6 +81,7 @@ function positioningWorkaround($fixedElement) {
 
     evt.preventDefault();
     self.focus();
+    workaroundActive = true;
   };
 
   function attachTouchStart(elem, fn) {
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index b3379004ed..5c5961cbfc 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -85,8 +85,11 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
 
   const postAtts = transformBasicPost(post);
 
+  const createdBy = details.created_by || {};
+
   postAtts.topicId = topic.id;
-  postAtts.topicOwner = details.created_by.id === post.user_id;
+  postAtts.topicOwner = createdBy.id === post.user_id;
+  postAtts.topicCreatedById = createdBy.id;
   postAtts.post_type = postType;
   postAtts.via_email = post.via_email;
   postAtts.isModeratorAction = postType === postTypes.moderator_action;
@@ -119,8 +122,8 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
   if (showTopicMap) {
     postAtts.showTopicMap = true;
     postAtts.topicCreatedAt = topic.created_at;
-    postAtts.createdByUsername = details.created_by.username;
-    postAtts.createdByAvatarTemplate = details.created_by.avatar_template;
+    postAtts.createdByUsername = createdBy.username;
+    postAtts.createdByAvatarTemplate = createdBy.avatar_template;
 
     postAtts.lastPostUrl = topic.get('lastPostUrl');
     postAtts.lastPostUsername = details.last_poster.username;
diff --git a/app/assets/javascripts/discourse/mixins/ajax.js b/app/assets/javascripts/discourse/mixins/ajax.js
index 36e42f5122..9c1d2d4dfe 100644
--- a/app/assets/javascripts/discourse/mixins/ajax.js
+++ b/app/assets/javascripts/discourse/mixins/ajax.js
@@ -66,6 +66,10 @@ Discourse.Ajax = Em.Mixin.create({
           });
         }
 
+        if (args.returnXHR) {
+          data = { result: data, xhr: xhr };
+        }
+
         Ember.run(null, resolve, data);
       };
 
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6
index 415c43b5e2..16c8734054 100644
--- a/app/assets/javascripts/discourse/mixins/load-more.js.es6
+++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6
@@ -2,12 +2,20 @@ import Eyeline from 'discourse/lib/eyeline';
 import Scrolling from 'discourse/mixins/scrolling';
 import { on } from 'ember-addons/ember-computed-decorators';
 
-//  Provides the ability to load more items for a view which is scrolled to the bottom.
+// Provides the ability to load more items for a view which is scrolled to the bottom.
 export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, {
 
+  init() {
+    this._super();
+    if (!this._viaComponent) {
+      console.warn('Using `LoadMore` as a view mixin is deprecated. Use `{{load-more}}` instead');
+    }
+
+  },
+
   scrolled() {
     const eyeline = this.get('eyeline');
-    if (eyeline) { eyeline.update(); }
+    return eyeline && eyeline.update();
   },
 
   loadMoreUnlessFull() {
diff --git a/app/assets/javascripts/discourse/models/action-summary.js.es6 b/app/assets/javascripts/discourse/models/action-summary.js.es6
index a39d78fb50..1a58dc4a0e 100644
--- a/app/assets/javascripts/discourse/models/action-summary.js.es6
+++ b/app/assets/javascripts/discourse/models/action-summary.js.es6
@@ -18,10 +18,7 @@ export default RestModel.extend({
   },
 
   togglePromise(post) {
-    if (!this.get('acted')) {
-      return this.act(post).then(() => true);
-    }
-    return this.undo(post).then(() => false);
+    return this.get('acted') ? this.undo(post) : this.act(post);
   },
 
   toggle(post) {
@@ -64,11 +61,15 @@ export default RestModel.extend({
         message: opts.message,
         take_action: opts.takeAction,
         flag_topic: this.get('flagTopic') ? true : false
-      }
-    }).then(function(result) {
+      },
+      returnXHR: true,
+    }).then(function(data) {
       if (!self.get('flagTopic')) {
-        return post.updateActionsSummary(result);
+        post.updateActionsSummary(data.result);
       }
+      const remaining = parseInt(data.xhr.getResponseHeader('Discourse-Actions-Remaining') || 0);
+      const max = parseInt(data.xhr.getResponseHeader('Discourse-Actions-Max') || 0);
+      return { acted: true, remaining, max };
     }).catch(function(error) {
       popupAjaxError(error);
       self.removeAction(post);
@@ -83,7 +84,10 @@ export default RestModel.extend({
     return Discourse.ajax("/post_actions/" + post.get('id'), {
       type: 'DELETE',
       data: { post_action_type_id: this.get('id') }
-    }).then(result => post.updateActionsSummary(result));
+    }).then(result => {
+      post.updateActionsSummary(result);
+      return { acted: false };
+    });
   },
 
   deferFlags(post) {
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js.es6
index 6e3d852c78..00cf97f341 100644
--- a/app/assets/javascripts/discourse/models/badge.js.es6
+++ b/app/assets/javascripts/discourse/models/badge.js.es6
@@ -9,63 +9,6 @@ const Badge = RestModel.extend({
     return Discourse.getURL(`/badges/${this.get('id')}/${this.get('slug')}`);
   }.property(),
 
-  /**
-    @private
-
-    The name key to use for fetching i18n translations.
-
-    @property i18nNameKey
-    @type {String}
-  **/
-  i18nNameKey: function() {
-    return this.get('name').toLowerCase().replace(/\s/g, '_');
-  }.property('name'),
-
-  /**
-    The display name of this badge. Attempts to use a translation and falls back to
-    the actual name.
-
-    @property displayName
-    @type {String}
-  **/
-  displayName: function() {
-    const i18nKey = "badges.badge." + this.get('i18nNameKey') + ".name";
-    return I18n.t(i18nKey, {defaultValue: this.get('name')});
-  }.property('name', 'i18nNameKey'),
-
-  /**
-    The i18n translated description for this badge. Returns the null if no
-    translation exists.
-
-    @property translatedDescription
-    @type {String}
-  **/
-  translatedDescription: function() {
-    const i18nKey = "badges.badge." + this.get('i18nNameKey') + ".description";
-    let translation = I18n.t(i18nKey);
-    if (translation.indexOf(i18nKey) !== -1) {
-      translation = null;
-    }
-    return translation;
-  }.property('i18nNameKey'),
-
-  displayDescription: function(){
-    // we support html in description but in most places do not need it
-    return this.get('displayDescriptionHtml').replace(/<[^>]*>/g, "");
-  }.property('displayDescriptionHtml'),
-
-  /**
-    Display-friendly description string. Returns either a translation or the
-    original description string.
-
-    @property displayDescription
-    @type {String}
-  **/
-  displayDescriptionHtml: function() {
-    const translated = this.get('translatedDescription');
-    return (translated === null ? this.get('description') : translated) || "";
-  }.property('description', 'translatedDescription'),
-
   /**
     Update this badge with the response returned by the server on save.
 
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js.es6
index a99c997d63..bc257aafc8 100644
--- a/app/assets/javascripts/discourse/models/user-badge.js.es6
+++ b/app/assets/javascripts/discourse/models/user-badge.js.es6
@@ -6,13 +6,8 @@ const UserBadge = Discourse.Model.extend({
       return "/t/-/" + this.get('topic_id') + "/" + this.get('post_number');
     }
   }.property(), // avoid the extra bindings for now
-  /**
-    Revoke this badge.
 
-    @method revoke
-    @returns {Promise} a promise that resolves when the badge has been revoked.
-  **/
-  revoke: function() {
+  revoke() {
     return Discourse.ajax("/user_badges/" + this.get('id'), {
       type: "DELETE"
     });
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 5ae7433316..2853625ab4 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -168,7 +168,8 @@ const User = RestModel.extend({
             'digest_after_minutes',
             'new_topic_duration_minutes',
             'auto_track_topics_after_msecs',
-            'like_notification_frequency'
+            'like_notification_frequency',
+            'include_tl0_in_digests'
     ].forEach(s => {
       data[s] = this.get(`user_option.${s}`);
     });
@@ -409,11 +410,13 @@ const User = RestModel.extend({
 
               summary.topics = summary.topic_ids.map(id => topicMap[id]);
 
-              summary.badges = summary.badges.map(ub => {
-                const badge = badgeMap[ub.badge_id];
-                badge.count = ub.count;
-                return badge;
-              });
+              if (summary.badges) {
+                summary.badges = summary.badges.map(ub => {
+                  const badge = badgeMap[ub.badge_id];
+                  badge.count = ub.count;
+                  return badge;
+                });
+              }
               return summary;
            });
   }
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6
index 74e04c6440..0592d54c68 100644
--- a/app/assets/javascripts/discourse/routes/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -15,10 +15,7 @@ export default Discourse.Route.extend({
   },
 
   serialize(model) {
-    return {
-      id: model.get("id"),
-      slug: model.get("slug")
-    };
+    return model.getProperties('id', 'slug');
   },
 
   model(params) {
@@ -29,19 +26,18 @@ export default Discourse.Route.extend({
     }
   },
 
-  afterModel(model,transition) {
+  afterModel(model, transition) {
     const username = transition.queryParams && transition.queryParams.username;
 
     return UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => {
       this.userBadges = userBadges;
     });
-
   },
 
   titleToken() {
     const model = this.modelFor("badges.show");
     if (model) {
-      return model.get("displayName");
+      return model.get("name");
     }
   },
 
diff --git a/app/assets/javascripts/discourse/services/logs-notice.js.es6 b/app/assets/javascripts/discourse/services/logs-notice.js.es6
index 8948de3a16..07ad6acd03 100644
--- a/app/assets/javascripts/discourse/services/logs-notice.js.es6
+++ b/app/assets/javascripts/discourse/services/logs-notice.js.es6
@@ -15,6 +15,7 @@ const LogsNotice = Ember.Object.extend({
 
     this.messageBus.subscribe("/logs_error_rate_exceeded", data => {
       const duration = data.duration;
+      const rate = data.rate;
       var siteSettingLimit = 0;
 
       if (duration === 'minute') {
@@ -23,12 +24,13 @@ const LogsNotice = Ember.Object.extend({
         siteSettingLimit = this.siteSettings.alert_admins_if_errors_per_hour;
       }
 
+      var translationKey = (rate === siteSettingLimit) ? 'reached' : 'exceeded';
+
       this.set('text',
-        I18n.t('logs_error_rate_exceeded_notice', {
+        I18n.t(`logs_error_rate_notice.${translationKey}`, {
           timestamp: moment().format("YYYY-MM-DD H:mm:ss"),
-          siteSettingLimit: siteSettingLimit,
-          rate: data.rate,
-          duration: duration,
+          siteSettingRate: I18n.t('logs_error_rate_notice.rate', { count: siteSettingLimit, duration: duration }),
+          rate: I18n.t('logs_error_rate_notice.rate', { count: rate, duration: duration }),
           url: Discourse.getURL('/logs')
         })
       );
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index ca3f050ffe..3d8f993ba0 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -22,8 +22,8 @@
       <section class='about admins'>
         <h3>{{i18n 'about.our_admins'}}</h3>
 
-        {{#each a in model.admins}}
-          {{user-small user=a}}
+        {{#each model.admins as |a|}}
+          {{user-info user=a}}
         {{/each}}
         <div class='clearfix'></div>
 
@@ -35,8 +35,8 @@
         <h3>{{i18n 'about.our_moderators'}}</h3>
 
         <div class='users'>
-          {{#each m in model.moderators}}
-            {{user-small user=m}}
+          {{#each model.moderators as |m|}}
+            {{user-info user=m}}
           {{/each}}
         </div>
         <div class='clearfix'></div>
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index 2d6de7fbda..71964b0e6d 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -1,21 +1,17 @@
 <div class='container badges'>
   <h1>{{i18n 'badges.title'}}</h1>
 
-  <table class='badges-listing'>
-    <tbody>
-      {{#each bg in badgeGroups}}
-        <tr class='title'>
-          <td colspan=4><h3>{{bg.badgeGrouping.displayName}}</h3></td>
-        </tr>
-        {{#each b in bg.badges}}
-          <tr>
-            <td class='granted'>{{#if b.has_badge}}<i class='fa fa-check'></i>{{/if}}</td>
-            <td class='badge'>{{user-badge badge=b}}</td>
-            <td class='description'>{{{b.displayDescriptionHtml}}}</td>
-            <td class='grant-count'><span title="{{i18n 'badges.granted' count=b.grant_count}}">{{b.grant_count}}</span></td>
-          </tr>
+  <div class='badge-groups'>
+    {{#each bg in badgeGroups}}
+      <div class='badge-grouping'>
+        <div class='title'>
+          <h3>{{bg.badgeGrouping.displayName}}</h3>
+        </div>
+
+        {{#each bg.badges as |b|}}
+          {{badge-card badge=b navigateOnClick="true"}}
         {{/each}}
-      {{/each}}
-    </tbody>
-  </table>
+      </div>
+    {{/each}}
+  </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index e41eb32ef1..9a0bd1e059 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -1,71 +1,44 @@
 <div class='container show-badge'>
   <h1>
     {{#link-to 'badges.index'}}{{i18n 'badges.title'}}{{/link-to}}
-    {{fa-icon "angle-right"}}
-    {{model.displayName}}
+     /
+    {{model.name}}
   </h1>
 
-  <div class='badges-listing'>
-    <div class='row'>
-      <div class='badge'>{{user-badge badge=model}}</div>
-      <div class='description'>{{{model.displayDescriptionHtml}}}</div>
-      {{#unless user}}
-      <div class='grant-count'>{{i18n 'badges.granted' count=grantCount}}</div>
-      {{/unless}}
-      <div class='info'>{{i18n 'badges.allow_title'}} {{{view.allowTitle}}}<br>{{i18n 'badges.multiple_grant'}} {{{view.multipleGrant}}}
+  <div class='show-badge-details'>
+    {{badge-card badge=model size="large" count=userBadges.grant_count}}
+    <div class='badge-grant-info'>
+      <div>
+        <div class='grant-info-item'>
+          {{check-mark checked=model.allow_title}} {{i18n 'badges.allow_title'}}
+        </div>
+        <div class='grant-info-item'>
+          {{check-mark checked=model.multiple_grant}} {{i18n 'badges.multiple_grant'}}
+        </div>
       </div>
     </div>
   </div>
 
-
-  {{#if showLongDescription}}
-  <div class='long-description banner'>
-    {{{long_description}}}
-  </div>
-  {{/if}}
-
-  {{#if user}}
-  <div class='badge-user-info'>
-    {{#link-to 'user' user}}
-        {{avatar user imageSize="extra_large"}}
-        <div class="details clearfix">
-          <div class='username'>{{user.username}}</div>
-        </div>
-    {{/link-to}}
-    <div class='earned'>
-    {{i18n 'badges.earned_n_times' count=grantCount}}
-    </div>
-  </div>
-  {{/if}}
-
   {{#if userBadges}}
-    <div class={{unbound layoutClass}}>
-    {{#each ub in userBadges}}
-        <div class="badge-user">
-          {{#if user}}
-            {{format-date ub.granted_at}}
-          {{else}}
-            {{#link-to 'user' ub.user classNames="badge-info"}}
-                {{avatar ub.user imageSize="large"}}
-                <div class="details">
-                  <span class="username">{{ub.user.username}}</span>
-                  {{format-date ub.granted_at}}
-                </div>
-            {{/link-to}}
-          {{/if}}
-
-          {{#if ub.post_number}}
-            <a class="post-link" href="{{unbound ub.topic.url}}/{{unbound ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
-          {{/if}}
-        </div>
-      {{/each}}
+    <div class="user-badges">
+      {{#load-more selector=".badge-info" action="loadMore"}}
+        {{#each userBadges as |ub|}}
+          {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
+            <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
+            {{#if ub.post_number}}
+              <a class="post-link" href="{{unbound ub.topic.url}}/{{unbound ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
+            {{/if}}
+          {{/user-info}}
+        {{/each}}
+      {{/load-more}}
 
       {{#unless canLoadMore}}
         {{#if user}}
-        <a class='load-more' href='{{model.url}}'>{{i18n 'badges.more_with_badge'}}</a>
+        <div class='clearfix'>
+          <a class='btn' href='{{model.url}}'>{{i18n 'badges.others_count' count=model.grant_count}}</a>
+        </div>
         {{/if}}
       {{/unless}}
-
     </div>
 
     {{conditional-loading-spinner condition=canLoadMore}}
diff --git a/app/assets/javascripts/discourse/templates/components/badge-button.hbs b/app/assets/javascripts/discourse/templates/components/badge-button.hbs
index 4886147389..8116e5195b 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-button.hbs
@@ -1,3 +1,3 @@
 {{icon-or-image badge.icon}}
-<span class="badge-display-name">{{badge.displayName}}</span>
+<span class="badge-display-name">{{badge.name}}</span>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
new file mode 100644
index 0000000000..765322dec8
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -0,0 +1,17 @@
+{{#if displayCount}}
+  <span class='grant-count' title={{i18n 'badges.granted' count=displayCount}}>{{displayCount}}</span>
+{{/if}}
+{{#if badge.has_badge}}
+  <span class='check-display status-checked'>{{fa-icon "check"}}</span>
+{{/if}}
+<div class='badge-contents'>
+  <div class='badge-icon {{badge.badgeTypeClassName}}'>
+    {{icon-or-image badge.icon}}
+  </div>
+  <div class='badge-info'>
+    <div class='badge-info-item'>
+      <h3>{{badge.name}}</h3>
+      <div class='badge-summary'>{{{summary}}}</div>
+    </div>
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/home-logo.hbs b/app/assets/javascripts/discourse/templates/components/home-logo.hbs
deleted file mode 100644
index b2b8f9e6db..0000000000
--- a/app/assets/javascripts/discourse/templates/components/home-logo.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<a href="{{unbound linkUrl}}" data-auto-route="true">
-  {{#if showSmallLogo}}
-    {{#if smallLogoUrl}}
-      <img class="logo-small" src="{{unbound smallLogoUrl}}" width="33" height="33">
-    {{else}}
-      <i class="fa fa-home"></i>
-    {{/if}}
-  {{else}}
-    {{#if showMobileLogo}}
-      <img id="site-logo" class="logo-big" src="{{unbound mobileBigLogoUrl}}" alt="{{unbound title}}">
-    {{else}}
-      {{#if bigLogoUrl}}
-        <img id="site-logo" class="logo-big" src="{{unbound bigLogoUrl}}" alt="{{unbound title}}">
-      {{else}}
-        <h2 id="site-text-logo" class="text-logo">{{unbound title}}</h2>
-      {{/if}}
-    {{/if}}
-  {{/if}}
-</a>
diff --git a/app/assets/javascripts/discourse/templates/components/user-small.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
similarity index 84%
rename from app/assets/javascripts/discourse/templates/components/user-small.hbs
rename to app/assets/javascripts/discourse/templates/components/user-info.hbs
index 83edc9c958..8270000cc2 100644
--- a/app/assets/javascripts/discourse/templates/components/user-small.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -8,4 +8,11 @@
     <span class="name">{{unbound name}}</span>
   </div>
   <div class="title">{{unbound user.title}}</div>
+
+  {{#if hasBlock}}
+    <div class='details'>
+      {{yield}}
+    </div>
+  {{/if}}
+
 </div>
diff --git a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
index ac1f2a4755..11a51ce6b7 100644
--- a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
@@ -4,7 +4,8 @@
       <li>
         <a href>
           {{#if option.src}}
-            <img src={{option.src}} class='emoji'> {{option.code}}
+            <img src={{option.src}} class='emoji'>
+            <span class='emoji-shortname'>{{option.code}}</span>
           {{else}}
             {{option.label}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs
index 9416f2b436..f8e486bb6c 100644
--- a/app/assets/javascripts/discourse/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/templates/exception.hbs
@@ -14,7 +14,7 @@
     </div>
     <div class="buttons">
       {{#each buttonData in enabledButtons}}
-        <button class="btn {{unbound buttonData.classes}}" {{action buttonData.action}}>{{boundI18n buttonData.key}}</button>
+        {{d-button icon=buttonData.icon action=buttonData.action label=buttonData.key class=buttonData.classes}}
       {{/each}}
       {{conditional-loading-spinner condition=loading}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group/members.hbs
index ba4715c0d5..2d3c9d80f5 100644
--- a/app/assets/javascripts/discourse/templates/group/members.hbs
+++ b/app/assets/javascripts/discourse/templates/group/members.hbs
@@ -18,7 +18,7 @@
     {{#each model.members as |m|}}
       <tr>
         <td class='avatar'>
-          {{user-small user=m}}
+          {{user-info user=m}}
           {{#if m.owner}}<span class='is-owner'>{{i18n "groups.owner"}}</span>{{/if}}
         </td>
         <td>
diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index cea25c3a63..cb1c3f6c9d 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -13,7 +13,7 @@
           {{#each ic in model itemController="directory-item"}}
             <div class="user {{if ic.me 'me'}}">
               {{#with ic.model as |it|}}
-                {{user-small user=it.user}}
+                {{user-info user=it.user}}
                 {{user-stat value=it.likes_received label="directory.likes_received" icon="heart"}}
                 {{user-stat value=it.likes_given label="directory.likes_given" icon="heart"}}
                 {{user-stat value=it.topic_count label="directory.topic_count"}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
index e62caac308..b7a86be5b8 100644
--- a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
@@ -10,7 +10,7 @@
     <div class="control-group">
       <label class="control-label"></label>
       <div class="controls">
-      {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.displayName" content=selectableUserBadges}}
+      {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/badge-title.hbs b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
index d95f4ff77f..b6c78a247e 100644
--- a/app/assets/javascripts/discourse/templates/user/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
@@ -10,7 +10,7 @@
     <div class="control-group">
       <label class="control-label"></label>
       <div class="controls">
-        {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.displayName" content=selectableUserBadges}}
+        {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/templates/user/badges.hbs
index 7cfc318ba1..042b08fbfa 100644
--- a/app/assets/javascripts/discourse/templates/user/badges.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badges.hbs
@@ -1,5 +1,5 @@
 <section class='user-content user-badges-list'>
-  {{#each ub in controller}}
-    {{user-badge badge=ub.badge count=ub.count user=user}}
+  {{#each controller as |ub|}}
+    {{badge-card badge=ub.badge count=ub.count navigateOnClick="true" username=user.username_lower}}
   {{/each}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index eb80ccd418..ea5e4b7e1b 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -174,8 +174,10 @@
           <div class='controls controls-dropdown'>
             {{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_minutes}}
           </div>
+          {{preference-checkbox labelKey="user.include_tl0_in_digests" checked=model.user_option.include_tl0_in_digests}}
         {{/if}}
       {{/if}}
+      <br/>
       <div class='controls controls-dropdown'>
         <label>{{i18n 'user.email_previous_replies.title'}}</label>
         {{combo-box valueAttribute="value" content=previousRepliesOptions value=model.user_option.email_previous_replies}}
@@ -184,7 +186,7 @@
       {{preference-checkbox labelKey="user.email_private_messages" checked=model.user_option.email_private_messages}}
       {{preference-checkbox labelKey="user.email_direct" checked=model.user_option.email_direct}}
       {{#unless siteSettings.disable_mailing_list_mode}}
-        {{preference-checkbox labelKey="user.mailing_list_mode" checked=model.user_option.mailing_list_mode}}
+        {{preference-checkbox warning="checkMailingList" labelKey="user.mailing_list_mode" checked=model.user_option.mailing_list_mode}}
       {{/unless}}
       {{preference-checkbox labelKey="user.email_always" checked=model.user_option.email_always}}
       {{#unless model.user_option.email_always}}
@@ -276,7 +278,7 @@
 
     {{plugin-outlet "user-custom-controls"}}
 
-    <div class="control-group">
+    <div class="control-group save-button">
       <div class="controls">
         {{partial 'user/preferences/save-button'}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index bca1399a19..71aad9499e 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -28,7 +28,7 @@
             {{#each ic in model itemController="directory-item"}}
               <tr class="{{if ic.me 'me'}}">
                 {{#with ic.model as |it|}}
-                  <td>{{user-small user=it.user}}</td>
+                  <td>{{user-info user=it.user}}</td>
                   <td>{{number it.likes_received}}</td>
                   <td>{{number it.likes_given}}</td>
                   <td>{{number it.topic_count}}</td>
diff --git a/app/assets/javascripts/discourse/views/badges-show.js.es6 b/app/assets/javascripts/discourse/views/badges-show.js.es6
deleted file mode 100644
index 9f94ae6a3a..0000000000
--- a/app/assets/javascripts/discourse/views/badges-show.js.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  eyelineSelector: '.badge-user',
-  tickOrX: function(field){
-    var icon = this.get('controller.model.' + field) ? "fa-check" : "fa-times";
-    return "<i class='fa " + icon + "'></i>";
-  },
-  allowTitle: function() { return this.tickOrX("allow_title"); }.property(),
-  multipleGrant: function() { return this.tickOrX("multiple_grant"); }.property()
-});
diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
index 13db7ce836..024e6d4421 100644
--- a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
+++ b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
@@ -19,6 +19,8 @@ class DecoratorHelper {
    * // renders `<div class='some-class'><p>paragraph</p></div>`
    * return helper.h('div.some-class', helper.h('p', 'paragraph'));
    * ```
+   * Check out  https://github.com/Matt-Esch/virtual-dom/blob/master/virtual-hyperscript/README.md
+   * for more details on how to construct markup with h.
    **/
   // h() is attached via `prototype` below
 
@@ -77,8 +79,8 @@ class DecoratorHelper {
    * return helper.cooked(`<p>Cook me</p>`);
    * ```
    **/
-  cooked(cookedText) {
-    return new PostCooked({ cookedText });
+  cooked(cooked) {
+    return new PostCooked({ cooked });
   }
 
   /**
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index 37e4c642a7..17332ba656 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -23,7 +23,6 @@ export default createWidget('post-admin-menu', {
     const contents = [];
     contents.push(h('h3', I18n.t('admin_title')));
 
-
     if (!attrs.isWhisper && this.currentUser.staff) {
       const buttonAtts = { action: 'togglePostType', icon: 'shield', className: 'toggle-post-type' };
 
@@ -35,25 +34,32 @@ export default createWidget('post-admin-menu', {
       contents.push(this.attach('post-admin-menu-button', buttonAtts));
     }
 
-    contents.push(this.attach('post-admin-menu-button', {
-      icon: 'cog', label: 'post.controls.rebake', action: 'rebakePost', className: 'rebuild-html'
-    }));
-
-    if (attrs.hidden) {
+    if (attrs.canManage) {
       contents.push(this.attach('post-admin-menu-button', {
-        icon: 'eye',
-        label: 'post.controls.unhide',
-        action: 'unhidePost',
-        className: 'unhide-post'
+        icon: 'cog', label: 'post.controls.rebake', action: 'rebakePost', className: 'rebuild-html'
       }));
+
+      if (attrs.hidden) {
+        contents.push(this.attach('post-admin-menu-button', {
+          icon: 'eye', label: 'post.controls.unhide', action: 'unhidePost', className: 'unhide-post'
+        }));
+      }
     }
 
     if (this.currentUser.admin) {
       contents.push(this.attach('post-admin-menu-button', {
-        icon: 'user',
-        label: 'post.controls.change_owner',
-        action: 'changePostOwner',
-        className: 'change-owner'
+        icon: 'user', label: 'post.controls.change_owner', action: 'changePostOwner', className: 'change-owner'
+      }));
+    }
+
+    // toggle Wiki button
+    if (attrs.wiki) {
+      contents.push(this.attach('post-admin-menu-button', {
+        action: 'toggleWiki', label: 'post.controls.unwiki', icon: 'pencil-square-o', className: 'wiki wikied'
+      }));
+    } else {
+      contents.push(this.attach('post-admin-menu-button', {
+        action: 'toggleWiki', label: 'post.controls.wiki', icon: 'pencil-square-o', className: 'wiki'
       }));
     }
 
@@ -64,4 +70,3 @@ export default createWidget('post-admin-menu', {
     this.sendWidgetAction('closeAdminMenu');
   }
 });
-
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index aff7d61fa2..4fb2cdef5c 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -81,8 +81,7 @@ registerButton('edit', attrs => {
       className: 'edit',
       title: 'post.controls.edit',
       icon: 'pencil',
-      alwaysShowYours: true,
-      alwaysShowWiki: true
+      alwaysShowYours: true
     };
   }
 });
@@ -161,7 +160,7 @@ registerButton('bookmark', attrs => {
 });
 
 registerButton('admin', attrs => {
-  if (!attrs.canManage) { return; }
+  if (!attrs.canManage && !attrs.canWiki) { return; }
   return { action: 'openAdminMenu',
            title: 'post.controls.admin',
            className: 'show-post-admin-menu',
@@ -180,22 +179,6 @@ registerButton('delete', attrs => {
   }
 });
 
-registerButton('wiki', attrs => {
-  if (!attrs.canWiki) { return; }
-
-  if (attrs.wiki) {
-    return { action: 'toggleWiki',
-             title: 'post.controls.unwiki',
-             icon: 'pencil-square-o',
-             className: 'wiki wikied' };
-  } else {
-    return { action: 'toggleWiki',
-             title: 'post.controls.wiki',
-             icon: 'pencil-square-o',
-             className: 'wiki' };
-  }
-});
-
 export default createWidget('post-menu', {
   tagName: 'section.post-menu-area.clearfix',
 
@@ -229,9 +212,7 @@ export default createWidget('post-menu', {
       const button = this.attachButton(i, attrs);
       if (button) {
         allButtons.push(button);
-        if ((attrs.yours && button.attrs.alwaysShowYours) ||
-            (attrs.wiki && button.attrs.alwaysShowWiki) ||
-            (hiddenButtons.indexOf(i) === -1)) {
+        if ((attrs.yours && button.attrs.alwaysShowYours) || (hiddenButtons.indexOf(i) === -1)) {
           visibleButtons.push(button);
         }
       }
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index f992101401..ffa1b1df67 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -423,7 +423,27 @@ export default createWidget('post', {
     const likeAction = post.get('likeAction');
 
     if (likeAction && likeAction.get('canToggle')) {
-      return likeAction.togglePromise(post);
+      return likeAction.togglePromise(post).then(result => this._warnIfClose(result));
+    }
+  },
+
+  _warnIfClose(result) {
+    if (!result || !result.acted) { return; }
+
+    const kvs = this.keyValueStore;
+    const lastWarnedLikes = kvs.get('lastWarnedLikes');
+
+    // only warn once per day
+    const yesterday = new Date().getTime() - 1000 * 60 * 60 * 24;
+    if (lastWarnedLikes && parseInt(lastWarnedLikes) > yesterday) {
+      return;
+    }
+
+    const { remaining, max } = result;
+    const threshold = Math.ceil(max * 0.1);
+    if (remaining === threshold) {
+      bootbox.alert(I18n.t('post.few_likes_left'));
+      kvs.set({ key: 'lastWarnedLikes', value: new Date().getTime() });
     }
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index c05b2500e5..63f6930485 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -119,6 +119,7 @@ export default class Widget {
     this.currentUser = container.lookup('current-user:main');
     this.store = container.lookup('store:main');
     this.appEvents = container.lookup('app-events:main');
+    this.keyValueStore = container.lookup('key-value-store:main');
 
     if (this.name) {
       const custom = _customSettings[this.name];
diff --git a/app/assets/javascripts/locales/gl.js.erb b/app/assets/javascripts/locales/gl.js.erb
new file mode 100644
index 0000000000..f38e7660de
--- /dev/null
+++ b/app/assets/javascripts/locales/gl.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.gl.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:gl) %>
diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js
index 1217131b4f..7816da8382 100644
--- a/app/assets/javascripts/main_include_admin.js
+++ b/app/assets/javascripts/main_include_admin.js
@@ -9,7 +9,6 @@
 //= require admin/routes/admin-email-logs
 //= require admin/controllers/admin-email-skipped
 //= require discourse/lib/export-result
-//= require_tree ./admin/lib
 //= require_tree ./admin
 
 //= require resumable.js
diff --git a/app/assets/stylesheets/common/base/bbcode.scss b/app/assets/stylesheets/common/base/bbcode.scss
index b2ff87815b..f40d8ac9a7 100644
--- a/app/assets/stylesheets/common/base/bbcode.scss
+++ b/app/assets/stylesheets/common/base/bbcode.scss
@@ -13,10 +13,4 @@ span {
   &.bbcode-s {
     text-decoration: line-through;
   }
-  // Font sizes
-  @for $i from 4 through 40 {
-    &.bbcode-size-#{$i} {
-      font-size: #{$i}px;
-    }
-  }
 }
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index ad4004264f..6af69033aa 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -1,6 +1,10 @@
 .directory {
   margin-bottom: 100px;
 
+  .user-info {
+    margin-bottom: 0;
+  }
+
   .period-chooser {
     float: left;
   }
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index c11d968702..e97a2d186a 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -100,3 +100,11 @@ table.emoji-page td {
 .emoji-modal .nav a {
   color: dark-light-choose(#333, #ccc);
 }
+
+.emoji-shortname {
+  display: inline-block;
+  max-width: 200px;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  vertical-align: middle;
+}
diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index 3b3282104d..c9a7087651 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -21,6 +21,7 @@
     }
   }
   .buttons {
+    display: inline-flex;
     margin-top: 15px;
 
     button {
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 63c41255d7..610832b1c8 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -17,6 +17,9 @@
 
     .title {
       float: left;
+      a, a:visited {
+        color: $header_primary;
+      }
     }
 
     #site-logo {
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 8f4d7a21b4..56cfc6b791 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -20,98 +20,18 @@
   }
 
   &.badge-type-gold .fa {
-    color: #ffd700;
+    color: #ffd700 !important;
   }
 
   &.badge-type-silver .fa {
-    color: #c0c0c0;
+    color: #c0c0c0 !important;
   }
 
   &.badge-type-bronze .fa {
-    color: #cd7f32;
+    color: #cd7f32 !important;
   }
 }
 
-/* User badge listing. */
-.user-badges-list {
-  text-align: center;
-
-  .user-badge {
-    max-width: 80px;
-    text-align: center;
-    vertical-align: top;
-    margin: 10px;
-    border: none;
-
-    .fa {
-      display: block;
-      font-size: 3.571em;
-      margin-bottom: 5px;
-    }
-
-    img {
-      display: block;
-      margin: auto auto 4px;
-      width: 55px;
-      height: 55px;
-    }
-
-    .count {
-      display: block;
-      font-size: 0.8em;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    }
-  }
-}
-
-/* Badge listing in /badges. */
-.badges-listing {
-  margin: 20px 0;
-  tr {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    td {
-      padding: 10px 0;
-    }
-  }
-
-  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-  width: 90%;
-  padding: 10px;
-  display: table;
-
-  .row {
-    display: table-row;
-    > div {
-      display: table-cell;
-      vertical-align: middle;
-    }
-  }
-
-  .user-badge {
-    font-size: $base-font-size;
-  }
-
-  .grant-count {
-    text-align: center;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
-    font-size: 120%;
-  }
-
-  .badge, .grant-count {
-    white-space: nowrap;
-  }
-
-  .info {
-    font-size: 0.9em;
-    text-align: right;
-  }
-
-  .description {
-  }
-
-}
-
 @media all and (max-width: 750px) {
   .show-badge .user-badge-with-posts .badge-user a.post-link {
     width: auto;
@@ -137,66 +57,23 @@
     }
   }
 }
+.user-info.medium.badge-info {
+  min-height: 80px;
 
-
-/* /badges/:id/:slug page styling. */
-.show-badge {
-  .badge-user {
-    text-align: center;
-    width: 100px;
-    padding: 5px 10px;
-    margin-bottom: 10px;
-    display: inline-block;
-    vertical-align: top;
-
-    .details {
-      margin: 0 10px;
-      padding-top: 3px;
-      color: $primary;
-    }
-
-    .username {
-      word-wrap: break-word;
-    }
-
-    .date {
-      display: block;
-      color: lighten($primary, 40%);
-      font-size: 0.714em;
-    }
-  }
-}
-
-.show-badge .user-badge-with-posts .badge-user {
-  width: 45%;
-  padding: 0 0 0 4%;
-  margin-bottom: 20px;
-
-  .badge-info {
-    width: 100px;
-    display: block;
-    float: left;
+  .granted-on {
+    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
   }
 
   .post-link {
-    width: 250px;
     display: block;
-    float: left;
-    margin-left: 18px;
-    text-align: left;
+    margin-top: 0.2em;
   }
 }
 
 .show-badge .badge-user-info {
-  margin-left: 2%;
   .earned {
-    margin-top: 15px;
     font-size: 1.3em;
-  }
-  .username {
-    margin-top: 5px;
-    display: block;
-    color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+    margin-bottom: 1em;
   }
 }
 
@@ -241,5 +118,134 @@
 
 .long-description.banner {
   width: 88%;
-  margin-bottom: 20px;
+  margin-bottom: 15px;
+  margin-top: 15px;
+}
+
+.badge-card {
+  position: relative;
+  display: inline-block;
+  background-color: dark-light-diff($primary, $secondary, 95%, -65%);
+  margin-right: 5px;
+  margin-bottom: 10px;
+  box-shadow: 1px 1px 3px rgba(0.0, 0.0, 0.0, 0.2);
+
+  .check-display {
+    position: absolute;
+    left: 5px;
+    top: 5px;
+  }
+
+  .grant-count {
+    position: absolute;
+    right: 5px;
+    top: 5px;
+    font-weight: bold;
+    color: dark-light-diff($primary, $secondary, 50%, -65%);
+    font-size: 1.2em;
+  }
+
+  .badge-contents {
+    display: flex;
+    flex-direction: row;
+    min-height: 128px;
+
+    .badge-icon {
+      min-width: 90px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: dark-light-diff($primary, $secondary, 92%, -60%);
+      font-size: 3em;
+
+      img {
+        max-width: 80px;
+      }
+
+      &.badge-type-gold .fa {
+        color: #ffd700 !important;
+      }
+
+      &.badge-type-silver .fa {
+        color: #c0c0c0 !important;
+      }
+
+      &.badge-type-bronze .fa {
+        color: #cd7f32 !important;
+      }
+    }
+
+    .badge-info {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 15px;
+      color: $primary;
+
+      h3 {
+        margin-bottom: 0.25em;
+      }
+    }
+  }
+}
+
+.badge-card.medium {
+  width: 350px;
+  vertical-align: top;
+}
+
+.badge-card.large {
+  width: 750px;
+}
+
+.badge-groups {
+  margin: 20px 0;
+  color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+  h3 {
+    margin-bottom: 1.0em;
+  }
+}
+
+.badge-grouping {
+  margin-bottom: 1.5em;
+}
+
+.show-badge-details {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 2em;
+  margin-top: 1em;
+
+  .badge-grant-info {
+    display: flex;
+    align-items: center;
+    margin-left: 1em;
+  }
+  .grant-info-item {
+    margin-bottom: 1em;
+    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+  }
+}
+
+.check-display {
+  display: inline-block;
+  width: 18px;
+  border-radius: 10px;
+  text-align: center;
+  .fa {
+    font-size: 0.9em;
+    color: $secondary;
+  }
+}
+
+.check-display.status-checked {
+  background-color: $success;
+}
+
+.check-display.status-unchecked {
+  background-color: $danger;
+}
+
+.hyperlink {
+  cursor: pointer;
 }
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 8ec1047f4c..39926e061b 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -19,6 +19,23 @@
   i.fa-heart {
     color: $love !important;
   }
+  .nav-pills {
+    a {
+      color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+    }
+
+    a:hover i {
+      color: $quaternary;
+    }
+
+    a.active i {
+      color: $secondary;
+    }
+
+    i {
+      color: dark-light-choose(scale-color($primary, $lightness: 55%), scale-color($secondary, $lightness: 55%));
+    }
+  }
 }
 
 .user-field {
@@ -92,10 +109,10 @@
   margin-bottom: 15px;
 }
 
-.user-small {
+.user-info {
   display: inline-block;
-  width: 333px;
   clear: both;
+  margin-bottom: 1em;
 
   .user-image {
     float: left;
@@ -128,7 +145,30 @@
       margin-top: 3px;
       color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
     }
+  }
+}
 
+.user-info.small {
+  width: 333px;
+}
+
+.user-info.medium {
+  width: 480px;
+  min-height: 60px;
+
+  .user-image {
+    width: 55px;
+  }
+  .user-detail {
+    width: 380px;
+  }
+
+  .username, .name {
+    display: block;
+  }
+
+  .name {
+    margin-left: 0;
   }
 }
 
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index ff74c6714b..f4ce15a022 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -11,6 +11,11 @@
     padding:8px;
     font-size: 2.1em;
   }
+
+  .site-text-logo {
+    position: relative;
+    top: 10px;
+  }
 }
 
 @media all
@@ -36,3 +41,9 @@ and (max-width : 570px) {
     color: dark-light-choose(scale-color($primary, $lightness: 25%), scale-color($secondary, $lightness: 75%));
   }
 }
+
+header {
+  #site-text-logo {
+    line-height: 40px;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index d7372c53a3..3de80c9478 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -181,10 +181,11 @@ input {
       bottom: 35px;
     }
     .submit-panel {
-      width: 50%;
+      // need minimum width that fits, or this'll wrap cancel under submit/create which is super bad
+      width: 180px;
       position: absolute;
       display: block;
-      bottom: 2px;
+      bottom: 0;
     }
   }
   .category-input {
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 7840a341c9..b1fa421c74 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -120,7 +120,7 @@ h2#site-text-logo
   list-style: none;
   overflow: visible;
   position: relative;
-  width: 40%;
+  width: 45%;
 
   > li > a {
     padding: 8px 10px;
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 3b8e8e15f4..ab112d8bda 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -2,6 +2,12 @@
 // Discourse header
 // --------------------------------------------------
 
+@media only screen and (max-width: 320px) {
+  #site-text-logo {
+    font-size: 18px;
+  }
+}
+
 .d-header {
 
   #site-logo {
@@ -10,11 +16,16 @@
 
   // some protection for text-only site titles
   .title {
-    max-width: 130px;
+    max-width: 50%;
     height: 39px;
     overflow: hidden;
     padding: 0;
     text-overflow: clip;
+    display: table;
+    a {
+      display: table-cell;
+      vertical-align: middle;
+    }
   }
 
   .icons {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index fdcc9e192e..7a946e328a 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -16,7 +16,7 @@
 
 .topic-post article {
   border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-  padding: 6px 0;
+  padding: 8px 0;
 }
 
 .post-stream {
@@ -287,7 +287,7 @@ a.star {
     .btn {
       border: 0;
       padding: 0 15px;
-      color: $primary;
+      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
       background: blend-primary-secondary(5%);
       border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
       border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
@@ -486,9 +486,13 @@ span.highlighted {
   .names {
     margin: 5px 0 0 5px;
     line-height: 17px;
-    span {
+    span.full-name, span.user-title, span.username {
       display: block;
     }
+
+    .poster-icon {
+      float: right;
+    }
   }
   .post-info {
     float: right;
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 7725172431..8b8f3873da 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -56,6 +56,10 @@
     }
   }
 
+  .delete-account {
+    overflow: hidden;
+  }
+
   .checkbox-label {
     overflow: auto;
     display: block;
@@ -140,11 +144,6 @@
 
 .user-main {
 
-  width: 100%;
-  float: left;
-  margin-bottom: 50px;
-
-
   table.group-members {
     width: 100%;
     p {
@@ -169,18 +168,15 @@
         color: $primary;
       }
     }
-    .user-small {
+    .user-info {
       width: 245px;
     }
   }
 
   .user-content {
-    padding: 10px 8px;
     background-color: $secondary;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    margin-bottom: 10px;
     box-sizing: border-box;
-    margin-top: 20px;
+    margin-top: 10px;
 
     .btn.right {
       float: right
@@ -393,7 +389,6 @@
 
 
   .user-stream {
-    padding: 0 10px;
     .excerpt {
       margin: 5px 0;
       font-size: 0.929em;
@@ -596,3 +591,33 @@
 .notification-buttons {
   display: inline-block;
 }
+
+// mobile fixups for badges
+
+.badge-card.medium {
+  width: 300px;
+}
+
+.show-badge-details {
+  margin-bottom: 1em;
+}
+
+.user-badges {
+  margin-bottom: 2em;
+}
+
+.show-badge-details .badge-grant-info {
+  display: none;
+}
+
+.user-info.medium {
+  width: 300px;
+}
+
+.user-info.medium.user-detail {
+  width: 240px;
+}
+
+.user-info.medium.user-image {
+  width: 50px;
+}
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index b32f0b9194..e7d6325808 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -11,7 +11,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "system_messages.email_reject_destination", "system_messages.email_reject_empty",
                      "system_messages.email_reject_invalid_access", "system_messages.email_reject_no_account",
                      "system_messages.email_reject_parsing", "system_messages.email_reject_post_error",
-                     "system_messages.email_reject_post_error_specified",
+                     "system_messages.email_reject_post_error_specified", "system_messages.email_reject_user_not_found",
                      "system_messages.email_reject_reply_key", "system_messages.email_reject_topic_closed",
                      "system_messages.email_reject_topic_not_found", "system_messages.email_reject_trust_level",
                      "system_messages.pending_users_reminder", "system_messages.post_hidden",
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index da18abe08d..b51f6e71a3 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -282,9 +282,13 @@ class Admin::UsersController < Admin::AdminController
     return render nothing: true, status: 404 unless SiteSetting.enable_sso
 
     sso = DiscourseSingleSignOn.parse("sso=#{params[:sso]}&sig=#{params[:sig]}")
-    user = sso.lookup_or_create_user
 
-    render_serialized(user, AdminDetailedUserSerializer, root: false)
+    begin
+      user = sso.lookup_or_create_user
+      render_serialized(user, AdminDetailedUserSerializer, root: false)
+    rescue ActiveRecord::RecordInvalid => ex
+      render json: failed_json.merge(message: ex.message), status: 403
+    end
   end
 
   def delete_other_accounts_with_same_ip
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 558ec2f603..2db8479588 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -100,7 +100,16 @@ class ApplicationController < ActionController::Base
 
   class PluginDisabled < StandardError; end
 
-  rescue_from Discourse::NotFound, PluginDisabled do
+  # Handles requests for giant IDs that throw pg exceptions
+  rescue_from RangeError do |e|
+    if e.message =~ /ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer/
+      rescue_discourse_actions(:not_found, 404)
+    else
+      raise e
+    end
+  end
+
+  rescue_from Discourse::NotFound, PluginDisabled  do
     rescue_discourse_actions(:not_found, 404)
   end
 
diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index 728a3dbf69..4b15a7796e 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -2,6 +2,8 @@ class BadgesController < ApplicationController
   skip_before_filter :check_xhr, only: [:index, :show]
 
   def index
+    raise Discourse::NotFound unless SiteSetting.enable_badges
+
     badges = Badge.all
 
     if (params[:only_listable] == "true") || !request.xhr?
@@ -28,6 +30,8 @@ class BadgesController < ApplicationController
   end
 
   def show
+    raise Discourse::NotFound unless SiteSetting.enable_badges
+
     params.require(:id)
     badge = Badge.enabled.find(params[:id])
 
diff --git a/app/controllers/category_hashtags_controller.rb b/app/controllers/category_hashtags_controller.rb
index ca4a1f7006..e779391f37 100644
--- a/app/controllers/category_hashtags_controller.rb
+++ b/app/controllers/category_hashtags_controller.rb
@@ -3,7 +3,6 @@ class CategoryHashtagsController < ApplicationController
 
   def check
     category_slugs = params[:category_slugs]
-    category_slugs.each(&:downcase!)
 
     ids = category_slugs.map { |category_slug| Category.query_from_hashtag_slug(category_slug).try(:id) }
 
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index e33dfa449e..311a11b2f9 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,6 +1,7 @@
 class GroupsController < ApplicationController
 
   before_filter :ensure_logged_in, only: [:set_notifications]
+  skip_before_filter :preload_json, :check_xhr, only: [:posts_feed, :mentions_feed]
 
   def show
     render_serialized(find_group(:id), BasicGroupSerializer)
@@ -29,6 +30,15 @@ class GroupsController < ApplicationController
     render_serialized posts.to_a, GroupPostSerializer
   end
 
+  def posts_feed
+    group = find_group(:group_id)
+    @posts = group.posts_for(guardian).limit(50)
+    @title = "#{SiteSetting.title} - #{I18n.t("rss_description.group_posts", group_name: group.name)}"
+    @link = Discourse.base_url
+    @description = I18n.t("rss_description.group_posts", group_name: group.name)
+    render 'posts/latest', formats: [:rss]
+  end
+
   def topics
     group = find_group(:group_id)
     posts = group.posts_for(guardian, params[:before_post_id]).where(post_number: 1).limit(20)
@@ -41,6 +51,15 @@ class GroupsController < ApplicationController
     render_serialized posts.to_a, GroupPostSerializer
   end
 
+  def mentions_feed
+    group = find_group(:group_id)
+    @posts = group.mentioned_posts_for(guardian).limit(50)
+    @title = "#{SiteSetting.title} - #{I18n.t("rss_description.group_mentions", group_name: group.name)}"
+    @link = Discourse.base_url
+    @description = I18n.t("rss_description.group_mentions", group_name: group.name)
+    render 'posts/latest', formats: [:rss]
+  end
+
   def messages
     group = find_group(:group_id)
     posts = if guardian.can_see_group_messages?(group)
diff --git a/app/controllers/manifest_json_controller.rb b/app/controllers/manifest_json_controller.rb
index 5462ec1fd6..8c7b6bc42b 100644
--- a/app/controllers/manifest_json_controller.rb
+++ b/app/controllers/manifest_json_controller.rb
@@ -1,13 +1,15 @@
 class ManifestJsonController < ApplicationController
   layout false
-  skip_before_filter :preload_json, :check_xhr
+  skip_before_filter :preload_json, :check_xhr, :redirect_to_login_if_required
 
   def index
     manifest = {
       short_name: SiteSetting.title,
-      display: 'browser',
+      display: 'standalone',
       orientation: 'portrait',
-      start_url: "#{Discourse.base_uri}/"
+      start_url: "#{Discourse.base_uri}/",
+      background_color: "##{ColorScheme.hex_for_name('secondary')}",
+      theme_color: "##{ColorScheme.hex_for_name('header_background')}"
     }
 
     render json: manifest.to_json
diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb
index f707c57e67..c23d2ed6f4 100644
--- a/app/controllers/post_actions_controller.rb
+++ b/app/controllers/post_actions_controller.rb
@@ -21,17 +21,14 @@ class PostActionsController < ApplicationController
     else
       # We need to reload or otherwise we are showing the old values on the front end
       @post.reload
+
+      if @post_action_type_id == PostActionType.types[:like]
+        limiter = post_action.post_action_rate_limiter
+        response.headers['Discourse-Actions-Remaining'] = limiter.remaining.to_s
+        response.headers['Discourse-Actions-Max'] = limiter.max.to_s
+      end
       render_post_json(@post, _add_raw = false)
     end
-  rescue RateLimiter::LimitExceeded => e
-    # Special case: if we hit the create like rate limit, record it in user history
-    # so we can award a badge
-    if e.type == "create_like"
-      UserHistory.create!(action: UserHistory.actions[:rate_limited_like],
-                          target_user_id: current_user.id,
-                          post_id: @post.id)
-    end
-    render_rate_limit_error(e)
   end
 
   def destroy
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index fdf3dbb687..230eac8323 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -37,14 +37,29 @@ class PostsController < ApplicationController
     last_post_id = params[:before].to_i
     last_post_id = Post.last.id if last_post_id <= 0
 
-    # last 50 post IDs only, to avoid counting deleted posts in security check
-    posts = Post.order(created_at: :desc)
-                .where('posts.id <= ?', last_post_id)
-                .where('posts.id > ?', last_post_id - 50)
-                .includes(topic: :category)
-                .includes(user: :primary_group)
-                .includes(:reply_to_user)
-                .limit(50)
+    if params[:id] == "private_posts"
+      raise Discourse::NotFound if current_user.nil?
+      posts = Post.private_posts
+                  .order(created_at: :desc)
+                  .where('posts.id <= ?', last_post_id)
+                  .where('posts.id > ?', last_post_id - 50)
+                  .includes(topic: :category)
+                  .includes(user: :primary_group)
+                  .includes(:reply_to_user)
+                  .limit(50)
+      rss_description = I18n.t("rss_description.private_posts")
+    else
+      posts = Post.public_posts
+                  .order(created_at: :desc)
+                  .where('posts.id <= ?', last_post_id)
+                  .where('posts.id > ?', last_post_id - 50)
+                  .includes(topic: :category)
+                  .includes(user: :primary_group)
+                  .includes(:reply_to_user)
+                  .limit(50)
+      rss_description = I18n.t("rss_description.posts")
+    end
+
     # Remove posts the user doesn't have permission to see
     # This isn't leaking any information we weren't already through the post ID numbers
     posts = posts.reject { |post| !guardian.can_see?(post) || post.topic.blank? }
@@ -53,16 +68,16 @@ class PostsController < ApplicationController
     respond_to do |format|
       format.rss do
         @posts = posts
-        @title = "#{SiteSetting.title} - #{I18n.t("rss_description.posts")}"
+        @title = "#{SiteSetting.title} - #{rss_description}"
         @link = Discourse.base_url
-        @description = I18n.t("rss_description.posts")
+        @description = rss_description
         render 'posts/latest', formats: [:rss]
       end
       format.json do
         render_json_dump(serialize_data(posts,
                                         PostSerializer,
                                         scope: guardian,
-                                        root: 'latest_posts',
+                                        root: params[:id],
                                         add_raw: true,
                                         add_title: true,
                                         all_post_actions: counts)
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 0b857278f0..bdbb163a77 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -25,6 +25,8 @@ class SearchController < ApplicationController
     search = Search.new(params[:q], search_args)
     result = search.execute
 
+    result.find_user_data(guardian) if result
+
     serializer = serialize_data(result, GroupedSearchResultSerializer, result: result)
 
     respond_to do |format|
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 1b755a2d93..6a09a8060e 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -112,6 +112,8 @@ class SessionController < ApplicationController
       else
         render text: I18n.t("sso.not_found"), status: 500
       end
+    rescue ActiveRecord::RecordInvalid => e
+      render text: I18n.t("sso.unknown_error"), status: 500
     rescue => e
       details = {}
       SingleSignOn::ACCESSORS.each do |a|
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 3b57d0578d..a346910543 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -129,7 +129,7 @@ class UserAvatarsController < ApplicationController
 
     unless File.exist? path
       FileUtils.mkdir_p PROXY_PATH
-      tmp = FileHelper.download(url, 1.megabyte, filename, true)
+      tmp = FileHelper.download(url, 1.megabyte, filename, true, 10)
       FileUtils.mv tmp.path, path
     end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 586e7fded0..d20d090c4f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -165,7 +165,7 @@ class UsersController < ApplicationController
   end
 
   def my_redirect
-    raise Discourse::NotFound if params[:path] !~ /^[a-z\-\/]+$/
+    raise Discourse::NotFound if params[:path] !~ /^[a-z_\-\/]+$/
 
     if current_user.blank?
       cookies[:destination_url] = "/my/#{params[:path]}"
diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb
index 29436e4232..c273ce0e47 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -3,6 +3,8 @@ module Jobs
   class NotifyMailingListSubscribers < Jobs::Base
 
     def execute(args)
+      return if SiteSetting.disable_mailing_list_mode
+
       post_id = args[:post_id]
       post = post_id ? Post.with_deleted.find_by(id: post_id) : nil
 
@@ -33,8 +35,19 @@ module Jobs
       users.each do |user|
         if Guardian.new(user).can_see?(post)
           begin
-            message = UserNotifications.mailing_list_notify(user, post)
-            Email::Sender.new(message, :mailing_list, user).send if message
+            if EmailLog.reached_max_emails?(user)
+              EmailLog.create!(
+                email_type: 'mailing_list',
+                to_address: user.email,
+                user_id: user.id,
+                post_id: post.id,
+                skipped: true,
+                skipped_reason: "[MailingList] #{I18n.t('email_log.exceeded_limit')}"
+              )
+            else
+              message = UserNotifications.mailing_list_notify(user, post)
+              Email::Sender.new(message, :mailing_list, user).send if message
+            end
           rescue => e
             Discourse.handle_job_exception(e, error_context(args, "Sending post to mailing list subscribers", { user_id: user.id, user_email: user.email }))
           end
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index ca7b73dc71..160629dfef 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -113,6 +113,10 @@ module Jobs
         email_args[:new_email] = user.email
       end
 
+      if EmailLog.reached_max_emails?(user)
+        return skip_message(I18n.t('email_log.exceeded_limit'))
+      end
+
       message = UserNotifications.send(type, user, email_args)
 
       # Update the to address if we have a custom one
diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 9a69f14094..320b985883 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -40,6 +40,7 @@ module Jobs
       message_template = case e
         when Email::Receiver::EmptyEmailError             then :email_reject_empty
         when Email::Receiver::NoBodyDetectedError         then :email_reject_empty
+        when Email::Receiver::UserNotFoundError           then :email_reject_user_not_found
         when Email::Receiver::AutoGeneratedEmailError     then :email_reject_auto_generated
         when Email::Receiver::InactiveUserError           then :email_reject_inactive_user
         when Email::Receiver::BlockedUserError            then :email_reject_blocked_user
@@ -57,6 +58,7 @@ module Jobs
       end
 
       template_args = {}
+      client_message = nil
 
       # there might be more information available in the exception
       if message_template == :email_reject_invalid_post && e.message.size > 6
@@ -77,12 +79,12 @@ module Jobs
 
         client_message = RejectionMailer.send_rejection(message_template, message.from, template_args)
         Email::Sender.new(client_message, message_template).send
-
-        client_message
       else
         mark_as_errored!
         Discourse.handle_job_exception(e, error_context(@args, "Unrecognized error type when processing incoming email", mail: mail_string))
       end
+
+      client_message
     end
 
     def poll_pop3
@@ -94,9 +96,12 @@ module Jobs
           process_popmail(p)
         end
       end
+    rescue Net::OpenTimeout => e
+      mark_as_errored!
+      Discourse.handle_job_exception(e, error_context(@args, "Connecting to '#{SiteSetting.pop3_polling_host}' for polling emails."))
     rescue Net::POPAuthenticationError => e
       mark_as_errored!
-      Discourse.handle_job_exception(e, error_context(@args, "Signing in to poll incoming email"))
+      Discourse.handle_job_exception(e, error_context(@args, "Signing in to poll incoming emails."))
     end
 
     POLL_MAILBOX_ERRORS_KEY ||= "poll_mailbox_errors".freeze
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 943b2a127a..1fa152df21 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -173,12 +173,14 @@ class UserNotifications < ActionMailer::Base
   end
 
   def user_invited_to_private_message(user, opts)
-    opts[:use_template_html] = true
+    opts[:allow_reply_by_email] = false
+    opts[:use_invite_template] = true
     notification_email(user, opts)
   end
 
   def user_invited_to_topic(user, opts)
-    opts[:use_template_html] = true
+    opts[:allow_reply_by_email] = false
+    opts[:use_invite_template] = true
     opts[:show_category_in_subject] = true
     notification_email(user, opts)
   end
@@ -273,7 +275,7 @@ class UserNotifications < ActionMailer::Base
       add_re_to_subject: opts[:add_re_to_subject],
       show_category_in_subject: opts[:show_category_in_subject],
       notification_type: notification_type,
-      use_template_html: opts[:use_template_html],
+      use_invite_template: opts[:use_invite_template],
       user: user
     )
   end
@@ -317,20 +319,39 @@ class UserNotifications < ActionMailer::Base
       end
     end
 
-    topic_excerpt = ""
-    if opts[:use_template_html]
+    reached_limit = SiteSetting.max_emails_per_day_per_user > 0
+    reached_limit &&= (EmailLog.where(user_id: user.id, skipped: false)
+                            .where('created_at > ?', 1.day.ago)
+                            .count) >= (SiteSetting.max_emails_per_day_per_user-1)
+
+    if opts[:use_invite_template]
+      if post.topic.private_message?
+        invite_template = "user_notifications.invited_to_private_message_body"
+      else
+        invite_template = "user_notifications.invited_to_topic_body"
+      end
       topic_excerpt = post.excerpt.gsub("\n", " ") if post.is_first_post? && post.excerpt
+      message = I18n.t(invite_template, username: post.username, topic_title: title, topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description)
+      html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
+        template: 'email/invite',
+        format: :html,
+        locals: { message: PrettyText.cook(message, sanitize: false).html_safe,
+                  classes: RTL.new(user).css_class
+        }
+      )
     else
       in_reply_to_post = post.reply_to_post if user.user_option.email_in_reply_to
       html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
         template: 'email/notification',
         format: :html,
         locals: { context_posts: context_posts,
+                  reached_limit: reached_limit,
                   post: post,
                   in_reply_to_post: in_reply_to_post,
                   classes: RTL.new(user).css_class
         }
       )
+      message = email_post_markdown(post) + (reached_limit ? "\n\n#{I18n.t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user}" : "");
     end
 
     template = "user_notifications.user_#{notification_type}"
@@ -339,10 +360,10 @@ class UserNotifications < ActionMailer::Base
       template << "_staged" if user.staged?
     end
 
+
     email_opts = {
       topic_title: title,
-      topic_excerpt: topic_excerpt,
-      message: email_post_markdown(post),
+      message: message,
       url: post.url,
       post_id: post.id,
       topic_id: post.topic_id,
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 7e6b237f94..38011348a6 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -286,25 +286,22 @@ SQL
 
     def self.like_rate_limit(count)
       <<-SQL
-        SELECT uh.target_user_id AS user_id, MAX(uh.created_at) AS granted_at
-        FROM user_histories AS uh
-        WHERE uh.action = #{UserHistory.actions[:rate_limited_like]}
-          AND (:backfill OR uh.target_user_id IN (:user_ids))
-        GROUP BY uh.target_user_id
+        SELECT gdl.user_id, current_timestamp AS granted_at
+        FROM given_daily_likes AS gdl
+        WHERE gdl.limit_reached
+          AND (:backfill OR gdl.user_id IN (:user_ids))
+        GROUP BY gdl.user_id
         HAVING COUNT(*) >= #{count}
       SQL
     end
 
-    def self.liked_back(min_posts, ratio)
+    def self.liked_back(likes_received, likes_given)
       <<-SQL
-        SELECT p.user_id, current_timestamp AS granted_at
-        FROM posts AS p
-        INNER JOIN user_stats AS us ON us.user_id = p.user_id
-        WHERE p.like_count > 0
-          AND (:backfill OR p.user_id IN (:user_ids))
-        GROUP BY p.user_id, us.likes_given
-        HAVING count(*) > #{min_posts}
-          AND (us.likes_given / count(*)::float) > #{ratio}
+        SELECT us.user_id, current_timestamp AS granted_at
+        FROM user_stats AS us
+        WHERE us.likes_received >= #{likes_received}
+          AND us.likes_given >= #{likes_given}
+          AND (:backfill OR us.user_id IN (:user_ids))
       SQL
     end
   end
@@ -325,7 +322,11 @@ SQL
 
   # fields that can not be edited on system badges
   def self.protected_system_fields
-    [:badge_type_id, :multiple_grant, :target_posts, :show_posts, :query, :trigger, :auto_revoke, :listable]
+    [
+      :badge_type_id, :multiple_grant,
+      :target_posts, :show_posts, :query,
+      :trigger, :auto_revoke, :listable
+    ]
   end
 
   def self.trust_level_badge_ids
@@ -373,12 +374,19 @@ SQL
   end
 
   def self.ensure_consistency!
+    exec_sql <<SQL
+    DELETE FROM user_badges
+    USING user_badges ub
+    LEFT JOIN users u ON u.id = ub.user_id
+    WHERE u.id IS NULL AND user_badges.id = ub.id
+SQL
+
     Badge.find_each(&:reset_grant_count!)
   end
 
   def display_name
     if self.system?
-      key = "admin_js.badges.badge.#{i18n_name}.name"
+      key = "badges.#{i18n_name}.name"
       I18n.t(key, default: self.name)
     else
       self.name
@@ -389,11 +397,37 @@ SQL
     if self[:long_description].present?
       self[:long_description]
     else
-      key = "badges.long_descriptions.#{i18n_name}"
+      key = "badges.#{i18n_name}.long_description"
       I18n.t(key, default: '')
     end
   end
 
+  def long_description=(val)
+    if val != long_description
+      self[:long_description] = val
+    end
+
+    val
+  end
+
+  def description
+    if self[:description].present?
+      self[:description]
+    else
+      key = "badges.#{i18n_name}.description"
+      I18n.t(key, default: '')
+    end
+  end
+
+  def description=(val)
+    if val != description
+      self[:description] = val
+    end
+
+    val
+  end
+
+
   def slug
     Slug.for(self.display_name, '-')
   end
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
index c34477384c..4ada2343ec 100644
--- a/app/models/directory_item.rb
+++ b/app/models/directory_item.rb
@@ -160,5 +160,5 @@ end
 #
 # Indexes
 #
-#  index_directory_items_on_period_type  (period_type)
+#  index_directory_items_on_period_type_and_user_id  (period_type,user_id) UNIQUE
 #
diff --git a/app/models/email_change_request.rb b/app/models/email_change_request.rb
index 64d1fa104f..229b858d47 100644
--- a/app/models/email_change_request.rb
+++ b/app/models/email_change_request.rb
@@ -7,3 +7,22 @@ class EmailChangeRequest < ActiveRecord::Base
   end
 
 end
+
+# == Schema Information
+#
+# Table name: email_change_requests
+#
+#  id                 :integer          not null, primary key
+#  user_id            :integer          not null
+#  old_email          :string           not null
+#  new_email          :string           not null
+#  old_email_token_id :integer
+#  new_email_token_id :integer
+#  change_state       :integer          not null
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#
+# Indexes
+#
+#  index_email_change_requests_on_user_id  (user_id)
+#
diff --git a/app/models/email_log.rb b/app/models/email_log.rb
index 7a8e9ef667..eb6c1a3173 100644
--- a/app/models/email_log.rb
+++ b/app/models/email_log.rb
@@ -13,6 +13,16 @@ class EmailLog < ActiveRecord::Base
     User.where(id: user_id).update_all("last_emailed_at = CURRENT_TIMESTAMP") if user_id.present? && !skipped
   end
 
+  def self.reached_max_emails?(user)
+    return false if SiteSetting.max_emails_per_day_per_user == 0
+
+    count = sent.where('created_at > ?', 1.day.ago)
+        .where(user_id: user.id)
+        .count
+
+    count >= SiteSetting.max_emails_per_day_per_user
+  end
+
   def self.count_per_day(start_date, end_date)
     sent.where("created_at BETWEEN ? AND ?", start_date, end_date)
         .group("DATE(created_at)")
diff --git a/app/models/given_daily_like.rb b/app/models/given_daily_like.rb
new file mode 100644
index 0000000000..87da419453
--- /dev/null
+++ b/app/models/given_daily_like.rb
@@ -0,0 +1,49 @@
+class GivenDailyLike < ActiveRecord::Base
+  belongs_to :user
+
+  def self.find_for(user_id, date)
+    where(user_id: user_id, given_date: date)
+  end
+
+  def self.increment_for(user_id)
+    return unless user_id
+    given_date = Date.today
+
+    # upsert would be nice here
+    rows = find_for(user_id, given_date).update_all('likes_given = likes_given + 1')
+
+    if rows == 0
+      create(user_id: user_id, given_date: given_date, likes_given: 1)
+    else
+      find_for(user_id, given_date)
+              .where('limit_reached = false AND likes_given >= :limit', limit: SiteSetting.max_likes_per_day)
+              .update_all(limit_reached: true)
+    end
+  end
+
+  def self.decrement_for(user_id)
+    return unless user_id
+
+    given_date = Date.today
+
+    find_for(user_id, given_date).update_all('likes_given = likes_given - 1')
+    find_for(user_id, given_date)
+            .where('limit_reached = true AND likes_given < :limit', limit: SiteSetting.max_likes_per_day)
+            .update_all(limit_reached: false)
+  end
+end
+
+# == Schema Information
+#
+# Table name: given_daily_likes
+#
+#  user_id       :integer          not null
+#  likes_given   :integer          not null
+#  given_date    :date             not null
+#  limit_reached :boolean          default(FALSE), not null
+#
+# Indexes
+#
+#  index_given_daily_likes_on_limit_reached_and_user_id  (limit_reached,user_id)
+#  index_given_daily_likes_on_user_id_and_given_date     (user_id,given_date) UNIQUE
+#
diff --git a/app/models/group.rb b/app/models/group.rb
index af2573e50f..3acf120e7d 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -42,6 +42,7 @@ class Group < ActiveRecord::Base
   }
 
   AUTO_GROUP_IDS = Hash[*AUTO_GROUPS.to_a.flatten.reverse]
+  STAFF_GROUPS = [:admins, :moderators, :staff]
 
   ALIAS_LEVELS = {
     :nobody => 0,
@@ -370,6 +371,10 @@ class Group < ActiveRecord::Base
     Group.mentionable(user).where(id: group_id).exists?
   end
 
+  def staff?
+    STAFF_GROUPS.include?(self.name.to_sym)
+  end
+
   protected
 
     def name_format_validator
diff --git a/app/models/incoming_email.rb b/app/models/incoming_email.rb
index 1ba3fb88c3..416cc3afc5 100644
--- a/app/models/incoming_email.rb
+++ b/app/models/incoming_email.rb
@@ -10,19 +10,20 @@ end
 #
 # Table name: incoming_emails
 #
-#  id           :integer          not null, primary key
-#  user_id      :integer
-#  topic_id     :integer
-#  post_id      :integer
-#  raw          :text
-#  error        :text
-#  message_id   :text
-#  from_address :text
-#  to_addresses :text
-#  cc_addresses :text
-#  subject      :text
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  id                :integer          not null, primary key
+#  user_id           :integer
+#  topic_id          :integer
+#  post_id           :integer
+#  raw               :text
+#  error             :text
+#  message_id        :text
+#  from_address      :text
+#  to_addresses      :text
+#  cc_addresses      :text
+#  subject           :text
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  rejection_message :text
 #
 # Indexes
 #
diff --git a/app/models/instagram_user_info.rb b/app/models/instagram_user_info.rb
index c16a432934..d2ac28ffcd 100644
--- a/app/models/instagram_user_info.rb
+++ b/app/models/instagram_user_info.rb
@@ -3,3 +3,15 @@ class InstagramUserInfo < ActiveRecord::Base
   belongs_to :user
 
 end
+
+# == Schema Information
+#
+# Table name: instagram_user_infos
+#
+#  id                :integer          not null, primary key
+#  user_id           :integer
+#  screen_name       :string
+#  instagram_user_id :integer
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#
diff --git a/app/models/post.rb b/app/models/post.rb
index 7584c7522b..31a60e760a 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -202,9 +202,9 @@ class Post < ActiveRecord::Base
 
     if post_type == Post.types[:regular]
       if new_cooked != cooked && new_cooked.blank?
-        Rails.logger.warn("Plugin is blanking out post: #{self.url}\nraw: #{self.raw}")
+        Rails.logger.debug("Plugin is blanking out post: #{self.url}\nraw: #{self.raw}")
       elsif new_cooked.blank?
-        Rails.logger.warn("Blank post detected post: #{self.url}\nraw: #{self.raw}")
+        Rails.logger.debug("Blank post detected post: #{self.url}\nraw: #{self.raw}")
       end
     end
 
@@ -451,6 +451,16 @@ class Post < ActiveRecord::Base
     PostCreator.before_create_tasks(self)
   end
 
+  def self.estimate_posts_per_day
+    val = $redis.get("estimated_posts_per_day")
+    return val.to_i if val
+
+    posts_per_day = Topic.listable_topics.secured.joins(:posts).merge(Post.created_since(30.days.ago)).count / 30
+    $redis.setex("estimated_posts_per_day", 1.day.to_i, posts_per_day.to_s)
+    posts_per_day
+
+  end
+
   # This calculates the geometric mean of the post timings and stores it along with
   # each post.
   def self.calculate_avg_time(min_topic_age=nil)
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 31f221cc9f..08aaae4a0c 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -286,12 +286,11 @@ SQL
         BadgeGranter.queue_badge_grant(Badge::Trigger::PostAction, post_action: post_action)
       end
     end
+    GivenDailyLike.increment_for(user.id)
 
     # agree with other flags
     if staff_took_action
       PostAction.agree_flags!(post, user)
-
-      # update counters
       post_action.try(:update_counters)
     end
 
@@ -311,6 +310,7 @@ SQL
     if action = finder.first
       action.remove_act!(user)
       action.post.unhide! if action.staff_took_action
+      GivenDailyLike.decrement_for(user.id)
     end
   end
 
diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb
index 66e75e9601..9dd479a73c 100644
--- a/app/models/queued_post.rb
+++ b/app/models/queued_post.rb
@@ -64,9 +64,7 @@ class QueuedPost < ActiveRecord::Base
     QueuedPost.transaction do
       change_to!(:approved, approved_by)
 
-      if user.blocked?
-        user.update_columns(blocked: false)
-      end
+      UserBlocker.unblock(user, approved_by) if user.blocked?
 
       creator = PostCreator.new(user, create_options.merge(skip_validations: true))
       created_post = creator.create
diff --git a/app/models/site_customization.rb b/app/models/site_customization.rb
index bc83a126bd..b90c701872 100644
--- a/app/models/site_customization.rb
+++ b/app/models/site_customization.rb
@@ -27,6 +27,17 @@ class SiteCustomization < ActiveRecord::Base
     raise e
   end
 
+  def transpile(es6_source, version)
+    template  = Tilt::ES6ModuleTranspilerTemplate.new {}
+    wrapped = <<PLUGIN_API_JS
+Discourse._registerPluginCode('#{version}', api => {
+  #{es6_source}
+});
+PLUGIN_API_JS
+
+    template.babel_transpile(wrapped)
+  end
+
   def process_html(html)
     doc = Nokogiri::HTML.fragment(html)
     doc.css('script[type="text/x-handlebars"]').each do |node|
@@ -43,6 +54,17 @@ SCRIPT
       node.replace("<script>#{compiled}</script>")
     end
 
+    doc.css('script[type="text/discourse-plugin"]').each do |node|
+      if node['version'].present?
+        begin
+          code = transpile(node.inner_html, node['version'])
+          node.replace("<script>#{code}</script>")
+        rescue Tilt::ES6ModuleTranspilerTemplate::JavaScriptError => ex
+          node.replace("<script type='text/discourse-js-error'>#{ex.message}</script>")
+        end
+      end
+    end
+
     doc.to_s
   end
 
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 1db44a557f..7150e00ecb 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -314,11 +314,14 @@ class Topic < ActiveRecord::Base
               .joins("LEFT OUTER JOIN users ON users.id = topics.user_id")
               .where(closed: false, archived: false)
               .where("COALESCE(topic_users.notification_level, 1) <> ?", TopicUser.notification_levels[:muted])
-              .where("COALESCE(users.trust_level, 0) > 0")
               .created_since(since)
               .listable_topics
               .includes(:category)
 
+    unless user.user_option.try(:include_tl0_in_digests)
+      topics = topics.where("COALESCE(users.trust_level, 0) > 0")
+    end
+
     if !!opts[:top_order]
       topics = topics.joins("LEFT OUTER JOIN top_topics ON top_topics.topic_id = topics.id")
                      .order(TopicQuerySQL.order_top_for(score))
@@ -336,6 +339,10 @@ class Topic < ActiveRecord::Base
 
     # Remove muted categories
     muted_category_ids = CategoryUser.where(user_id: user.id, notification_level: CategoryUser.notification_levels[:muted]).pluck(:category_id)
+    if SiteSetting.digest_suppress_categories.present?
+      muted_category_ids += SiteSetting.digest_suppress_categories.split("|").map(&:to_i)
+      muted_category_ids = muted_category_ids.uniq
+    end
     if muted_category_ids.present?
       topics = topics.where("topics.category_id NOT IN (?)", muted_category_ids)
     end
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index 1a50237824..aab6d1b1c8 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -165,6 +165,16 @@ class TopicUser < ActiveRecord::Base
                                   RETURNING
                                     topic_users.notification_level, tu.notification_level old_level, tu.last_read_post_number
                                 "
+
+    INSERT_TOPIC_USER_SQL = "INSERT INTO topic_users (user_id, topic_id, last_read_post_number, highest_seen_post_number, last_visited_at, first_visited_at, notification_level)
+                  SELECT :user_id, :topic_id, :post_number, ft.highest_post_number, :now, :now, :new_status
+                  FROM topics AS ft
+                  JOIN users u on u.id = :user_id
+                  WHERE ft.id = :topic_id
+                    AND NOT EXISTS(SELECT 1
+                                   FROM topic_users AS ftu
+                                   WHERE ftu.user_id = :user_id and ftu.topic_id = :topic_id)"
+
     def update_last_read(user, topic_id, post_number, msecs, opts={})
       return if post_number.blank?
       msecs = 0 if msecs.to_i < 0
@@ -214,15 +224,18 @@ class TopicUser < ActiveRecord::Base
 
         user.update_posts_read!(post_number, mobile: opts[:mobile])
 
-        exec_sql("INSERT INTO topic_users (user_id, topic_id, last_read_post_number, highest_seen_post_number, last_visited_at, first_visited_at, notification_level)
-                  SELECT :user_id, :topic_id, :post_number, ft.highest_post_number, :now, :now, :new_status
-                  FROM topics AS ft
-                  JOIN users u on u.id = :user_id
-                  WHERE ft.id = :topic_id
-                    AND NOT EXISTS(SELECT 1
-                                   FROM topic_users AS ftu
-                                   WHERE ftu.user_id = :user_id and ftu.topic_id = :topic_id)",
-                  args)
+        begin
+          exec_sql(INSERT_TOPIC_USER_SQL, args)
+        rescue PG::UniqueViolation
+          # if record is inserted between two statements this can happen
+          # we retry once to avoid failing the req
+          if opts[:retry]
+            raise
+          else
+            opts[:retry] = true
+            update_last_read(user, topic_id, post_number, msecs, opts)
+          end
+        end
 
         MessageBus.publish("/topic/#{topic_id}", { notification_level_change: args[:new_status] }, user_ids: [user.id])
       end
diff --git a/app/models/user.rb b/app/models/user.rb
index e0663db08e..9444fb8396 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -69,7 +69,7 @@ class User < ActiveRecord::Base
   before_validation :strip_downcase_email
 
   validates_presence_of :username
-  validate :username_validator
+  validate :username_validator, if: :username_changed?
   validates :email, presence: true, uniqueness: true
   validates :email, email: true, if: :email_changed?
   validate :password_validator
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 2fa8490eb4..23678754cf 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -342,11 +342,11 @@ SQL
     builder.where("COALESCE(p.post_type, p2.post_type) IN (:visible_post_types)", visible_post_types: visible_post_types)
 
     unless (guardian.user && guardian.user.id == user_id) || guardian.is_staff?
-      builder.where("a.action_type not in (#{BOOKMARK})")
       builder.where("t.visible")
     end
 
     unless guardian.can_see_notifications?(User.where(id: user_id).first)
+      builder.where("a.action_type not in (#{BOOKMARK})")
       builder.where('a.action_type <> :pending', pending: UserAction::PENDING)
     end
 
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index ccabc8ce69..d2afa1c526 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -52,7 +52,8 @@ class UserHistory < ActiveRecord::Base
                           grant_moderation: 34,
                           revoke_moderation: 35,
                           backup_operation: 36,
-                          rate_limited_like: 37)
+                          rate_limited_like: 37 # not used anymore
+                         )
   end
 
   # Staff actions is a subset of all actions, used to audit actions taken by staff users.
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index de4ec067a8..d986a2885b 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -49,6 +49,8 @@ class UserOption < ActiveRecord::Base
       self.digest_after_minutes ||= SiteSetting.default_email_digest_frequency.to_i
     end
 
+    self.include_tl0_in_digests = SiteSetting.default_include_tl0_in_digests
+
     true
   end
 
@@ -144,7 +146,10 @@ end
 #  auto_track_topics_after_msecs :integer
 #  new_topic_duration_minutes    :integer
 #  last_redirected_to_top_at     :datetime
-#  email_previous_replies        :integer          default(1), not null
+#  email_previous_replies        :integer          default(2), not null
+#  email_in_reply_to             :boolean          default(TRUE), not null
+#  like_notification_frequency   :integer          default(1), not null
+#  include_tl0_in_digests        :boolean          default(FALSE)
 #
 # Indexes
 #
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index 2dca5c2f10..7137290326 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -4,7 +4,7 @@ class UserProfile < ActiveRecord::Base
   WEBSITE_REGEXP = /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,9}(([0-9]{1,5})?\/.*)?$)/ix
 
   validates :bio_raw, length: { maximum: 3000 }
-  validates :website, format: { with: WEBSITE_REGEXP }, allow_blank: true
+  validates :website, format: { with: WEBSITE_REGEXP }, allow_blank: true, if: Proc.new { |c| c.new_record? || c.website_changed? }
   validates :user, presence: true
   before_save :cook
   after_save :trigger_badges
diff --git a/app/serializers/admin_badge_serializer.rb b/app/serializers/admin_badge_serializer.rb
index 83cccb0c23..535d27d1bd 100644
--- a/app/serializers/admin_badge_serializer.rb
+++ b/app/serializers/admin_badge_serializer.rb
@@ -1,3 +1,7 @@
 class AdminBadgeSerializer < BadgeSerializer
   attributes :query, :trigger, :target_posts, :auto_revoke, :show_posts
+
+  def include_long_description?
+     true
+  end
 end
diff --git a/app/serializers/badge_index_serializer.rb b/app/serializers/badge_index_serializer.rb
index 533c71133e..85c013a4b9 100644
--- a/app/serializers/badge_index_serializer.rb
+++ b/app/serializers/badge_index_serializer.rb
@@ -9,4 +9,5 @@ class BadgeIndexSerializer < BadgeSerializer
   def has_badge
     @options[:user_badges].include?(object.id)
   end
+
 end
diff --git a/app/serializers/badge_serializer.rb b/app/serializers/badge_serializer.rb
index ede876c908..a726a4dde4 100644
--- a/app/serializers/badge_serializer.rb
+++ b/app/serializers/badge_serializer.rb
@@ -12,4 +12,8 @@ class BadgeSerializer < ApplicationSerializer
   def include_long_description?
     options[:include_long_description]
   end
+
+  def name
+    object.display_name
+  end
 end
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index 6a40c7a260..591b07e457 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -16,7 +16,8 @@ class UserOptionSerializer < ApplicationSerializer
              :new_topic_duration_minutes,
              :email_previous_replies,
              :email_in_reply_to,
-             :like_notification_frequency
+             :like_notification_frequency,
+             :include_tl0_in_digests
 
 
   def include_edit_history_public?
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index b1acb42fe8..143279ba80 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -95,7 +95,8 @@ class UserSerializer < BasicUserSerializer
                      :has_title_badges,
                      :card_image_badge,
                      :card_image_badge_id,
-                     :muted_usernames
+                     :muted_usernames,
+                     :mailing_list_posts_per_day
 
   untrusted_attributes :bio_raw,
                        :bio_cooked,
@@ -109,6 +110,11 @@ class UserSerializer < BasicUserSerializer
   ### ATTRIBUTES
   ###
 
+  def mailing_list_posts_per_day
+    val = Post.estimate_posts_per_day
+    [val,SiteSetting.max_emails_per_day_per_user].min
+  end
+
   def groups
     if scope.is_admin? || object.id == scope.user.try(:id)
       object.groups
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index 4be285f4a0..1c043d4b6f 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -15,4 +15,8 @@ class UserSummarySerializer < ApplicationSerializer
   attributes :likes_given, :likes_received, :posts_read_count,
              :days_visited, :topic_count, :post_count
 
+
+  def include_badges?
+    SiteSetting.enable_badges
+  end
 end
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 150e33c35b..5ad5d3990d 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -47,12 +47,12 @@ class PostAlerter
       end
 
       expand_group_mentions(mentioned_groups, post) do |group, users|
-        notify_users(users - notified, :group_mentioned, post, mentioned_opts.merge({group: group}))
+        notify_non_pm_users(users - notified, :group_mentioned, post, mentioned_opts.merge({group: group}))
         notified += users
       end
 
       if mentioned_users
-        notify_users(mentioned_users - notified, :mentioned, post, mentioned_opts)
+        notify_non_pm_users(mentioned_users - notified, :mentioned, post, mentioned_opts)
         notified += mentioned_users
       end
     end
@@ -61,41 +61,42 @@ class PostAlerter
     reply_to_user = post.reply_notification_target
 
     if new_record && reply_to_user && !notified.include?(reply_to_user) && post.post_type == Post.types[:regular]
-      notify_users(reply_to_user, :replied, post)
+      notify_non_pm_users(reply_to_user, :replied, post)
       notified += [reply_to_user]
     end
 
     # quotes
     quoted_users = extract_quoted_users(post)
-    notify_users(quoted_users - notified, :quoted, post)
+    notify_non_pm_users(quoted_users - notified, :quoted, post)
     notified += quoted_users
 
     # linked
     linked_users = extract_linked_users(post)
-    notify_users(linked_users - notified, :linked, post)
+    notify_non_pm_users(linked_users - notified, :linked, post)
     notified += linked_users
 
     # private messages
     if new_record
       if post.topic.private_message?
-        # users that aren't part of any mentionned groups
+        # users that aren't part of any mentioned groups
         directly_targeted_users(post).each do |user|
-          if !notified.include?(user)
+          notification_level = TopicUser.get(post.topic, user).try(:notification_level)
+          if notified.include?(user) || notification_level == TopicUser.notification_levels[:watching]
             create_notification(user, Notification.types[:private_message], post)
-            notified += [user]
           end
         end
         # users that are part of all mentionned groups
         indirectly_targeted_users(post).each do |user|
-          if !notified.include?(user)
-            # only create a notification when watching the group
-            notification_level = TopicUser.get(post.topic, user).try(:notification_level)
-            if notification_level == TopicUser.notification_levels[:watching]
+          # only create a notification when watching the group
+          notification_level = TopicUser.get(post.topic, user).try(:notification_level)
+
+          if notification_level == TopicUser.notification_levels[:watching]
+            create_notification(user, Notification.types[:private_message], post)
+          elsif notification_level == TopicUser.notification_levels[:tracking]
+            if notified.include?(user)
               create_notification(user, Notification.types[:private_message], post)
-              notified += [user]
-            elsif notification_level == TopicUser.notification_levels[:tracking]
+            else
               notify_group_summary(user, post)
-              notified += [user]
             end
           end
         end
@@ -400,13 +401,11 @@ class PostAlerter
   end
 
   # Notify a bunch of users
-  def notify_users(users, type, post, opts=nil)
-    users = [users] unless users.is_a?(Array)
+  def notify_non_pm_users(users, type, post, opts=nil)
 
-    if post.topic.try(:private_message?)
-      whitelist = all_allowed_users(post)
-      users.reject! { |u| !whitelist.include?(u) }
-    end
+    return if post.topic.try(:private_message?)
+
+    users = [users] unless users.is_a?(Array)
 
     users.each do |u|
       create_notification(u, Notification.types[type], post, opts)
diff --git a/app/services/spam_rule/auto_block.rb b/app/services/spam_rule/auto_block.rb
index 8a6cea9f30..6c5d501872 100644
--- a/app/services/spam_rule/auto_block.rb
+++ b/app/services/spam_rule/auto_block.rb
@@ -38,7 +38,7 @@ class SpamRule::AutoBlock
 
   def block_user
     Post.transaction do
-      if UserBlocker.block(@user, nil, {message: :too_many_spam_flags}) and SiteSetting.notify_mods_when_user_blocked
+      if UserBlocker.block(@user, Discourse.system_user, message: :too_many_spam_flags) && SiteSetting.notify_mods_when_user_blocked
         GroupMessage.create(Group[:moderators].name, :user_automatically_blocked, {user: @user, limit_once_per: false})
       end
     end
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index e9ff162dbc..ac692d28d7 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -20,7 +20,7 @@ class UserAnonymizer
       @user.reload
       @user.password = SecureRandom.hex
       @user.email = "#{@user.username}@example.com"
-      @user.name = nil
+      @user.name = SiteSetting.full_name_required ? @user.username : nil
       @user.date_of_birth = nil
       @user.title = nil
       @user.uploaded_avatar_id = nil
diff --git a/app/services/user_blocker.rb b/app/services/user_blocker.rb
index 1ff9983b7e..ee9ee1b68e 100644
--- a/app/services/user_blocker.rb
+++ b/app/services/user_blocker.rb
@@ -27,8 +27,8 @@ class UserBlocker
 
   def hide_posts
     Post.where(user_id: @user.id).update_all(["hidden = true, hidden_reason_id = COALESCE(hidden_reason_id, ?)", Post.hidden_reasons[:new_user_spam_threshold_reached]])
-    topic_ids = Post.where('user_id = ? and post_number = ?', @user.id, 1).pluck(:topic_id)
-    Topic.where(id: topic_ids).update_all({ visible: false }) unless topic_ids.empty?
+    topic_ids = Post.where(user_id: @user.id, post_number: 1).pluck(:topic_id)
+    Topic.where(id: topic_ids).update_all(visible: false) unless topic_ids.empty?
   end
 
   def unblock
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 25510fd250..e7136f74e9 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -23,7 +23,8 @@ class UserUpdater
     :auto_track_topics_after_msecs,
     :email_previous_replies,
     :email_in_reply_to,
-    :like_notification_frequency
+    :like_notification_frequency,
+    :include_tl0_in_digests
   ]
 
   def initialize(actor, user)
diff --git a/app/views/email/invite.html.erb b/app/views/email/invite.html.erb
new file mode 100644
index 0000000000..f6c1dfccc8
--- /dev/null
+++ b/app/views/email/invite.html.erb
@@ -0,0 +1,13 @@
+<div id='main' class=<%= classes %>>
+
+  <div class='header-instructions'>%{header_instructions}</div>
+
+  <% if message.present? %>
+    <div><%= message %></div>
+  <% end %>
+
+  <hr>
+  <div class='footer'>%{respond_instructions}</div>
+  <div class='footer'>%{unsubscribe_link}%{unsubscribe_via_email_link}</div>
+
+</div>
diff --git a/app/views/email/notification.html.erb b/app/views/email/notification.html.erb
index 363fa65ca4..d4c200807b 100644
--- a/app/views/email/notification.html.erb
+++ b/app/views/email/notification.html.erb
@@ -10,12 +10,12 @@
   <% end %>
 
   <% if in_reply_to_post.present? %>
-    <h4 class='.previous-discussion'><%= t "user_notifications.in_reply_to" %></h4>
+    <h4 class='previous-discussion'><%= t "user_notifications.in_reply_to" %></h4>
     <%= render partial: 'email/post', locals: { post: in_reply_to_post, use_excerpt: true} %>
   <% end %>
 
   <% if context_posts.present? %>
-    <h4 class='.previous-discussion'><%= t "user_notifications.previous_discussion" %></h4>
+    <h4 class='previous-discussion'><%= t "user_notifications.previous_discussion" %></h4>
     <% context_posts.each do |p| %>
       <%= render partial: 'email/post', locals: { post: p, use_excerpt: false } %>
     <% end %>
@@ -23,6 +23,9 @@
 
   <hr>
 
+  <% if reached_limit %>
+    <div class='footer'><%= t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user %></div>
+  <% end %>
   <div class='footer'>%{respond_instructions}</div>
   <div class='footer'>%{unsubscribe_link}%{unsubscribe_via_email_link}</div>
 
diff --git a/config/initializers/009-omniauth.rb b/config/initializers/009-omniauth.rb
index 1632ba0250..6138ec9778 100644
--- a/config/initializers/009-omniauth.rb
+++ b/config/initializers/009-omniauth.rb
@@ -9,3 +9,5 @@ Rails.application.config.middleware.use OmniAuth::Builder do
     authenticator.register_middleware(self)
   end
 end
+ 
+OmniAuth.config.logger = Rails.logger
diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb
index 8315587eaf..e237d6aa75 100644
--- a/config/initializers/100-logster.rb
+++ b/config/initializers/100-logster.rb
@@ -57,21 +57,26 @@ Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs"
 
 Logster.config.application_version = Discourse.git_version
 
+store = Logster.store
 redis = Logster.store.redis
-Logster.config.redis_prefix = "#{redis.namespace}"
-Logster.config.redis_raw_connection = redis.without_namespace
+store.redis_prefix = Proc.new { redis.namespace }
+store.redis_raw_connection = redis.without_namespace
+severities = [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN]
 
-%w{minute hour}.each do |duration|
-  site_setting_error_rate = SiteSetting.public_send("alert_admins_if_errors_per_#{duration}")
+RailsMultisite::ConnectionManagement.each_connection do
+  error_rate_per_minute = SiteSetting.alert_admins_if_errors_per_minute rescue 0
 
-  if site_setting_error_rate > 0
-    Logster.store.public_send(
-      "register_rate_limit_per_#{duration}",
-      [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN],
-      site_setting_error_rate
-    ) do |rate|
+  if (error_rate_per_minute || 0) > 0
+    store.register_rate_limit_per_minute(severities, error_rate_per_minute) do |rate|
+      MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'minute' })
+    end
+  end
 
-      MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: duration })
+  error_rate_per_hour = SiteSetting.alert_admins_if_errors_per_hour rescue 0
+
+  if (error_rate_per_hour || 0) > 0
+    store.register_rate_limit_per_hour(severities, error_rate_per_hour) do |rate|
+      MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'hour' })
     end
   end
 end
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 44fa1c0977..ef816d8a1c 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -210,6 +210,19 @@ ar:
         disabled: 'غير مدرج %{when}'
     topic_admin_menu: "عمليات المدير"
     emails_are_disabled: "جميع الرسائل الإلكترونية المرسلة عطلها المدير , لن يتم إرسال إشعار من أي نوع لبريدك الإلكتروني ."
+    s3:
+      regions:
+        us_east_1: "الولايات المتحدة الشرقيه ( ولايه فيرجينيا )"
+        us_west_1: "الولايات المتحدة الغربية (  كاليفورنيا )"
+        us_west_2: "الولايات المتحدة الغربية ( ولاية أوريغون )"
+        us_gov_west_1: "إستضافة أمازون الحسابية الحكومية (الولايات المتحدة الأمريكية)"
+        eu_west_1: "الاتحاد الأوروبي ( أيرلندا )"
+        eu_central_1: "الاتحاد الأوروبي ( فرانكفورت )"
+        ap_southeast_1: "آسيا والمحيط الهادئ ( سنغافورة )"
+        ap_southeast_2: "آسيا والمحيط الهادئ ( سيدني )"
+        ap_northeast_1: "آسيا والمحيط الهادئ ( طوكيو )"
+        ap_northeast_2: "آسيا والمحيط الهادئ ( سيول )"
+        sa_east_1: "أمريكا الجنوبية ( ساو باولو )"
     edit: 'عدّل عنوان هذا الموضوع وفئته'
     not_implemented: "لم تُنجز هذه الميزة بعد، آسفون!"
     no_value: "لا"
@@ -246,6 +259,8 @@ ar:
     more: "المزيد"
     less: "أقل"
     never: "مطلقا"
+    every_30_minutes: "بعد 30 دقيقه"
+    every_hour: "بعد ساعه"
     daily: "يوميا"
     weekly: "أسبوعيا"
     every_two_weeks: "كل أسبوعين"
@@ -425,7 +440,10 @@ ar:
         many: "مجموعات"
         other: "مجموعات"
       members: "أعضاء "
+      topics: "ألمواضيع"
       posts: "مشاركات"
+      mentions: "إشارات"
+      messages: "الرسائل"
       alias_levels:
         title: "من يستطيع أن يشارك في هذه المجموعة ؟"
         nobody: "لا أحد"
@@ -575,7 +593,7 @@ ar:
       muted_users: "الأعضاء المكتومون"
       muted_users_instructions: "كتم جميع التنبيهات من هؤلاء الأعضاء."
       muted_topics_link: "عرض المواضيع المكتومة"
-      automatically_unpin_topics: "سيتم تلقائيا الغاء تثبيت المواضيع عندما تصل الى الاسفل "
+      automatically_unpin_topics: "قم تلقائيا بازاله العلامات عند الوصول الى نهايه الصفحه"
       staff_counters:
         flags_given: "علامات مساعدة"
         flagged_posts: "# مشاركات"
@@ -680,15 +698,26 @@ ar:
         title: "وسام بطاقة المستخدم"
       website: "موقع الكتروني"
       email_settings: "بريد الكتروني"
+      like_notification_frequency:
+        title: "اشعرني عند الاستحسان"
+        always: "دائما"
+        first_time_and_daily: "اول مره يتم استحسان المنشور و يوميا "
+        first_time: "اول مره يتم استحسان المنشور"
+        never: "ابداً"
       email_previous_replies:
         title: "تضمين مشاركات سابقة في أسفل البريد المرسل"
+        unless_emailed: "الا اذا تم ارساله موخراً"
         always: "دائماً"
+        never: "ابداً"
       email_digests:
         title: "إرسال رسالة إلكترونية تحتوي على جديد الموقع عندما لا أزور الموقع"
+        every_30_minutes: "بعد 30 دقيقه"
+        every_hour: "كل ساعه "
         daily: "يومي"
         every_three_days: "كل ثلاثة أيام"
         weekly: "اسبوعي"
         every_two_weeks: "كل أسبوعين"
+      email_in_reply_to: "ارفق مقتبسات الرد على المنشور في رسائل البريد"
       email_direct: "تلقي رسالة إلكترونية عند اقتباس مشاركة لك  أو الرد على عليها أو في حالة ذكر اسمك @username"
       email_private_messages: "إرسال إشعار بالبريد الإلكتروني عندما يرسل لك شخصاً رسالة خاصة"
       email_always: "نبهني بوجود رسائل جديدة حتى لو كنت متصل على الموقع ."
@@ -819,6 +848,7 @@ ar:
     read_only_mode:
       enabled: "الموقع في وضع القراءه فقط. الرجاء الاستمرار بالتصفح , لكن الردود و الاعجابات و الخصائص  الاخرى معطله  للان ."
       login_disabled: "تسجيل الدخول معطل لأن الموقع في خالة القراءة  فقط"
+      logout_disabled: "تسجيل الخروج معطل عندما يكون الموقع في حاله القراءه فقط"
     too_few_topics_and_posts_notice: "دعونا <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>الحصول على هذه المناقشة بدأت!</a> يوجد حاليا<strong>%{currentTopics} / %{requiredTopics}</strong> المواضيع و <strong>%{currentPosts} / %{requiredPosts}</strong> المشاركات. الزوار الجدد بحاجة إلى بعض الأحاديث لقراءة والرد على."
     too_few_topics_notice: "دعونا <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>الحصول على هذه المناقشة التي!</a> وهناك حاليا <strong>%{currentTopics} / %{requiredTopics}</strong> المواضيع. الزوار الجديدة بحاجة إلى بعض الأحاديث قراءة والرد عليها."
     too_few_posts_notice: "دعونا <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>الحصول على هذه المناقشة التي بدأت!</a> يوجد حاليا <strong>%{currentPosts} / %{requiredPosts}</strong> مشاركات. الزوار الجديدة بحاجة إلى بعض الأحاديث قراءة والرد عليها."
@@ -918,6 +948,9 @@ ar:
       twitter:
         title: "مع تويتر"
         message: "التحقق من خلال حساب تويتر ( الرجاء التأكد من عدم تشغيل مانع الاعلانات المنبثقة في المتصفح)"
+      instagram:
+        title: "عن طريق الانستغرام"
+        message: "تسجيل الدخول عن طريق الانستغرام (تاكد ان حاجب النوافذ المنبسقه غير مفعل)"
       facebook:
         title: "مع الفيسبوك"
         message: "التحقق من خلال حساب الفيس بوك ( الرجاء التأكد من عدم تشغيل مانع الاعلانات المنبثقة في المتصفح)"
@@ -948,6 +981,7 @@ ar:
       saved_local_draft_tip: "تم الحفظ محلياً"
       similar_topics: "موضوعك مشابه لـ ..."
       drafts_offline: "مسودات محفوظة "
+      group_mentioned: "عند استعمال  {{group}}, انت على وشك اشعار <a href='{{group_link}}'>{{count}} people</a>."
       error:
         title_missing: "العنوان مطلوب"
         title_too_short: "العنوان يجب أن يكون اكثر  {{min}} حرف"
@@ -1022,9 +1056,10 @@ ar:
       group_mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      posted: "<i title='posted' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked_2: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -1235,6 +1270,7 @@ ar:
       auto_close_title: 'إعدادات الإغلاق التلقائي'
       auto_close_save: "حفظ"
       auto_close_remove: "لا تغلق هذا الموضوع تلقائياً"
+      auto_close_immediate: "احر منشور في الموضيع كان قبل %{hours} ساعه , لذلك فان الموضوع يتم اغلاقه حالاَ ."
       progress:
         title: حالة الموضوع
         go_top: "أعلى"
@@ -1582,6 +1618,15 @@ ar:
           bookmark: "التراجع عن التفضيل"
           like: "التراجع عن الإعجاب"
           vote: "التراجع عن التصويت"
+        people:
+          off_topic: "أبلغ أن هذا خارج الموضوع."
+          spam: "علّم على أنّه سبام"
+          inappropriate: "ابلغ انه غير ملائم "
+          notify_moderators: "اشعر المشرفين"
+          notify_user: "ارسل رساله"
+          bookmark: "اضف الى المفضله"
+          like: "استحسان"
+          vote: "صوت لهذا"
         by_you:
           off_topic: "لقد تم الإبلاغ عن الموضوع على أنه ليس في المكان الصحيح"
           spam: "تم الإبلاغ عن الموضوع على أنه سبام"
@@ -1721,6 +1766,7 @@ ar:
           last: "آخر تعديل"
           hide: "اخفاء التعديل"
           show: "اظهار التعديل"
+          revert: "العوده الى هذا المراجعه"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
@@ -1801,7 +1847,6 @@ ar:
           description: "لن يتم إشعارك بأي مشاركات جديدة في هذه التصنيفات ولن يتم عرضها في قائمة المواضيع المنشورة مؤخراً."
     flagging:
       title: 'شكرا لمساعدتك في إبقاء مجتمعنا نظيفاً.'
-      private_reminder: 'التبليغات ذات خصوصية، تظهر <b> فقط </b> للمشرفين'
       action: 'التبليغ عن مشاركة'
       take_action: "أجراء العمليه "
       notify_action: 'رسالة'
@@ -1813,7 +1858,7 @@ ar:
       submit_tooltip: "إرسال تبليغ"
       take_action_tooltip: "الوصول إلى الحد الأعلى للتبليغات دون انتظار تبليغات أكثر من أعضاء الموقع."
       cant: "المعذرة، لا يمكنك التبليغ عن هذه المشاركة في هذه اللحظة."
-      notify_staff: 'طاقم التبليغ '
+      notify_staff: 'اشعر الطاقم سرياً'
       formatted_name:
         off_topic: "خارج عن الموضوع"
         inappropriate: "غير لائق"
@@ -2254,9 +2299,11 @@ ar:
             is_disabled: "Restore is disabled in the site settings."
             label: "استعادة"
             title: "اعادة تخزين النسخة الاحتياطية"
+            confirm: "هل انت متاكد انك تريد استعاده هذه النسخه الاحتياطيه؟"
           rollback:
             label: "اعادة السنخة السابقة"
             title: "Rollback the database to previous working state"
+            confirm: "هل انت متاكد انك تريد اعاده قواعد البيانات الى الحاله السابقه؟"
       export_csv:
         user_archive_confirm: "هل أنت متأكد من رغبتك في تحميل جميع مشاركاتك ؟"
         success: "بدأ التصدير, سيتم إعلامك برسالة عند اكتمال العملية."
@@ -2395,6 +2442,20 @@ ar:
           subject: "موضوع"
           error: "خطأ"
           none: "لا يوجد بريد وارد"
+          modal:
+            title: "تفاصيل الرسائل الوارده"
+            error: "خطأ"
+            return_path: "المسار-السابق"
+            message_id: "معرف الرساله"
+            in_reply_to: "بالرد-الى"
+            references: "المراجع"
+            date: "التاريخ"
+            from: "من"
+            to: "الى"
+            cc: "Cc"
+            subject: "الموضوع"
+            body: "المحتوى"
+            rejection_message: "البريد المحظور"
           filters:
             from_placeholder: "from@example.com"
             to_placeholder: "to@example.com"
@@ -2468,6 +2529,9 @@ ar:
             unblock_user: "رفع الحظر"
             grant_admin: "منح صلاحيات ادارية"
             revoke_admin: "سحب الصلاحيات الادارية"
+            grant_moderation: "عين كمشرف"
+            revoke_moderation: "سحب صلاحيات المشرف"
+            backup_operation: "عمليه النسخ الاحتياطي"
         screened_emails:
           title: "عناوين بريد إلكتروني محجوبة."
           description: "عندما تتم محاول انشاء حساب جديد, سيتم التحقق من قائمة البريد  الالكتروني وسيتم حظر التسجيل لهذا البريد واتخاذ اي اجراء متبع"
@@ -2585,6 +2649,7 @@ ar:
         moderator: "مراقب؟"
         admin: "مدير؟"
         blocked: "محظور؟"
+        staged: "تنظيم؟"
         show_admin_profile: "مدير"
         edit_title: "تعديل العنوان"
         save_title: "حفظ العنوان"
@@ -2666,6 +2731,7 @@ ar:
         deactivate_explanation: "المستخدم الغير نشط يحب أن يتأكد من البريد الالكتروني"
         suspended_explanation: "المستخدم الموقوف لايملك صلاحية تسجيل الدخول"
         block_explanation: "المستخدم الموقوف لايستطيع أن يشارك"
+        stage_explanation: "العضو المنظم يمكنه فقط النشر عن طريق البريد الالكتروني في المواضيع المخصصه ."
         trust_level_change_failed: "هناك مشكلة في تغيير مستوى ثقة المستخدم "
         suspend_modal_title: "حظر المستخدم"
         trust_level_2_users: "أعضاء مستوى الثقة 2."
@@ -2948,10 +3014,14 @@ ar:
         mark_tracking: '<b>m</b>, <b>t</b>  تابع الموضوع'
         mark_watching: '<b>m</b>, <b>w</b> شاهد الموضوع'
     badges:
-      more_with_badge: "اخرون بنفس الدرع"
+      earned_n_times:
+        zero: "لم يحصل على  هذه الشاره ولا مره"
+        one: "استحق هذه الشاره  مره واحده"
+        two: "استحق هذه الشاره مرتين"
+        few: "استحق هذه الشاره  %{count} مرات"
+        many: "استحق هذه الشاره  %{count} مرات"
+        other: "استحق هذه الشاره  %{count} مرات"
       title: أوسمة
-      allow_title: "يمكن استخدامه كعنوان"
-      multiple_grant: "يمكن منحه عدة مرات. "
       badge_count:
         zero: "%{count} شاره"
         one: "%{count} شاره"
@@ -2986,97 +3056,6 @@ ar:
           name: الجميع
         posting:
           name: نشر
-      badge:
-        editor:
-          name: محرر
-          description: أول موضوع تم تحريره
-        basic_user:
-          name: أساسي
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">منح</a> جميع وظائف المجتمع الأساسية.
-        member:
-          name: عضو
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">مُنح</a> دعوات
-        regular:
-          name: منتظم
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">منح</a> اعادة تصنيف, اعادة تسمية, اتباع الروابط
-        leader:
-          name: قائد
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">منح</a> تحرير عام, تثبيت, اغلاق, ارشفة, تقسيم ودمج
-        welcome:
-          name: مرحباً
-          description: تلقيت إعجاب
-        autobiographer:
-          name: الكاتب سيرته بنفسه
-          description: تصفية عضو <a href="/my/preferences">ملف التعريف </a>معلومات
-        anniversary:
-          name: ذكرى
-          description: عضو نشط لمدة عام، شارك مرة واحدة على الأقل
-        nice_post:
-          name: منشور رائع
-          description: 'تلقيت 10 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة '
-        good_post:
-          name: منشور جيد
-          description: تلقيت 25 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة
-        great_post:
-          name: منشور ممتاز
-          description: تلقيت 50 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة
-        nice_topic:
-          name: 'موضوع رائع '
-          description: تلقيت 10 إعجاب لهذا الموضوع . هذا الاشعار يتم إرسالة مرات عديدة
-        good_topic:
-          name: موضوع جيد
-          description: تلقيت 25 إعجاب لهذا الموضوع . هذا الوسام يتم منحه عدة مرات
-        great_topic:
-          name: موضوع ممتاز
-          description: تلقيت 50 إعجاب لهذا الموضوع . هذا الوسام يتم منحه عدة مرات
-        nice_share:
-          name: مشاركة رائعة
-          description: تم مشاركة رد مع أكثر من 25 زائر
-        good_share:
-          name: مشاركة جيدة
-          description: تم مشاركة رد مع أكثر من 300 زائر
-        great_share:
-          name: مشاركة ممتازة
-          description: تم مشاركة رد مع أكثر من 1000 زائر
-        first_like:
-          name: اول اعجاب
-          description: أعجب في رد
-        first_flag:
-          name: اول بلاغ
-          description: مشاركة مبلغ عنها
-        promoter:
-          name: متعهد
-          description: دعوة مستخدم
-        campaigner:
-          name: ناشط
-          description: تم دعوة 3 أعضاء (مستوى الثقة 1)
-        champion:
-          name: بطل
-          description: تم دعوة 5 أعضاء (مستوى الثقة 2)
-        first_share:
-          name: اول مشاركة
-          description: مشاركة تعليق
-        first_link:
-          name: الرابط الأول
-          description: اضافة رابط لموضوع اخر
-        first_quote:
-          name: أول اقتباس
-          description: اقتبس من عضو
-        read_guidelines:
-          name: اقرأ التعليمات
-          description: اطلع على  <a href="/guidelines">توجيهات المجتمع</a>
-        reader:
-          name: قارئ
-          description: قراءة جميع المشاركات في موضوع فيه أكثر من 100 مشاركة
-        popular_link:
-          name: رابط مشهور
-          description: شارك رابط خارجي بـ  50 نقرة على الأقل.
-        hot_link:
-          name: الرابط الساخن
-          description: شارك رابط خارجي بـ 300 نقرة على الأقل.
-        famous_link:
-          name: رابط مشهور
-          description: شارك الرابط الخارجي بـ 1000 نقرة على الأقل
     google_search: |
       <h3>ابحث في قوقل</h3>
       <p>
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 822c23ebde..d25b537c04 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -226,7 +226,6 @@ bs_BA:
         few: "Ova tema ima <b>{{count}}</b> postova koji čekaju odobrenje"
         other: "Ova tema ima <b>{{count}}</b> postova koji čekaju odobrenje"
       confirm: "Sačuvaj promjene"
-      delete_prompt: "Jeste li sigurni da želite izbrisati <b>%{username}</b>? Ovo će izbrisati sve njihove postove i blokirati njihovu email i IP adresu."
       approval:
         title: "Post treba odobrenje"
         description: "Primili smo Vaš novi post ali on treba biti odobren od strane moderatora prije nego bude javno dostupan. Molimo budite strpljivi."
@@ -515,8 +514,6 @@ bs_BA:
     last_post: Zadnji post
     summary:
       enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community."
-      description: "There are <b>{{replyCount}}</b> replies."
-      description_time: "There are <b>{{replyCount}}</b> replies with an estimated read time of <b>{{readingTime}} minutes</b>."
       enable: 'Summarize This Topic'
       disable: 'Show All Posts'
     deleted_filter:
@@ -660,7 +657,6 @@ bs_BA:
       mentioned: "<i title='spomenut' class='icon'>@</i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='citiran' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='odgovoren' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='odgovoren' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='izmjenjen' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='lajkovan' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='privatna poruka' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -710,9 +706,6 @@ bs_BA:
         hot: "Nema popularnih tema."
         category: "Nema više tema u {{category}}."
         top: "Nema više popularnih tema."
-        educate:
-          new: '<p>Tvoje nepročitane teme se pojavljuju ovdje.</p><p>Nove teme imaju <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nova</span> indikaciju.</p><p>Možete promjeniti notifikacije preko vaših <a href="%{userPrefsUrl}">postavki</a>.</p>'
-          unread: '<p>Tvoje nepročitane teme se pojavljuju ovdje.</p><p>Ako imate nepročitanih postova vidjet ćete njihov broj <span class="badge new-posts badge-notification">1</span> ako ste:</p><ul><li>Kreirali tu temu</li><li>Odgovorili na tu temu</li><li>Proveli čitajući temu više od 4 minuta</li></ul><p>Ili ako ste na dnu teme označili da motrite i pratite temu.</p><p>Možete promjeniti notifikacije preko vaših <a href="%{userPrefsUrl}">postavki</a>.</p>'
       bottom:
         latest: "Nema više novih tema."
         hot: "Nema više popularnih tema."
@@ -951,17 +944,6 @@ bs_BA:
           bookmark: "Otkaži bookmark"
           like: "Otkaži lajk"
           vote: "Otkaži glas"
-        people:
-          off_topic: "{{icons}} označio ka ne-relevatno"
-          spam: "{{icons}} označio kao spam"
-          inappropriate: "{{icons}} flagged this as inappropriate"
-          notify_moderators: "{{icons}} notified moderators"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>notified moderators</a>"
-          notify_user: "{{icons}} sent a private message"
-          notify_user_with_url: "{{icons}} sent a <a href='{{postUrl}}'>private message</a>"
-          bookmark: "{{icons}} bookmarked this"
-          like: "{{icons}} lajkovali ovo"
-          vote: "{{icons}} glasali za ovo"
         by_you:
           off_topic: "You flagged this as off-topic"
           spam: "Opomenuo si ovo kao spam"
@@ -1307,10 +1289,8 @@ bs_BA:
           restore:
             is_disabled: "Restore is disabled in the site settings."
             title: "Restore the backup"
-            confirm: "Are your sure you want to restore this backup?"
           rollback:
             title: "Rollback the database to previous working state"
-            confirm: "Are your sure you want to rollback the database to the previous working state?"
       export_csv:
         success: "Export has been initiated, you will be notified shortly with progress."
         failed: "Export failed. Please check the logs."
@@ -1380,9 +1360,6 @@ bs_BA:
           love:
             name: 'love'
             description: "The like button's color."
-          wiki:
-            name: 'wiki'
-            description: "Base color used for the background of wiki posts."
       email:
         settings: "Settings"
         preview_digest: "Pregled Sajta"
@@ -1780,8 +1757,6 @@ bs_BA:
         mark_watching: '<b>m</b>, <b>w</b> Motri temu'
     badges:
       title: Bedževi
-      allow_title: "allow badge as title?"
-      multiple_grant: "awarded multiple times?"
       select_badge_for_title: Izaveri bedž za svoj naslov
       none: "<nijedna>"
       badge_grouping:
@@ -1795,78 +1770,3 @@ bs_BA:
           name: Drugi
         posting:
           name: Postiranje
-      badge:
-        editor:
-          name: Urednik
-          description: Prvi post izmjenjen
-        basic_user:
-          name: Osnovni
-          description: <a href="https://revolucionar.com/t/what-do-user-trust-levels-do/4924/4">Odobrene</a> sve osnovne funkcije foruma
-        member:
-          name: Član
-          description: <a href="https://revolucionar.com/t/what-do-user-trust-levels-do/4924/5">Odobrene</a> pozivnice
-        regular:
-          name: Regularan
-          description: <a href="https://revolucionar.com/t/what-do-user-trust-levels-do/4924/6">Granted</a> recategorize, rename, followed links and lounge
-        leader:
-          name: Vođa
-          description: <a href="https://revolucionar.com/t/what-do-user-trust-levels-do/4924/7">Granted</a> global edit, pin, close, archive, split and merge
-        welcome:
-          name: Dobrodošao
-          description: Dobio Lajk
-        autobiographer:
-          name: Autobiografičar
-          description: Popunio biografiju na svom <a href="/my/preferences">profilu</a>
-        anniversary:
-          name: Godišnjica
-          description: Aktivan član godinu dana, pisao najmanje jednom
-        nice_post:
-          name: Dobar Post
-          description: Dobio 10 lajkova na postu. Ovaj se bedž može dobiti više puta
-        good_post:
-          name: Odličan Post
-          description: Dobio 25 lajkova na postu. Ovaj se bedž može dobiti više puta
-        great_post:
-          name: Super Post
-          description: Dobio 50 lajkova na postu. Ovaj se bedž može dobiti više puta
-        nice_topic:
-          name: Dobra Tema
-          description: Dobio 10 lajkova na postu. Ovaj se bedž može dobiti više puta
-        good_topic:
-          name: Odlična Tema
-          description: Dobio 25 lajkova na postu. Ovaj se bedž može dobiti više puta
-        great_topic:
-          name: Super Tema
-          description: Dobio 50 lajkova na postu. Ovaj se bedž može dobiti više puta
-        nice_share:
-          name: Dobar Share
-          description: Podijelio je post sa više od 25 posjetilaca
-        good_share:
-          name: Good Share
-          description: Shared a post with 300 unique visitors
-        great_share:
-          name: Great Share
-          description: Shared a post with 1000 unique visitors
-        first_like:
-          name: Prvi Lajk
-          description: Lajkovao post
-        first_flag:
-          name: Prva Opomena
-          description: Opomenuo post
-        champion:
-          description: Pozvao 5 članova (trust level 2)
-        first_share:
-          name: Prvi Share
-          description: Podijelio post
-        first_link:
-          name: Prvi Link
-          description: Dodao interni link na drugu temu
-        first_quote:
-          name: Prvo Citiranje
-          description: Citirao korisnika
-        read_guidelines:
-          name: Pročitao Pravila
-          description: Pročitao <a href="/guidelines">naša pravila</a>
-        reader:
-          name: Čitač
-          description: Pročitao post na temi sa više od 100 postova
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 1c5aa2ea00..91496b3f03 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -276,7 +276,6 @@ cs:
         few: "Toto téma má <b>{{count}}</b> příspěvky, které čekají na schválení."
         other: "Toto téma má <b>{{count}}</b> příspěvků, které čekají na schválení."
       confirm: "Uložit změny"
-      delete_prompt: "Jsi si jistý, že chceš smazat <b>%{username}</b>? Smažou se všechny jeho příspěvky, zablokuje se jeho email a IP adresa,"
       approval:
         title: "Příspěvek potřebuje schválení"
         description: "Obdrželi jsme váš příspěvek, ale musí být před zveřejněním schválen moderátorem. Buďte trpěliví."
@@ -423,9 +422,7 @@ cs:
         perm_default: "Vypnout upozornění."
         perm_denied_btn: "Povolení zamítnuto"
         disable: "Vypnout upozornění"
-        currently_enabled: "(momentálně povoleno)"
         enable: "Povolit upozornění"
-        currently_disabled: "(momentálně vypnuto)"
         each_browser_note: "Poznámka: Musíš změnit tuto volbu v každém prohlížeči, který používáš."
       dismiss_notifications: "Označ vše jako přečtené"
       dismiss_notifications_tooltip: "Označit všechny nepřečtené notifikace jako přečtené"
@@ -460,7 +457,6 @@ cs:
       muted_users: "Ztišení"
       muted_users_instructions: "Umlčet všechny notifikace od těchto uživatelů."
       muted_topics_link: "Ukázat utlumená témata"
-      automatically_unpin_topics: "Automaticky odepni témata, když se dostaneš na konec."
       staff_counters:
         flags_given: "užitečná nahlášení"
         flagged_posts: "nahlášených příspěvků"
@@ -697,8 +693,6 @@ cs:
       value_prop: "Pokud si založíš účet, budeme si přesně pomatovat, co jsi četly, takže se vždycky vrátíš do bodu, odkud jsi odešel. Také budeš dostávat upozornění, zde a přes e-mail, kdykoli přibydou nově příspěvky. A můžeš přidávat 'to se mi líbí' a šířit tak lásku. :heartbeat:"
     summary:
       enabled_description: "Čtete shrnutí tohoto tématu: nejzajímavější příspěvky podle komunity."
-      description: "Obsahuje <b>{{replyCount}}</b> odpovědí."
-      description_time: "Obsahuje <b>{{replyCount}}</b> odpovědí o odhadovaném času čtení <b>{{readingTime}} minut</b>."
       enable: 'Přepnout na "nejlepší příspěvky"'
       disable: 'Přepnout na normální zobrazení'
     deleted_filter:
@@ -868,7 +862,6 @@ cs:
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -974,9 +967,6 @@ cs:
         category: "V kategorii {{category}} nejsou žádná témata."
         top: "Nejsou tu žádná populární témata."
         search: "There are no search results."
-        educate:
-          new: '<p>Zde se zobrazují nová témata.</p><p>Podle výchozího nastavení jsou za nová témata považována ta, která byla vytvořena v posledních 2 dnech.</p>U těch se ukáže ukazatel <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">Nové</span>.<p>Můžete to změnit ve vašem <a href="%{userPrefsUrl}">nastavení</a>.</p>'
-          unread: '<p>Zde se zobrazují vaše nepřečtená témata.</p><p>Podle výchozího nastavení jsou za nepřečtená témata, ukterých se zobrazuje počet nepřečtení  <span class="badge new-posts badge-notification">1</span>, považována ta, která jste:</p><ul><li>Vytvořil toto téma</li><li>Odpovědětl v tématu</li><li>Četl téma více než 4 minuty</li></ul><p>Nebo pokud jste nastavil téma jako Hlídané či Sledované pomocí nabídky na spodku každého tématu.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>'
       bottom:
         latest: "Nejsou tu žádná další témata z poslední doby."
         hot: "Nejsou tu žádná další populární témata k přečtení."
@@ -1346,18 +1336,6 @@ cs:
           bookmark: "Odebrat ze záložek"
           like: "Už se mi to nelíbí"
           vote: "Zrušit hlas"
-        people:
-          off_topic: "{{icons}} označili tento příspěvek jako off-topic"
-          spam: "{{icons}} označili tento příspěvek jako spam"
-          spam_with_url: "{{icons}} označení <a href='{{postUrl}}'>jako spam</a>"
-          inappropriate: "{{icons}} označili tento příspěvek jako nevhodný"
-          notify_moderators: "{{icons}} nahlásili tento příspěvek"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>nahlásili tento příspěvek</a>"
-          notify_user: "{{icons}} poslal zprávu"
-          notify_user_with_url: "{{icons}} poslal <a href='{{postUrl}}'>zprávu</a>"
-          bookmark: "{{icons}} si přidali příspěvek do záložek"
-          like: "{{icons}} se líbí tento příspěvek"
-          vote: "{{icons}} hlasovali pro tento příspěvek"
         by_you:
           off_topic: "Označili jste tento příspěvek jako off-topic"
           spam: "Označili jste tento příspěvek jako spam"
@@ -1525,7 +1503,6 @@ cs:
           description: "Nikdy nebudete dostávat upozornění na nová témata v těchto kategoriích a neobjeví se v aktuálních."
     flagging:
       title: 'Děkujeme, že pomáháte udržovat komunitu zdvořilou!'
-      private_reminder: 'nahlášení jsou soukromá, viditelná <b>pouze</b> pro správce'
       action: 'Nahlásit příspěvek'
       take_action: "Zakročit"
       notify_action: 'Zpráva'
@@ -1537,7 +1514,6 @@ cs:
       submit_tooltip: "Podat soukromé nahlášení"
       take_action_tooltip: "Ihned dosáhni vlaječky prahu, než aby jsi čekal na více komunitních vlaječek"
       cant: "Bohužel nyní nemůžete tento příspěvek nahlásit."
-      notify_staff: 'Upozorni redakci'
       formatted_name:
         off_topic: "Je to mimo téma."
         inappropriate: "Je to nevhodné"
@@ -1932,11 +1908,9 @@ cs:
             is_disabled: "Restore is disabled in the site settings."
             label: "Obnovit"
             title: "Restore the backup"
-            confirm: "Are your sure you want to restore this backup?"
           rollback:
             label: "Rollback"
             title: "Rollback the database to previous working state"
-            confirm: "Are your sure you want to rollback the database to the previous working state?"
       export_csv:
         user_archive_confirm: "Jste si jistí, že chcete stáhnout všechny své příspěvky?"
         success: "Export byl spuštěn. O dokončení celého procesu budete informování pomocí zprávy."
@@ -2038,9 +2012,6 @@ cs:
           love:
             name: 'láska'
             description: "Barva tlačítka Like."
-          wiki:
-            name: 'wiki'
-            description: "Základní barva použita pro pozadí wiki článků."
       email:
         settings: "Nastavení"
         preview_digest: "Náhled souhrnu"
@@ -2563,8 +2534,6 @@ cs:
         mark_watching: '<b>m</b>, <b>w</b> Watch topic'
     badges:
       title: Odznaky
-      allow_title: "může být použito jako titul"
-      multiple_grant: "může být přiděleno několikrát"
       badge_count:
         one: "1 odznak"
         few: "%{count} odznaky"
@@ -2590,93 +2559,3 @@ cs:
           name: Ostatní
         posting:
           name: Přispívání
-      badge:
-        editor:
-          name: Editor
-          description: První úprava příspěvku.
-        basic_user:
-          name: Základní
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Granted</a> all essential community functions
-        member:
-          name: Člen
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Povoleny</a> pozvánky
-        regular:
-          name: Normální
-        leader:
-          name: Vůdce
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Povoleno</a> globální editování, připínání, zavírání, archivace, rozdělení a spojení
-        welcome:
-          name: Vítejte
-          description: Obdrženo líbí se mi
-        autobiographer:
-          name: Autor vlastního životopisu
-          description: Vypněné informace v <a href="/my/preferences">profilu</a>.
-        anniversary:
-          name: Výročí
-          description: Aktivním členem přes rok, přispěl alespoň jednou
-        nice_post:
-          name: Zdařilý příspěvek
-          description: Obdrženo 10 líbí se na příspěvku. Tento odznak můžete získat opakovaně
-        good_post:
-          name: Dobrý příspěvek
-          description: Obdrženo 25 líbí se na příspěvku. Tento odznak můžete získat opakovaně
-        great_post:
-          name: Výborný příspěvek
-          description: Obdrženo 50 líbí se na příspěvku. Tento odznak můžete získat opakovaně
-        nice_topic:
-          name: Zdařilé téma
-          description: Obdrženo 10 líbí se v tématu. Tento odznak můžete získat opakovaně
-        good_topic:
-          name: Dobré téma
-          description: Obdrženo 25 líbí se v tématu. Tento odznak můžete získat opakovaně
-        great_topic:
-          name: Výborné téma
-          description: Obdrženo 50 líbí se v tématu. Tento odznak můžete získat opakovaně
-        nice_share:
-          name: Zdařilé sdílení
-          description: Sdílení příspěvku s 25 unikátními návštěvníky
-        good_share:
-          name: Dobré sdílení
-          description: Sdílení příspěvku s 300 unikátními návštěvníky
-        great_share:
-          name: Výborné sdílení
-          description: Sdílení příspěvku s 1000 unikátními návštěvníky
-        first_like:
-          name: První lajk
-          description: Líbil se příspěvek
-        first_flag:
-          name: První nahlášení
-          description: Nahlášen příspěvek
-        promoter:
-          name: Promotér
-          description: Pozval uživatele
-        campaigner:
-          name: Vede kampaň
-          description: Pozval 3 základní uživatele (důvěryhodnost 1)
-        champion:
-          name: Šampión
-          description: Pozval 5 uživatelů (důvěryhodnost 2)
-        first_share:
-          name: První sdílení
-          description: Sdílený příspěvek
-        first_link:
-          name: První odkaz
-          description: Vložen interní odkaz na jiné téma
-        first_quote:
-          name: První citace
-          description: Citovat uživatele
-        read_guidelines:
-          name: Přečíst pokyny
-          description: Přečíst <a href="/guidelines">komunitní pokyny</a>
-        reader:
-          name: Čtenář
-          description: Přečíst každý příspěvek v tématu s více než 100 příspěvky
-        popular_link:
-          name: Populární odkaz
-          description: Přidal externí odkaz s alespoň 50 kliky
-        hot_link:
-          name: Žhavý odkaz
-          description: Přidal externí odkaz s alespoň 300 kliky
-        famous_link:
-          name: Slavný odkaz
-          description: Přidal externí odkaz s alespoň 1000 kliky
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index e971423ded..0a78b16997 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -166,6 +166,8 @@ da:
     more: "Mere"
     less: "Mindre"
     never: "aldrig"
+    every_30_minutes: "hvert 30. minut"
+    every_hour: "hver time"
     daily: "dagligt"
     weekly: "ugentligt"
     every_two_weeks: "hver anden uge"
@@ -256,7 +258,6 @@ da:
         one: "Det emne har <b>1</b> indlæg der afventer godkendelse"
         other: "Dette emne har <b>{{count}}</b> indlæg der afventer godkendelse"
       confirm: "Gem ændringer"
-      delete_prompt: "Er du sikker på, at du vil slette <b>%{username}</b>? Alle brugerens indlæg bliver slettet og email og IP-adresse bliver blokeret."
       approval:
         title: "Indlæg afventer godkendelse"
         description: "Vi har modtaget dit indlæg, men det skal først godkendes af en moderator. Hav venligst tålmodighed."
@@ -313,7 +314,10 @@ da:
         one: "gruppe"
         other: "grupper"
       members: "Medlemmer"
+      topics: "Emner"
       posts: "Indlæg"
+      mentions: "Omtaler"
+      messages: "Beskeder"
       alias_levels:
         title: "Hvem kan sende beskeder til og @nævne denne gruppe?"
         nobody: "Ingen"
@@ -420,9 +424,7 @@ da:
         perm_denied_btn: "Tilladelse nægtet"
         perm_denied_expl: "Du nægtede adgang for notifikationer. Tillad notifikationer via indstillingerne i din browser."
         disable: "Deaktiver notifikationer"
-        currently_enabled: "(slået til)"
         enable: "Aktiver notifikationer"
-        currently_disabled: "(slået fra)"
         each_browser_note: "Bemærk: Du skal ændre indstillingen i alle dine browsere."
       dismiss_notifications: "Marker alle som læst"
       dismiss_notifications_tooltip: "Marker alle ulæste notifikationer som læst"
@@ -457,7 +459,6 @@ da:
       muted_users: "Ignoreret"
       muted_users_instructions: "Undertryk alle notifikationer fra disse brugere."
       muted_topics_link: "Vis mute emner"
-      automatically_unpin_topics: "Unpin automatisk emner når du når til bunden."
       staff_counters:
         flags_given: "hjælpsomme markeringer"
         flagged_posts: "markerede indlæg"
@@ -558,12 +559,26 @@ da:
         title: "Brugerkort-Badge"
       website: "Site"
       email_settings: "E-mail"
+      like_notification_frequency:
+        title: "Giv besked når liked"
+        always: "Altid"
+        first_time_and_daily: "Første gang et indlæg likes og dagligt"
+        first_time: "Første gang et indlæg likes"
+        never: "Aldrig"
+      email_previous_replies:
+        title: "Inkluder tidligere svar i bunden af emails"
+        unless_emailed: "medmindre tidligere sendt"
+        always: "altid"
+        never: "aldrig"
       email_digests:
         title: "Når jeg ikke besøger her, send mig en email med nyheder."
+        every_30_minutes: "hvert 30. minut"
+        every_hour: "hver time"
         daily: "dagligt"
         every_three_days: "hver tredje dag"
         weekly: "ugenligt"
         every_two_weeks: "hver anden uge"
+      include_tl0_in_digests: "Inkluder indlæg fra nye brugere i opsummerings-mails"
       email_direct: "Send mig en email når nogen citerer mig, svarer på mit indlæg, nævner mit @brugernavn eller inviterer mig til et emne"
       email_private_messages: "Send mig en email når nogen sender mig en besked"
       email_always: "Send mig email-notifikationer, selv når jeg er aktiv på websitet"
@@ -717,8 +732,6 @@ da:
       value_prop: "Når du opretter en konto, så kan vi huske hvad du har læst, så du altid kan fortsætte, hvor du er kommet til. Du får også notifikationer - her og på email - når nye interessante indlæg postes. Og du kan like indlæg og dele begejstringen. :heartbeat:"
     summary:
       enabled_description: "Du ser et sammendrag af dette emne: kun de mest interessante indlæg som andre finder interresante."
-      description: "Der er <b>{{replyCount}}</b> svar."
-      description_time: "Der er <b>{{replyCount}}</b> svar og det vil tage ca. <b>{{readingTime}} minutter</b> at læse."
       enable: 'Opsummér dette emne'
       disable: 'Vis alle indlæg'
     deleted_filter:
@@ -889,7 +902,6 @@ da:
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='citeret' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='svaret' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='svaret' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='redigeret' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='privat besked' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -998,9 +1010,6 @@ da:
         category: "Der er ingen emner i kategorien {{category}}."
         top: "Der er ingen top emner"
         search: "Der er ingen søgeresultater."
-        educate:
-          new: '<p>Dine nye emner vises her.</p><p>Som standard, betragtes emner som nye og vil vise en <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span> indikator hvis de er lavet inden for de sidste 2 dage.</p><p>Du kan skifte dette i dine <a href="%{userPrefsUrl}">indstillinger</a>.</p>'
-          unread: '<p>Dine ulæste emner vises her.</p><p>Som standard, betragtes emner som ulæste og vil vise en ulæst-tæller <span class="badge new-posts badge-notification">1</span> hvis du:</p><ul><li>Lavede emnet</li><li>Svarede på emnet</li><li>læste emnet i mere end 4 min.</li></ul><p>Eller hvis du udtrykkeligt har sat emnet til Sporet eller Overvåget via notifikations kontrollen i budnen af hvert emne.</p><p>Du kan ændre dette i dine <a href="%{userPrefsUrl}">indstillinger</a>.</p>'
       bottom:
         latest: "Der er ikke flere populære emner."
         hot: "There are no more hot topics."
@@ -1365,17 +1374,7 @@ da:
           like: "Undo like"
           vote: "Undo vote"
         people:
-          off_topic: "{{icons}} markerede dette som urelevant for emnet"
-          spam: "{{icons}} markerede dette som spam"
-          spam_with_url: "{{icons}} markerede <a href='{{postUrl}}'>dette som spam</a>"
-          inappropriate: "{{icons}} markerede dette som upassende"
-          notify_moderators: "{{icons}} underrettede moderatorer"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>underrettede moderatorer</a>"
-          notify_user: "{{icons}} har sendt en besked"
-          notify_user_with_url: "{{icons}} sendte en <a href='{{postUrl}}'>besked</a>"
-          bookmark: "{{icons}} bogmærker"
-          like: "{{icons}} likes"
-          vote: "{{icons}} stemmer"
+          vote: "stemte for dette"
         by_you:
           off_topic: "Du flagede dette som off-topic"
           spam: "Du flagede dette som spam"
@@ -1527,7 +1526,6 @@ da:
           description: "Du vil aldrig få besked om noget om nye emner i kategorierne og de vises heller ikke i seneste."
     flagging:
       title: 'Tak fordi du hjælper med at holde vores forum civiliseret!'
-      private_reminder: 'flag er private, de er <b>kun</p> synlige for personalet'
       action: 'Flag indlæg'
       take_action: "Reagér"
       notify_action: 'Besked'
@@ -1539,7 +1537,6 @@ da:
       submit_tooltip: "Send privat markeringen"
       take_action_tooltip: "Nå til markerings niveauer med det samme, i stedet for at vente på flere markeringer fra fælleskabet"
       cant: "Beklager, du kan i øjeblikket ikke flage dette indlæg."
-      notify_staff: 'Informer personalet'
       formatted_name:
         off_topic: "Det holder sig ikke til emnet"
         inappropriate: "Det er upassende"
@@ -1920,11 +1917,9 @@ da:
             is_disabled: "Gendan er deaktiveret i forum indstillingerne."
             label: "Genetabler"
             title: "Gendan backuppen"
-            confirm: "Er du sikker på du vil gendanne fra denne backup?"
           rollback:
             label: "Rul tilbage"
             title: "Rul databasen tilbage til et tidspunkt hvor tingene virkede"
-            confirm: "Er du sikker på du vil rulle databasen tilbage?"
       export_csv:
         user_archive_confirm: "Er du sikker på du vil downloade dine indlæg?"
         success: "Eksport er startet, du vil blive notificeret via en besked når denne proces er færdig."
@@ -2027,9 +2022,6 @@ da:
           love:
             name: 'kærlighed'
             description: "Like knappens farve."
-          wiki:
-            name: 'wiki'
-            description: "Basis farven der bruges som baggrund i wiki posts."
       email:
         title: "Emails"
         settings: "Indstillinger"
@@ -2592,10 +2584,7 @@ da:
       earned_n_times:
         one: "Fortjente dette badge 1 gang"
         other: "Fortjente dette badge %{count} gange."
-      more_with_badge: "Andre med dette badge"
       title: Badges
-      allow_title: "kan bruges som titel"
-      multiple_grant: "kan gives flere gange"
       badge_count:
         one: "1 Badge"
         other: "%{count} Badges"
@@ -2618,97 +2607,6 @@ da:
           name: Andre
         posting:
           name: Indlæg
-      badge:
-        editor:
-          name: Redigering
-          description: Første indlæg redigering
-        basic_user:
-          name: Basic
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Givet</a> alle vigtige fællesskab funktioner
-        member:
-          name: Medlem
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Givet</a> invitationer
-        regular:
-          name: Stamgæst
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Givet</a> re-kategoristering, omdøbning, følge links og loungen
-        leader:
-          name: Leder
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Givet</a> global redigering, fastgøring, lukning, arkivering, del og sammensæt
-        welcome:
-          name: Velkommen
-          description: Modtaget et like
-        autobiographer:
-          name: Selvbiografi
-          description: Har udfyldt sin <a href="/my/preferences">profil</a> information
-        anniversary:
-          name: Jubilæum
-          description: Aktivt medlem i et år, som har skrevet mindst en gang
-        nice_post:
-          name: Fint indlæg
-          description: Har modtaget 10 "likes" på et indlæg. Denne badge kan modtages flere gange.
-        good_post:
-          name: Godt indlæg
-          description: Har modtaget 25 "likes" på et indlæg. Denne badge kan modtages flere gange.
-        great_post:
-          name: Rigtig godt indlæg
-          description: Har modtaget 50 "likes" på et indlæg. Denne badge kan modtages flere gange.
-        nice_topic:
-          name: Godt emne
-          description: Har modtaget 10 "likes" på et emne. Denne badge kan modtages flere gange.
-        good_topic:
-          name: Godt emne
-          description: Har modtaget 25 "likes" på et emne. Denne badge kan modtages flere gange.
-        great_topic:
-          name: Fantastisk emne
-          description: Har modtaget 50 "likes" på et emne. Denne badge kan modtages flere gange.
-        nice_share:
-          name: God deling
-          description: Delt et emne med 25 unikke besøgende
-        good_share:
-          name: God deling
-          description: Delt et indlæg med 300 unikke besøgende
-        great_share:
-          name: Fantastisk deling
-          description: Delt et indlæg med 1000 unikke besøgende
-        first_like:
-          name: Første like
-          description: Har liked et indlæg
-        first_flag:
-          name: Første markering
-          description: Markeret et indlæg
-        promoter:
-          name: Promoter
-          description: Inviterede en bruger
-        campaigner:
-          name: Kampagnechef
-          description: Inviterede 3 brugere (tillidsniveau 1)
-        champion:
-          name: Mester
-          description: Inviterede 5 medlemmer (tillidsniveau 2)
-        first_share:
-          name: Første deling
-          description: Delt et indlæg
-        first_link:
-          name: Første link
-          description: Internt link til et andet emne tilføjet
-        first_quote:
-          name: Første citering
-          description: Citeret en bruger
-        read_guidelines:
-          name: Læst retningslinierne
-          description: Har læst <a href="/guidelines">retningslinierne for forummet</a>
-        reader:
-          name: Læser
-          description: Har læst hver eneste indlæg i et emne med mere end 100 posts
-        popular_link:
-          name: Populært link
-          description: Postede et eksternt link med mindst 50 klik
-        hot_link:
-          name: Hot link
-          description: Postede et eksternt link med mindst 300 klik
-        famous_link:
-          name: Berømt link
-          description: Postede et eksternt link med mindst 1000 klik
     google_search: |
       <h3>Søg med Google</h3>
       <p>
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index f726d1e024..d05ad339af 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -179,6 +179,8 @@ de:
     more: "Mehr"
     less: "Weniger"
     never: "nie"
+    every_30_minutes: "alle 30 Minuten"
+    every_hour: "jede Stunde"
     daily: "täglich"
     weekly: "wöchentlich"
     every_two_weeks: "jede zweite Woche"
@@ -269,7 +271,7 @@ de:
         one: "Dieses Thema hat <b>einen</b> Beitrag, der genehmigt werden muss"
         other: "Dieses Thema hat <b>{{count}}</b> Beiträge, die genehmigt werden müssen"
       confirm: "Änderungen speichern"
-      delete_prompt: "Bist du sicher, dass du <b>%{username}</b> löschen möchtest? Es werden alle Beiträge des Benutzers gelöscht und dessen E-Mail- und IP-Adresse geblockt."
+      delete_prompt: "Möchtest du wirklich <b>%{username}</b> löschen? Damit werden alle Beiträge des Benutzers entfernt und dessen E-Mail- und IP-Adresse geblockt."
       approval:
         title: "Beitrag muss genehmigt werden"
         description: "Wir haben deinen neuen Beitrag erhalten. Dieser muss allerdings zunächst durch einen Moderator freigeschaltet werden. Bitte habe etwas Geduld. "
@@ -326,7 +328,10 @@ de:
         one: "Gruppe"
         other: "Gruppen"
       members: "Mitglieder"
+      topics: "Themen"
       posts: "Beiträge"
+      mentions: "Erwähnungen"
+      messages: "Nachrichten"
       alias_levels:
         title: "Wer kann diese Gruppe kontaktieren und per @Gruppenname erwähnen?"
         nobody: "Niemand"
@@ -340,16 +345,16 @@ de:
       notifications:
         watching:
           title: "Beobachten"
-          description: "Du wirst über jeden neuen Beitrag in jeder Nachricht benachrichtigt und die Anzahl der neuen Antworten wird angezeigt."
+          description: "Du wirst über jeden neuen Beitrag in jeder Nachricht benachrichtigt und die Anzahl neuer Antworten wird angezeigt."
         tracking:
           title: "Verfolgen"
-          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet, und die Anzahl der neuen Antworten wird angezeigt."
+          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet, und die Anzahl neuer Antworten wird angezeigt."
         regular:
           title: "Normal"
-          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet."
+          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet."
         muted:
           title: "Stummgeschaltet"
-          description: "Du erhältst keine Benachrichtigungen im Zusammenhang mit Nachrichten in dieser Gruppe."
+          description: "Du erhältst keine Benachrichtigungen über neue Themen in dieser Gruppe."
     user_action_groups:
       '1': "Abgegebene Likes"
       '2': "Erhaltene Likes"
@@ -431,11 +436,9 @@ de:
         not_supported: "Dieser Browser unterstützt leider keine Benachrichtigungen."
         perm_default: "Benachrichtigungen einschalten"
         perm_denied_btn: "Zugriff verweigert"
-        perm_denied_expl: "Du hast Benachrichtigungen blockiert. Aktiviere die Benachrichtigungen über deine Browser Einstellungen."
+        perm_denied_expl: "Du hast das Anzeigen von Benachrichtigungen verboten. Aktiviere die Benachrichtigungen über deine Browser-Einstellungen."
         disable: "Benachrichtigungen deaktivieren"
-        currently_enabled: "(derzeit aktiviert)"
         enable: "Benachrichtigungen aktivieren"
-        currently_disabled: "(derzeit deaktiviert)"
         each_browser_note: "Hinweis: Du musst diese Einstellung in jedem von dir verwendeten Browser ändern."
       dismiss_notifications: "Alle als gelesen markieren"
       dismiss_notifications_tooltip: "Alle ungelesenen Benachrichtigungen als gelesen markieren"
@@ -470,7 +473,7 @@ de:
       muted_users: "Stummgeschaltet"
       muted_users_instructions: "Alle Benachrichtigungen von diesem Benutzer unterdrücken."
       muted_topics_link: "Zeige stummgeschaltete Themen"
-      automatically_unpin_topics: "Themen automatisch loslösen, wenn du das Ende erreichst."
+      automatically_unpin_topics: "Angeheftete Themen automatisch loslösen, wenn ich deren letzten Beitrag gelesen habe."
       staff_counters:
         flags_given: "hilfreiche Meldungen"
         flagged_posts: "gemeldete Beiträge"
@@ -486,7 +489,7 @@ de:
         bulk_select: "Nachrichten auswählen"
         move_to_inbox: "In Posteingang verschieben"
         move_to_archive: "Archivieren"
-        failed_to_move: "Die ausgewählten Nachrichten konnten nicht bewegt werden (vielleicht gibt es ein Netzwerkproblem)."
+        failed_to_move: "Die ausgewählten Nachrichten konnten nicht verschoben werden. Vielleicht gibt es ein Netzwerkproblem."
         select_all: "Alle auswählen"
       change_password:
         success: "(E-Mail gesendet)"
@@ -571,12 +574,27 @@ de:
         title: "Benutzerkarten-Abzeichen"
       website: "Website"
       email_settings: "E-Mail"
+      like_notification_frequency:
+        title: "Benachrichtigung für erhaltene Likes anzeigen"
+        always: "immer"
+        first_time_and_daily: "erster Like eines Beitrags und täglich"
+        first_time: "nur erster Like eines Beitrags"
+        never: "nie"
+      email_previous_replies:
+        title: "Füge vorherige Beiträge ans Ende von E-Mails an"
+        unless_emailed: "sofern noch nicht gesendet"
+        always: "immer"
+        never: "nie"
       email_digests:
         title: "Sende eine E-Mail mit Neuigkeiten, wenn ich länger nicht hier bin:"
+        every_30_minutes: "alle 30 Minuten"
+        every_hour: "stündlich"
         daily: "täglich"
         every_three_days: "alle drei Tage"
         weekly: "wöchentlich"
         every_two_weeks: "jede zweite Woche"
+      include_tl0_in_digests: "Beiträge von neuen Benutzern in E-Mail mit Neuigkeiten einfügen"
+      email_in_reply_to: "Einen Auszug aus dem beantworteten Beitrag in E-Mails einfügen."
       email_direct: "Sende mir eine E-Mail, wenn mich jemand zitiert, auf meine Beiträge antwortet, meinen @Namen erwähnt oder mich zu einem Thema einlädt."
       email_private_messages: "Sende mir eine E-Mail, wenn mir jemand eine Nachricht sendet."
       email_always: "Benachrichtige mich per E-Mail auch während ich auf dieser Website aktiv bin"
@@ -592,7 +610,7 @@ de:
         after_2_weeks: "in den letzten 2 Wochen erstellt"
       auto_track_topics: "Betrachteten Themen automatisch folgen"
       auto_track_options:
-        never: "niemals"
+        never: "nie"
         immediately: "sofort"
         after_30_seconds: "nach 30 Sekunden"
         after_1_minute: "nach 1 Minute"
@@ -703,6 +721,7 @@ de:
     read_only_mode:
       enabled: "Diese Seite ist im Nur-Lesen Modus. Du kannst weiterhin die Seite lesen, aber antworten, liken und andere Aktionen sind deaktiviert."
       login_disabled: "Die Anmeldung ist deaktiviert während sich die Website im Nur-Lesen-Modus befindet."
+      logout_disabled: "Die Abmeldung ist deaktiviert während sich die Website im Nur-Lesen-Modus befindet."
     too_few_topics_and_posts_notice: "Lass' <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>die Diskussionen starten!</a> Es existieren bisher <strong>%{currentTopics} von %{requiredTopics}</strong> benötigten Themen und <strong>%{currentPosts} von %{requiredPosts}</strong> benötigten Beiträgen. Neue Besucher benötigen bestehende Konversationen, die sie lesen und auf die sie antworten können."
     too_few_topics_notice: "Lass' <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>die Diskussionen starten!</a> Es existieren bisher <strong>%{currentTopics} von %{requiredTopics}</strong> benötigten Themen. Neue Besucher benötigen bestehende Konversationen, die sie lesen und auf die sie antworten können."
     too_few_posts_notice: "Lass' <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>die Diskussionen starten!</a> Es existieren bisher <strong>%{currentPosts} von %{requiredPosts}</strong> benötigten Beiträgen. Neue Besucher benötigen bestehende Konversationen, die sie lesen und auf die sie antworten können."
@@ -798,6 +817,9 @@ de:
       twitter:
         title: "mit Twitter"
         message: "Authentifiziere mit Twitter (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
+      instagram:
+        title: "mit Instagram"
+        message: "Authentifiziere mit Instagram (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
       facebook:
         title: "mit Facebook"
         message: "Authentifiziere mit Facebook (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
@@ -903,7 +925,6 @@ de:
       group_mentioned: "<i title='Gruppe erwähnt' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='zitiert' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='geantwortet' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='geantwortet' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='bearbeitet' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='gefällt' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='Nachricht' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -930,7 +951,7 @@ de:
         moved_post: "Dein Beitrag wurde verschoben von"
         linked: "Link zu deinem Beitrag"
         granted_badge: "Abzeichen erhalten"
-        group_message_summary: "Nachrichten in dem Gruppenpostfach"
+        group_message_summary: "Nachrichten im Gruppenpostfach"
       popup:
         mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
         group_mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
@@ -975,7 +996,7 @@ de:
         category: "Kategorie „{{category}}“ durchsuchen"
         topic: "Dieses Thema durchsuchen"
         private_messages: "Nachrichten durchsuchen"
-    hamburger_menu: "wechsel zu einem anderen Beitragsliste oder Kategorie"
+    hamburger_menu: "zu einer anderen Themenliste oder Kategorie wechseln"
     new_item: "neu"
     go_back: 'zurückgehen'
     not_logged_in_user: 'Benutzerseite mit einer Zusammenfassung der Benutzeraktivitäten und Einstellungen'
@@ -1012,11 +1033,6 @@ de:
         category: "Es gibt keine Themen in {{category}}."
         top: "Es gibt keine Top-Themen."
         search: "Es wurden keine Suchergebnisse gefunden."
-        educate:
-          new: '<p>Hier werden neue Themen angezeigt.</p><p>Standardmäßig werden jene Themen als neu angesehen und mit dem <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">neu</span> Indikator versehen, die in den letzten 2 Tagen erstellt wurden.</p><p>Du kannst das in deinen <a href="%{userPrefsUrl}">Einstellungen</a> ändern.</p>'
-          unread: '<p>Hier werden deine ungelesenen Themen angezeigt.</p><p>Die Anzahl der ungelesenen Beiträge wird als <span class="badge new-posts badge-notification">1</span> neben den Themen angezeigt.<br/>
-
-            Standardmäßig werden Themen als ungelesen angesehen, wenn du:</p><ul><li>das Thema erstellt hast</li><li>auf das Thema geantwortet hast</li><li>das Thema länger als 4 Minuten gelesen hast</li></ul><p>Außerdem werden jene Themen berücksichtigt, die du in den Benachrichtigungseinstellungen am Ende eines jeden Themas ausdrücklich auf Beobachten oder Verfolgen gesetzt hast.</p><p>Du kannst das in deinen <a href="%{userPrefsUrl}">Einstellungen</a> ändern.</p>'
       bottom:
         latest: "Das waren die aktuellen Themen."
         hot: "Das waren alle beliebten Themen."
@@ -1114,8 +1130,8 @@ de:
           '2_4': 'Du wirst Benachrichtigungen erhalten, weil du eine Antwort zu diesem Thema verfasst hast.'
           '2_2': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema verfolgst.'
           '2': 'Du wirst Benachrichtigungen erhalten, weil du <a href="/users/{{username}}/preferences">dieses Thema gelesen hast</a>.'
-          '1_2': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet.'
-          '1': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet.'
+          '1_2': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
+          '1': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
           '0_7': 'Du ignorierst alle Benachrichtigungen dieser Kategorie.'
           '0_2': 'Du ignorierst alle Benachrichtigungen dieses Themas.'
           '0': 'Du ignorierst alle Benachrichtigungen dieses Themas.'
@@ -1127,16 +1143,16 @@ de:
           description: "Du wirst über jeden neuen Beitrag in diesem Thema benachrichtigt und die Anzahl der neuen Antworten wird angezeigt."
         tracking_pm:
           title: "Verfolgen"
-          description: "Die Anzahl der neuen Antworten wird bei dieser Unterhaltung angezeigt. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet."
+          description: "Die Anzahl der neuen Antworten wird bei dieser Unterhaltung angezeigt. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deine Nachricht antwortet."
         tracking:
           title: "Verfolgen"
-          description: "Die Anzahl der neuen Antworten wird bei diesem Thema angezeigt. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet."
+          description: "Die Anzahl der neuen Antworten wird bei diesem Thema angezeigt. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet."
         regular:
           title: "Normal"
-          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet."
+          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet."
         regular_pm:
           title: "Normal"
-          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet."
+          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deine Nachricht antwortet."
         muted_pm:
           title: "Stummgeschaltet"
           description: "Du erhältst keine Benachrichtigungen im Zusammenhang mit dieser Unterhaltung."
@@ -1381,17 +1397,7 @@ de:
           like: "Gefällt mir nicht mehr"
           vote: "Stimme widerrufen"
         people:
-          off_topic: "{{icons}} haben das als „am Thema vorbei“ gemeldet"
-          spam: "{{icons}} haben das als Spam gemeldet"
-          spam_with_url: "{{icons}} haben <a href='{{postUrl}}'>das als Spam</a> gemeldet"
-          inappropriate: "{{icons}} haben das als unangemessen gemeldet"
-          notify_moderators: "{{icons}} haben das den Moderatoren gemeldet"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>haben das den Moderatoren gemeldet</a>"
-          notify_user: "{{icons}} hat eine Nachricht gesendet"
-          notify_user_with_url: "{{icons}} hat eine <a href='{{postUrl}}'>Nachricht</a> gesendet"
-          bookmark: "{{icons}} haben das als Lesezeichen"
-          like: "{{icons}} gefällt dieser Beitrag"
-          vote: "{{icons}} haben dafür gestimmt"
+          spam: "Melde es als Spam"
         by_you:
           off_topic: "Du hast das als „am Thema vorbei“ gemeldet"
           spam: "Du hast das als Spam gemeldet"
@@ -1534,16 +1540,15 @@ de:
           description: "Du wirst automatisch alle neuen Themen in diesen Kategorien beobachten. Du wirst über jeden neuen Beitrag in jedem Thema benachrichtigt und die Anzahl neuer Antworten wird angezeigt."
         tracking:
           title: "Verfolgen"
-          description: "Du wirst automatisch allen neuen Themen in diesen Kategorien folgen. Du wirst benachrichtigt, wenn dich jemand mit @Name erwähnt oder dir antwortet, und die Anzahl neuer Antworten wird angezeigt."
+          description: "Du wirst automatisch allen neuen Themen in diesen Kategorien folgen. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet, und die Anzahl neuer Antworten wird angezeigt."
         regular:
           title: "Normal"
-          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet."
+          description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet."
         muted:
           title: "Stummgeschaltet"
           description: "Du erhältst nie mehr Benachrichtigungen über neue Themen in dieser Kategorie und die Themen werden auch nicht in der Liste der letzten Themen erscheinen."
     flagging:
       title: 'Danke für deine Mithilfe!'
-      private_reminder: 'Meldungen sind vertraulich und <b>nur</b> für Mitarbeiter sichtbar'
       action: 'Beitrag melden'
       take_action: "Reagieren"
       notify_action: 'Nachricht'
@@ -1555,7 +1560,6 @@ de:
       submit_tooltip: "Private Meldung abschicken"
       take_action_tooltip: "Den Meldungsschwellenwert sofort erreichen, anstatt auf weitere Meldungen aus der Community zu warten."
       cant: "Entschuldige, du kannst diesen Beitrag derzeit nicht melden."
-      notify_staff: 'Mitarbeiter benachrichtigen'
       formatted_name:
         off_topic: "Es ist am Thema vorbei"
         inappropriate: "Es ist unangemessen"
@@ -1846,9 +1850,9 @@ de:
         add: "Hinzufügen"
         add_members: "Mitglieder hinzufügen"
         custom: "Benutzerdefiniert"
-        bulk_complete: "Der Benutzer wurde der Gruppe hinzugefügt."
+        bulk_complete: "Die Benutzer wurden der Gruppe hinzugefügt."
         bulk: "Mehrere der Gruppe hinzufügen"
-        bulk_paste: "Füge eine Liste an Benutzernamen oder E-Mail-Adressen ein, jeweils pro Zeile:"
+        bulk_paste: "Füge eine Liste an Benutzernamen oder E-Mail-Adressen ein (ein Eintrag je Zeile):"
         bulk_select: "(wähle eine Gruppe aus)"
         automatic: "Automatisch"
         automatic_membership_email_domains: "Benutzer, deren E-Mail-Domain mit einem der folgenden Listeneinträge genau übereinstimmt, werden automatisch zu dieser Gruppe hinzugefügt:"
@@ -1932,11 +1936,9 @@ de:
             is_disabled: "Wiederherstellung ist in den Website-Einstellungen deaktiviert."
             label: "Wiederherstellen"
             title: "Das Backup wiederherstellen"
-            confirm: "Möchtest du wirklich dieses Backup wiederherstellen?"
           rollback:
             label: "Zurücksetzen"
             title: "Die Datenbank auf den letzten funktionierenden Zustand zurücksetzen"
-            confirm: "Möchtest du wirklich die Datenbank auf den letzten funktionierenden Stand zurücksetzen?"
       export_csv:
         user_archive_confirm: "Möchtest du wirklich deine Beiträge herunterladen?"
         success: "Der Export wurde gestartet. Du erhältst eine Nachricht, sobald der Vorgang abgeschlossen ist."
@@ -2039,9 +2041,6 @@ de:
           love:
             name: 'Liebe'
             description: "Die Farbe des Like-Buttons."
-          wiki:
-            name: 'Wiki'
-            description: "Die Standardfarbe wird als Hintergrundfarbe für Wiki-Beiträge genutzt."
       email:
         title: "E-Mails"
         settings: "Einstellungen"
@@ -2063,7 +2062,7 @@ de:
         send_test: "Test-E-Mail senden"
         sent_test: "Gesendet!"
         delivery_method: "Versandmethode"
-        preview_digest_desc: "Vorschau der Zusammenfassung der letzten Aktivitäten, die als E-Mail an inaktive Nutzer gesendet wird."
+        preview_digest_desc: "Vorschau der Neuigkeiten, die als E-Mail an inaktive Nutzer gesendet werden."
         refresh: "Aktualisieren"
         format: "Format"
         html: "HTML"
@@ -2078,6 +2077,16 @@ de:
           subject: "Betreff"
           error: "Fehler"
           none: "Keine eingehenden E-Mails gefunden."
+          modal:
+            title: "Details der eingehenden E-Mail"
+            error: "Fehler"
+            references: "Referenzen"
+            date: "Datum"
+            from: "Von"
+            to: "An"
+            cc: "Cc"
+            subject: "Betreff"
+            body: "Nachrichtentext"
           filters:
             from_placeholder: "von@example.com"
             to_placeholder: "an@example.com"
@@ -2153,6 +2162,7 @@ de:
             revoke_admin: "Administration entziehen"
             grant_moderation: "Moderation gewähren"
             revoke_moderation: "Moderation entziehen"
+            backup_operation: "Backup läuft"
         screened_emails:
           title: "Gefilterte E-Mails"
           description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Anmeldung blockiert oder eine andere Aktion ausgeführt."
@@ -2320,7 +2330,7 @@ de:
         unblock_failed: 'Beim Aufheben der Blockierung des Benutzers ist ein Fehler aufgetreten.'
         block_failed: 'Beim Blocken des Benutzers ist ein Fehler aufgetreten.'
         block_confirm: 'Bust du sicher, dass du diesen Benutzer blockieren willst? Sie werden keine Möglichkeit mehr haben, Themen oder Beiträge zu erstellen.'
-        block_accept: 'Ja, den Nutzer blockieren.'
+        block_accept: 'Ja, diesen Benutzer blockieren.'
         deactivate_explanation: "Ein deaktivierter Benutzer muss seine E-Mail-Adresse erneut bestätigen."
         suspended_explanation: "Ein gesperrter Benutzer kann sich nicht anmelden."
         block_explanation: "Ein geblockter Benutzer kann keine Themen erstellen oder Beiträge veröffentlichen."
@@ -2606,10 +2616,7 @@ de:
       earned_n_times:
         one: "Einmal dieses Abzeichen erhalten"
         other: "%{count} mal dieses Abzeichen erhalten"
-      more_with_badge: "Andere mit diesem Abzeichen"
       title: Abzeichen
-      allow_title: "kann als Titel verwendet werden"
-      multiple_grant: "kann mehrfach verliehen werden"
       badge_count:
         one: "1 Abzeichen"
         other: "%{count} Abzeichen"
@@ -2632,97 +2639,6 @@ de:
           name: Andere
         posting:
           name: Beiträge
-      badge:
-        editor:
-          name: Bearbeiter
-          description: Hat den ersten Beitrag bearbeitet
-        basic_user:
-          name: Anwärter
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Ermöglicht</a> das Nutzen alle wesentlichen Community-Funktionen
-        member:
-          name: Mitglied
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Ermöglicht</a> Einladungen
-        regular:
-          name: Stammgast
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Ermöglicht</a> das Verschieben und Umbenennen von Themen, die Veröffentlichung von <a href="http://de.wikipedia.org/wiki/Nofollow">verfolgbaren Links</a> und den Zugang zur Lounge
-        leader:
-          name: Anführer
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Ermöglicht</a> das Bearbeiten aller Beiträge und das Anheften, Schließen, Archivieren, Aufteilen und Zusammenfügen von Themen
-        welcome:
-          name: Willkommen
-          description: Hat ein Like erhalten
-        autobiographer:
-          name: Autobiograf
-          description: Hat <a href="/my/preferences">Benutzerprofil</a> ausgefüllt
-        anniversary:
-          name: Jubiläum
-          description: Aktives Mitglied für ein Jahr und hat mindestens einen Beitrag verfasst
-        nice_post:
-          name: Schöner Beitrag
-          description: Hat 10 Likes für einen Beitrag erhalten. Dieses Abzeichen kann mehrfach verliehen werden.
-        good_post:
-          name: Guter Beitrag
-          description: Hat 25 Likes für einen Beitrag erhalten. Dieses Abzeichen kann mehrfach verliehen werden.
-        great_post:
-          name: Großartiger Beitrag
-          description: Hat 50 Likes für einen Beitrag erhalten. Dieses Abzeichen kann mehrfach verliehen werden.
-        nice_topic:
-          name: Schönes Thema
-          description: Hat 10 Likes für ein Thema erhalten. Dieses Abzeichen kann mehrfach verliehen werden.
-        good_topic:
-          name: Gutes Thema
-          description: Hat 25 Likes für ein Thema erhalten. Dieses Abzeichen kann mehrfach verliehen werden.
-        great_topic:
-          name: Großartiges Thema
-          description: Hat 50 Likes für ein Thema erhalten. Dieses Abzeichen kann mehrfach verliehen werden.
-        nice_share:
-          name: Schöne Weitergabe
-          description: Hat einen Beitrag mit 25 Besuchern geteilt
-        good_share:
-          name: Gute Weitergabe
-          description: Hat einen Beitrag mit 300 Besuchern geteilt
-        great_share:
-          name: Großartige Weitergabe
-          description: Hat einen Beitrag mit 1000 Besuchern geteilt
-        first_like:
-          name: Erster Like
-          description: Hat Gefallen an einem Beitrag gefunden
-        first_flag:
-          name: Erste Meldung
-          description: Hat einen Beitrag gemeldet
-        promoter:
-          name: Befürworter
-          description: Hat einen Benutzer eingeladen
-        campaigner:
-          name: Aktivist
-          description: Hat 3 Anwärter (Vertrauensstufe 1) eingeladen
-        champion:
-          name: Verfechter
-          description: Hat 5 Mitglieder (Vertrauensstufe 2) eingeladen
-        first_share:
-          name: Erste Weitergabe
-          description: Hat einen Beitrag geteilt
-        first_link:
-          name: Erster Link
-          description: Hat einen internen Link auf einen anderen Beitrag hinzugefügt
-        first_quote:
-          name: Erstes Zitat
-          description: Hat einen Benutzer zitiert
-        read_guidelines:
-          name: Richtlinien gelesen
-          description: Hat die <a href="/guidelines">Community-Richtlinien</a> gelesen
-        reader:
-          name: Leser
-          description: Hat in einem Thema mit mehr als 100 Beiträgen jeden Beitrag gelesen
-        popular_link:
-          name: Beliebter Link
-          description: Hat einen externen Link veröffentlicht, welcher mindestens 50 Klicks erhalten hat.
-        hot_link:
-          name: Angesagter Link
-          description: Hat einen externen Link veröffentlicht, welcher mindestens 300 Klicks erhalten hat.
-        famous_link:
-          name: Berühmter Link
-          description: Hat einen externen Link veröffentlicht, welcher mindestens 1000 Klicks erhalten hat.
     google_search: |
       <h3>Mit Google suchen</h3>
       <p>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9d65923672..2fd92789a6 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -652,6 +652,7 @@ en:
         weekly: "weekly"
         every_two_weeks: "every two weeks"
 
+      include_tl0_in_digests: "Include posts from new users in digest emails"
       email_in_reply_to: "Include an excerpt of replied to post in emails"
       email_direct: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic"
       email_private_messages: "Send me an email when someone messages me"
@@ -660,6 +661,10 @@ en:
       other_settings: "Other"
       categories_settings: "Categories"
 
+      enable_mailing_list:
+        one: "Are you sure you want to be emailed for every new post?"
+        other: "Are you sure you want to be emailed for every new post?<br><br>This will result in approximately <b>{{count}} emails</b> per day."
+
       new_topic_duration:
         label: "Consider topics new when"
         not_viewed: "I haven't viewed them yet"
@@ -794,7 +799,12 @@ en:
     too_few_topics_and_posts_notice: "Let's <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>get this discussion started!</a> There are currently <strong>%{currentTopics} / %{requiredTopics}</strong> topics and <strong>%{currentPosts} / %{requiredPosts}</strong> posts. New visitors need some conversations to read and respond to."
     too_few_topics_notice: "Let's <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>get this discussion started!</a> There are currently <strong>%{currentTopics} / %{requiredTopics}</strong> topics. New visitors need some conversations to read and respond to."
     too_few_posts_notice: "Let's <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>get this discussion started!</a> There are currently <strong>%{currentPosts} / %{requiredPosts}</strong> posts. New visitors need some conversations to read and respond to."
-    logs_error_rate_exceeded_notice: "%{timestamp}: Current rate of <a href='%{url}' target='_blank'>%{rate} errors/%{duration}</a> has exceeded site settings's limit of %{siteSettingLimit} errors/%{duration}."
+    logs_error_rate_notice:
+      reached: "%{timestamp}: Current rate of <a href='%{url}' target='_blank'>%{rate}</a> has reached site settings's limit of %{siteSettingRate}."
+      exceeded: "%{timestamp}: Current rate of <a href='%{url}' target='_blank'>%{rate}</a> has exceeded site settings's limit of %{siteSettingRate}."
+      rate:
+        one: "1 error/%{duration}"
+        other: "%{count} errors/%{duration}"
 
     learn_more: "learn more..."
 
@@ -1510,6 +1520,8 @@ en:
       archetypes:
         save: 'Save Options'
 
+      few_likes_left: "Thanks for sharing the love! You only have a few likes left for today."
+
       controls:
         reply: "begin composing a reply to this post"
         like: "like this post"
@@ -2677,6 +2689,7 @@ en:
         badge: Badge
         display_name: Display Name
         description: Description
+        long_description: Long Description
         badge_type: Badge Type
         badge_grouping: Group
         badge_groupings:
@@ -2847,10 +2860,11 @@ en:
       earned_n_times:
         one: "Earned this badge 1 time"
         other: "Earned this badge %{count} times"
-      more_with_badge: "Others with this badge"
+      granted_on: "Granted %{date}"
+      others_count: "Others with this badge (%{count})"
       title: Badges
-      allow_title: "can be used as a title"
-      multiple_grant: "can be awarded multiple times"
+      allow_title: "available title"
+      multiple_grant: "awarded multiple times"
       badge_count:
         one:   "1 Badge"
         other: "%{count} Badges"
@@ -2873,124 +2887,6 @@ en:
           name: Other
         posting:
           name: Posting
-      badge:
-        editor:
-          name: Editor
-          description: First post edit
-        basic_user:
-          name: Basic
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Granted</a> all essential community functions
-        member:
-          name: Member
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Granted</a> invitations
-        regular:
-          name: Regular
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Granted</a> recategorize, rename, followed links and lounge
-        leader:
-          name: Leader
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Granted</a> global edit, pin, close, archive, split and merge
-        welcome:
-          name: Welcome
-          description: Received a like
-        autobiographer:
-          name: Autobiographer
-          description: Filled user <a href="/my/preferences">profile</a> information
-        anniversary:
-          name: Anniversary
-          description: Active member for a year, posted at least once
-        nice_post:
-          name: Nice Post
-          description: Received 10 likes on a post. This badge can be granted multiple times
-        good_post:
-          name: Good Post
-          description: Received 25 likes on a post. This badge can be granted multiple times
-        great_post:
-          name: Great Post
-          description: Received 50 likes on a post. This badge can be granted multiple times
-        nice_topic:
-          name: Nice Topic
-          description: Received 10 likes on a topic. This badge can be granted multiple times
-        good_topic:
-          name: Good Topic
-          description: Received 25 likes on a topic. This badge can be granted multiple times
-        great_topic:
-          name: Great Topic
-          description: Received 50 likes on a topic. This badge can be granted multiple times
-        nice_share:
-          name: Nice Share
-          description: Shared a post with 25 unique visitors
-        good_share:
-          name: Good Share
-          description: Shared a post with 300 unique visitors
-        great_share:
-          name: Great Share
-          description: Shared a post with 1000 unique visitors
-        first_like:
-          name: First Like
-          description: Liked a post
-        first_flag:
-          name: First Flag
-          description: Flagged a post
-        promoter:
-          name: Promoter
-          description: Invited a user
-        campaigner:
-          name: Campaigner
-          description: Invited 3 basic users (trust level 1)
-        champion:
-          name: Champion
-          description: Invited 5 members (trust level 2)
-        first_share:
-          name: First Share
-          description: Shared a post
-        first_link:
-          name: First Link
-          description: Added an internal link to another topic
-        first_quote:
-          name: First Quote
-          description: Quoted a user
-        read_guidelines:
-          name: Read Guidelines
-          description: Read the <a href="/guidelines">community guidelines</a>
-        reader:
-          name: Reader
-          description: Read every post in a topic with more than 100 posts
-        popular_link:
-          name: Popular Link
-          description: Posted an external link with at least 50 clicks
-        hot_link:
-          name: Hot Link
-          description: Posted an external link with at least 300 clicks
-        famous_link:
-          name: Famous Link
-          description: Posted an external link with at least 1000 clicks
-        appreciated:
-          name: Appreciated
-          description: Has received at least 1 like on 20 posts
-        respected:
-          name: Respected
-          description: Has received at least 2 likes on 100 posts
-        admired:
-          name: Admired
-          description: Has received at least 5 likes on 300 posts
-        out_of_love:
-          name: Out of Love
-          description: Used the maximum amount of likes in a day
-        higher_love:
-          name: Higher Love
-          description: Used the maximum amount of likes in a day 5 times
-        crazy_in_love:
-          name: Crazy in Love
-          description: Used the maximum amount of likes in a day 20 times
-        thank_you:
-          name: Thank You
-          description: Has at least 20 liked posts
-        gives_back:
-          name: Gives Back
-          description: Has at least 100 liked posts and a very high like ratio
-        empathetic:
-          name: Empathetic
-          description: Has at least 500 liked posts and a superlative like ratio
 
     google_search: |
       <h3>Search with Google</h3>
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index e8efb48dd8..963f84cabd 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -593,6 +593,7 @@ es:
         every_three_days: "cada tres días"
         weekly: "semanalmente"
         every_two_weeks: "cada dos semanas"
+      include_tl0_in_digests: "Incluir posts de nuevos usuarios en los resúmenes por email"
       email_in_reply_to: "Incluir un extracto del post al que se responde en los emails"
       email_direct: "Envíame un email cuando alguien me cite, responda a mis posts, mencione mi @usuario o me invite a un tema"
       email_private_messages: "Notifícame por email cuando alguien me envíe un mensaje"
@@ -724,7 +725,12 @@ es:
     too_few_topics_and_posts_notice: "¡Vamos a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>dar por comenzada la comunidad!</a> Hay <strong>%{currentTopics} / %{requiredTopics}</strong> temas y <strong>%{currentPosts} / %{requiredPosts}</strong> mensajes. Los nuevos visitantes necesitan algo que leer y a lo que responder."
     too_few_topics_notice: "¡Vamos a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>dar por comenzada la comunidad!</a> Hay <strong>%{currentTopics} / %{requiredTopics}</strong> temas. Los nuevos visitantes necesitan algo que leer y a lo que responder."
     too_few_posts_notice: "¡Vamos a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>dar por empezada la comunidad!</a> Hay <strong>%{currentPosts} / %{requiredPosts}</strong> mensajes. Los nuevos visitantes necesitan algo que leer y a lo que responder."
-    logs_error_rate_exceeded_notice: "%{timestamp}: La tasa actual de <a href='%{url}' target='_blank'>%{rate} errors/%{duration}</a> ha excedido el límite establecido en las opciones del sitio de %{siteSettingLimit} errors/%{duration}."
+    logs_error_rate_notice:
+      reached: "%{timestamp}: La tasa actual del <a href='%{url}' target='_blank'>%{rate}</a> ha alcanzado el límite establecido en las opciones del sitio en el %{siteSettingRate}."
+      exceeded: "%{timestamp}: La tasa actual del <a href='%{url}' target='_blank'>%{rate}</a> ha excedido el límite establecido en las opciones del sitio en el %{siteSettingRate}."
+      rate:
+        one: "1 error/%{duration}"
+        other: "%{count} errores/%{duration}"
     learn_more: "saber más..."
     year: 'año'
     year_desc: 'temas creados en los últimos 365 días'
@@ -1358,6 +1364,7 @@ es:
         about: "este post es tipo wiki"
       archetypes:
         save: 'Guardar opciones'
+      few_likes_left: "¡Gracias por compartir tu afecto! Te quedan solo unos pocos me gusta para hoy."
       controls:
         reply: "componer una respuesta para este post"
         like: "me gusta este post"
@@ -2481,6 +2488,7 @@ es:
         badge: Distintivo
         display_name: Nombre a mostrar
         description: Descripción
+        long_description: Descripción completa
         badge_type: Tipo de distintivo
         badge_grouping: Grupo
         badge_groupings:
@@ -2643,10 +2651,11 @@ es:
       earned_n_times:
         one: "Ganó este distintivo 1 vez"
         other: "Ganó este distintivo %{count} veces"
-      more_with_badge: "Otros con este distintivo"
+      granted_on: "Concedido el %{date}"
+      others_count: "Otras personas con este distintivo (%{count})"
       title: Distintivos
-      allow_title: "puede ser utilizado como título"
-      multiple_grant: "puede ser otorgado varias veces"
+      allow_title: "título disponible"
+      multiple_grant: "puede ser concedido varias veces"
       badge_count:
         one: "1 distintivo"
         other: "%{count} distintivos"
@@ -2669,97 +2678,6 @@ es:
           name: Miscelánea
         posting:
           name: Escritura
-      badge:
-        editor:
-          name: Editor
-          description: Editó un post por primera vez
-        basic_user:
-          name: Básico
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Dispone</a> de todas las funciones esenciales de la comunidad
-        member:
-          name: Miembro
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Se le conceden</a> invitaciones
-        regular:
-          name: Habitual
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Se le concede</a> el poder recategorizar, renombrar, publicar enlacer sin el tag no-follow y acceso a sala vip
-        leader:
-          name: Líder
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Se le concede</a> el poder editar, destacar, cerrar, archivar, dividir y combinar temas globalmente
-        welcome:
-          name: ¡Bienvenido/a!
-          description: Recibió un "me gusta"
-        autobiographer:
-          name: Autobiógrafo
-          description: Detalló información en su <a href="/my/preferences">perfil</a> de usuario
-        anniversary:
-          name: Aniversario
-          description: Miembro activo desde hace un año y ha publicado al menos una vez
-        nice_post:
-          name: Buen post
-          description: Recibió 10 "me gusta" en un post. Este distintivo puede ser concedido varias veces
-        good_post:
-          name: Gran post
-          description: Recibió 25 "me gusta" en un post. Este distintivo puede ser concedido varias veces
-        great_post:
-          name: Excelente post
-          description: Recibió 50 "me gusta" en un post. Este distintivo puede ser concedido varias veces
-        nice_topic:
-          name: Buen tema
-          description: Recibió 10 "me gusta" en un tema. Este distintivo puede ser concedido varias veces
-        good_topic:
-          name: Gran tema
-          description: Recibió 25 "me gusta" en un tema. Este distintivo puede ser concedido varias veces
-        great_topic:
-          name: Excelente tema
-          description: Recibió 50 "me gusta" en un tema. Este distintivo puede ser concedido varias veces
-        nice_share:
-          name: Buena contribución
-          description: Compartió un post con 25 visitantes únicos
-        good_share:
-          name: Gran contribución
-          description: Compartió un post con 300 visitantes únicos
-        great_share:
-          name: Excelente contribución
-          description: Compartió un post con 1000 visitantes únicos
-        first_like:
-          name: Primer "me gusta"
-          description: Le dio a "me gusta" a un post
-        first_flag:
-          name: Primer reporte
-          description: Reportó un post
-        promoter:
-          name: Promotor
-          description: Invitó a un usuario
-        campaigner:
-          name: Partidiario
-          description: Invitó a 3 usuarios básicos (nivel de confianza 1)
-        champion:
-          name: Campeón
-          description: Invitó a 5 miembros (nivel de confianza 2)
-        first_share:
-          name: Primer Compartido
-          description: Compartió un post
-        first_link:
-          name: Primer Enlace
-          description: Añadió un enlace interno a otro tema
-        first_quote:
-          name: Primera Cita
-          description: Citó a un usuario
-        read_guidelines:
-          name: Directrices leídas
-          description: Leyó las <a href="/guidelines">directrices de la comunidad</a>
-        reader:
-          name: Lector
-          description: Leyó todos los posts en un tema con más de 100
-        popular_link:
-          name: Enlace Popular
-          description: Publicó un enlace externo con al menos 50 clicks
-        hot_link:
-          name: Enlace popular
-          description: Publicó un enlace externo con al menos 300 clicks
-        famous_link:
-          name: Enlace Famoso
-          description: Publicó un enlace externo con al menos 1000 clicks
     google_search: |
       <h3>Buscar con Google</h3>
       <p>
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 3f4ea08d51..d88193c39c 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -420,7 +420,6 @@ fa_IR:
       muted_users: "بی صدا شده"
       muted_users_instructions: "متفوقف کردن تمام اطلاعیه ها از طرف این کاربران."
       muted_topics_link: "نمایش مباحث قطع شده"
-      automatically_unpin_topics: "از سنجاق خارج کردن خودکار مباحث وقتی که به پایین میرسید."
       staff_counters:
         flags_given: "پرچم گذاری های مفید"
         flagged_posts: "نوشته های پرچم گذاری شده"
@@ -830,7 +829,6 @@ fa_IR:
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -1401,7 +1399,6 @@ fa_IR:
           description: "شما هیچ وقت از مبحث های تازه در این دسته بندی ها مطلع نمیشوید, و آن ها در آخرین ها نمایش داده نمیشوند."
     flagging:
       title: 'تشکر برای کمک به نگه داشتن جامعه ما  بصورت مدنی !'
-      private_reminder: 'پرچم های خصوصی, <b>فقط</b> قابل مشاهده برای مدیران'
       action: 'پرچم‌گذاری نوشته'
       take_action: "اقدام"
       notify_action: 'پیام'
@@ -1413,7 +1410,6 @@ fa_IR:
       submit_tooltip: "ایجاد پرچم خصوصی"
       take_action_tooltip: "رسیدن سریع به آستانه پرچم، بلافاصله به جای انتظار برای پرچم انجمن"
       cant: "متأسفیم، در این زمان نمی‌توانید  روی این نوشته پرچم بگذارید."
-      notify_staff: 'مطلع کردن مدیران'
       formatted_name:
         off_topic: "آن موضوع قدیمی است"
         inappropriate: "این نامناسب است"
@@ -2410,8 +2406,6 @@ fa_IR:
         mark_watching: '<b>m</b>, <b>w</b> مشاهده موضوع'
     badges:
       title: مدال‌ها
-      allow_title: "می تواند برای یک عنوان استفاده شود"
-      multiple_grant: "می توان چندین بار اهدا کرد"
       badge_count:
         other: "%{count} مدال"
       more_badges:
@@ -2431,99 +2425,6 @@ fa_IR:
           name: دیگر
         posting:
           name: در حال نوشتن
-      badge:
-        editor:
-          name: ویرایشگر
-          description: نخستین ویرایش نوشته
-        basic_user:
-          name: اساسی
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">اعطا کردن</a> تمام عملکرد های ضروری برای انجمن
-        member:
-          name: عضو
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">اعطا کردن</a> دعوت نامه
-        regular:
-          name: منظم
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">a> دعوت نامه تغییر دسته بندی، تغییر نام دهید، به دنبال کردن لینک ها و سالن
-        leader:
-          name: رهبر
-          description: '<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">اعطا کردن</a>
-
-            ویرایش سراسری، پین، بستن، بایگانی، تقسیم و ادغام'
-        welcome:
-          name: خوش آمدید
-          description: ' یک پسند دریافت شد'
-        autobiographer:
-          name: نویسندهء شرح حال
-          description: فیلد کاربر <a href="/my/preferences">نمایه </a>اطلاعات
-        anniversary:
-          name: سالگرد
-          description: عضو فعال به مدت یک سال،ارسال شده حداقل یک بار
-        nice_post:
-          name: نوشته‌ی دلپذیر
-          description: دریافت 10 پسند در یک نوشته. این نشان را می توان چندین بار اعطا کرد
-        good_post:
-          name: نوشته‌ی خوب
-          description: دریافت 25 پسند در یک نوشته. این نشان را می توان چندین بار اعطا کرد
-        great_post:
-          name: نوشته‌ی عالی
-          description: دریافت 50 پسند در یک نوشته. این نشان را می توان چندین بار اعطا کرد
-        nice_topic:
-          name: موضوع دلپذیر
-          description: دریافت 10 پسند در یک موضوع. این نشان را می توان چندین بار اعطا کرد
-        good_topic:
-          name: موضوع خوب
-          description: دریافت 25 پسند در یک موضوع. این نشان را می توان چندین بار اعطا کرد
-        great_topic:
-          name: موضوع عالی
-          description: دریافت 50 پسند در یک موضوع. این نشان را می توان چندین بار اعطا کرد
-        nice_share:
-          name: ا‌شتراک‌گذاری خوب
-          description: اشتراک گذاری نوشته با 25 بازدید کننده منحصر به فرد
-        good_share:
-          name: اشتراک‌گذاری خوب
-          description: اشتراک گذاری نوشته با 300 بازدید کننده منحصر به فرد
-        great_share:
-          name: اشتراک‌گذاری عالی
-          description: اشتراک گذاری نوشته با 1000 بازدید کننده منحصر به فرد
-        first_like:
-          name: نخستین پسند
-          description: نوشته ای را پسندید
-        first_flag:
-          name: پرچم نخست
-          description: نوشته را پرچم زد
-        promoter:
-          name: ترویج دهنده
-          description: دعوت کننده یک کاربر
-        campaigner:
-          name: فعال
-          description: دعوت کننده سه کاربر معمولی (سطح اعتماد ۱)
-        champion:
-          name: قهرمان
-          description: دعوت کننده پنج کاربر عضو (سطح اعتماد ۲)
-        first_share:
-          name: نخستین اشتراک‌گذاری
-          description: نوشته ای به اشتراک گذاشته شده
-        first_link:
-          name: پیوند نخست
-          description: لینک های داخلی اضافه شده به دیگر موضوعات
-        first_quote:
-          name: نقل‌قول نخست
-          description: نقل قول یک کاربر
-        read_guidelines:
-          name: خواندن دستورالعمل ها
-          description: خواندن <a href="/guidelines">دستورالعمل های انجمن</a>
-        reader:
-          name: خواننده
-          description: مطالعه تمام نوشته‌هایی در یک  موضوع  که بیش از 100 نوشته دارد.
-        popular_link:
-          name: پیوند محبوب
-          description: پیوندی به بیرون با حداقل 50 کلیک ارسال شد
-        hot_link:
-          name: پیوند داغ
-          description: پیوندی به بیرون با حداقل 300 کلیک ارسال شد
-        famous_link:
-          name: پیوند معروف
-          description: پیوندی به بیرون با حداقل 1000 کلیک ارسال شد
     google_search: |
       <h3>جستجو با گوگل</h3>
 
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 539473d434..8a5c0ca68e 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -593,6 +593,7 @@ fi:
         every_three_days: "joka kolmas päivä"
         weekly: "viikottain"
         every_two_weeks: "joka toinen viikko"
+      include_tl0_in_digests: "Sisällytä uusien käyttäjien viestit sähköpostitiivistelmiin oletuksena."
       email_in_reply_to: "Liitä sähköpostiin lyhennelmä viestistä, johon vastataan"
       email_direct: "Lähetä minulle sähköposti, jos joku lainaa viestiäni, vastaa viestiini, viittaa @nimeeni, tai kutsuu minut viestiketjuun"
       email_private_messages: "Lähetä minulle sähköposti, kun joku lähettää minulle viestin"
@@ -724,7 +725,6 @@ fi:
     too_few_topics_and_posts_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics} / %{requiredTopics}</strong> ketjua ja <strong>%{currentPosts} / %{requiredPosts}</strong> viestiä. Uudet kävijät tarvitsevat keskusteluita, joita lukea ja joihin vastata."
     too_few_topics_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics} / %{requiredTopics}</strong> ketjua. Uudet kävijät tarvitsevat keskusteluita, joita lukea ja joihin vastata."
     too_few_posts_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentPosts} / %{requiredPosts}</strong> viestiä. Uudet kävijät tarvitsevat keskusteluita, joita lukea ja joihin vastata."
-    logs_error_rate_exceeded_notice: "%{timestamp}: Current rate of <a href='%{url}' target='_blank'>%{rate} errors/%{duration}</a> has exceeded site settings's limit of %{siteSettingLimit} errors/%{duration}."
     learn_more: "opi lisää..."
     year: 'vuosi'
     year_desc: 'viimeisen 365 päivän aikana luodut ketjut'
@@ -1358,6 +1358,7 @@ fi:
         about: "tämä viesti on wiki"
       archetypes:
         save: 'Tallennusasetukset'
+      few_likes_left: "Kiitos hyvän mielen levittämisestä! Sinulla on enää muutama tykkäys jäljellä tälle päivälle."
       controls:
         reply: "aloita vastaamaan tähän viestiin"
         like: "tykkää viestistä"
@@ -2481,6 +2482,7 @@ fi:
         badge: Arvomerkki
         display_name: Nimi
         description: Kuvaus
+        long_description: Pitkä kuvaus
         badge_type: Arvomerkin tyyppi
         badge_grouping: Ryhmä
         badge_groupings:
@@ -2643,10 +2645,11 @@ fi:
       earned_n_times:
         one: "Ansaitsi tämän arvomerkin yhden kerran"
         other: "Ansaitsi tämän arvomerkin %{count} kertaa"
-      more_with_badge: "Muita, joilla on tämä arvomerkki"
+      granted_on: "Myönnetty %{date}"
+      others_count: "Muita, joilla on tämä arvomerkki (%{count})"
       title: Arvomerkit
-      allow_title: "voidaan käyttää tittelinä"
-      multiple_grant: "voidaan myöntää useita kertoja"
+      allow_title: "sallittu titteli"
+      multiple_grant: "myönnettävissä useaan kertaan"
       badge_count:
         one: "1 Arvomerkki"
         other: "%{count} Arvomerkkiä"
@@ -2669,97 +2672,6 @@ fi:
           name: Muut
         posting:
           name: Kirjoittaminen
-      badge:
-        editor:
-          name: Muokkaaja
-          description: Ensimmäinen muokkaus
-        basic_user:
-          name: Haastaja
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Myönnetty</a> oikeudet tärkeimpiin toimintoihin
-        member:
-          name: Konkari
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Myönnetty</a> oikeus kutsua käyttäjiä
-        regular:
-          name: Mestari
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Myönnetty</a> oikeus siirtää ja nimetä uudelleen ketjuja, linkkien seuraaminen ja Lounge
-        leader:
-          name: Johtaja
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Myönnetty</a> ketjujen globaali muokkaus, kiinnitys, sulkeminen, arkistointi, jakaminen ja yhdistäminen
-        welcome:
-          name: Tervetuloa
-          description: Sai tykkäyksen
-        autobiographer:
-          name: Muistelmien kirjoittaja
-          description: Täytti <a href="/my/preferences">käyttäjätiedot</a>
-        anniversary:
-          name: Vuosipäivä
-          description: Ollut vuoden aktiivinen jäsen, kirjoittanut vähintään kerran
-        nice_post:
-          name: Kiva viesti
-          description: Sai 10 tykkäystä viestistä. Tämä arvomerkki voidaan myöntää useita kertoja
-        good_post:
-          name: Hyvä viesti
-          description: Sai 25 tykkäystä viestistä. Tämä arvomerkki voidaan myöntää useita kertoja
-        great_post:
-          name: Mahtava viesti
-          description: Sai 50 tykkäystä viestistä. Tämä arvomerkki voidaan myöntää useita kertoja
-        nice_topic:
-          name: Kiva ketju
-          description: Sai 10 tykkäystä ketjusta. Tämä arvomerkki voidaan myöntää useita kertoja
-        good_topic:
-          name: Hyvä ketju
-          description: Sai 25 tykkäystä ketjusta. Tämä arvomerkki voidaan myöntää useita kertoja
-        great_topic:
-          name: Mahtava ketju
-          description: Sai 50 tykkäystä ketjusta. Tämä arvomerkki voidaan myöntää useita kertoja
-        nice_share:
-          name: Kiva jako
-          description: Jakoi viestin, joka sai 25 uniikkia kävijää
-        good_share:
-          name: Hyvä jako
-          description: Jakoi viestin, joka sai 300 uniikkia kävijää
-        great_share:
-          name: Mahtava jako
-          description: Jakoi viestin, joka sai 1000 uniikkia kävijää
-        first_like:
-          name: Ensimmäinen tykkäys
-          description: Tykkäsi viestistä
-        first_flag:
-          name: Ensimmäinen liputus
-          description: Liputti viestin
-        promoter:
-          name: Myöntäjä
-          description: Kutsui käyttäjän
-        campaigner:
-          name: Kampanjoija
-          description: Kutsui 3 haastajaa (luottamustaso 1)
-        champion:
-          name: Kampanjapäällikkö
-          description: Kutsui 5 konkaria (luottamustaso 2)
-        first_share:
-          name: Ensimmäinen jakaminen
-          description: Jakoi viestin
-        first_link:
-          name: Ensimmäinen linkki
-          description: Lisäsi viestiin linkin toiseen ketjuun
-        first_quote:
-          name: Ensimmäinen lainaus
-          description: Lainasi toista käyttäjää
-        read_guidelines:
-          name: Luki ohjeet
-          description: Luki sivuston <a href="/guidelines">ohjeet</a>
-        reader:
-          name: Lukija
-          description: Luki kaikki viestit ketjusta, jossa on yli 100 viestiä
-        popular_link:
-          name: Suosittu linkki
-          description: Laittoi linkin ulkoiselle sivustolle, joka sai vähintään 50 klikkausta.
-        hot_link:
-          name: Kuuma linkki
-          description: Laittoi linkin ulkoiselle sivustolle, joka sai vähintään 300 klikkausta.
-        famous_link:
-          name: Kuuluisa linkki
-          description: Laittoi linkin ulkoiselle sivustolle, joka sai vähintään 1000 klikkausta.
     google_search: |
       <h3>Etsi Googlella</h3>
       <p>
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 88151b34d4..fcf9d7c7f2 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -724,7 +724,6 @@ fr:
     too_few_topics_and_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Démarrons cette discussion!</a> Il y a actuellement <strong>%{currentTopics} / %{requiredTopics}</strong> sujets et <strong>%{currentPosts} / %{requiredPosts}</strong> messages. Les nouveaux visiteurs ont besoin de quelques conversations pour lire et répondre."
     too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Démarrons cette discussion !</a> Il y a actuellement <strong>%{currentTopics} / %{requiredTopics}</strong> sujets. Les nouveaux visiteurs ont besoin de quelques conversations à lire et répondre."
     too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Démarrons cette discussion !</a> Il y a actuellement <strong>%{currentPosts} / %{requiredPosts}</strong> messages. Les nouveaux visiteurs ont besoin de quelques conversations à lire et répondre."
-    logs_error_rate_exceeded_notice: "%{timestamp}: Le taux actuel de <a href='%{url}' target='_blank'>%{rate} erreurs/%{duration}</a> a dépassé la limite des paramètres du site de %{siteSettingLimit} erreurs/%{duration}."
     learn_more: "en savoir plus…"
     year: 'an'
     year_desc: 'sujets créés durant les 365 derniers jours'
@@ -2643,10 +2642,7 @@ fr:
       earned_n_times:
         one: "A reçu ce badge 1 fois"
         other: "A reçu ce badge %{count} fois"
-      more_with_badge: "Autres avec ce badge"
       title: Badges
-      allow_title: "peut être utilisé comme votre titre"
-      multiple_grant: "peut être décerné plusieurs fois"
       badge_count:
         one: "1 badge"
         other: "%{count} badges"
@@ -2669,97 +2665,6 @@ fr:
           name: Autre
         posting:
           name: Message
-      badge:
-        editor:
-          name: Editeur
-          description: A modifié un message pour la première fois
-        basic_user:
-          name: Actif
-          description: Toutes les fonctions communautaires essentielles sont accessibles
-        member:
-          name: Membre
-          description: Accorde les <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">invitations</a>.
-        regular:
-          name: Habitué
-          description: La re-catégorisation, le renommage, le suivi de lien et le salon sont accessibles
-        leader:
-          name: Meneur
-          description: L'édition, l'épinglage, la fermeture, l'archivage, la séparation et la fusion sont accessibles
-        welcome:
-          name: Bienvenue
-          description: A reçu un j'aime.
-        autobiographer:
-          name: Autobiographe
-          description: A rempli les informations de son <a href="/my/preferences">profil</a>
-        anniversary:
-          name: Jubilaire
-          description: Membres actif depuis un an, avec au moins un message
-        nice_post:
-          name: Joli message
-          description: A reçu 10 j'aime sur un message. Ce badge peut être décerné plusieurs fois
-        good_post:
-          name: Excellent message
-          description: A reçu 25 j'aime sur un message. Ce badge peut être décerné plusieurs fois
-        great_post:
-          name: Bon message
-          description: A reçu 50 j'aime sur un message. Ce badge peut être décerné plusieurs fois
-        nice_topic:
-          name: Sujet intéressant
-          description: A reçu 10 J'aime sur un sujet. Ce badge peut être décerné plusieurs fois
-        good_topic:
-          name: Bon sujet
-          description: A reçu 25 J'aime sur un sujet. Ce badge peut être décerné plusieurs fois
-        great_topic:
-          name: Super sujet
-          description: A reçu 50 J'aime sur un sujet. Ce badge peut être décerné plusieurs fois
-        nice_share:
-          name: Partage sympa
-          description: Message partagé avec 25 visiteurs uniques
-        good_share:
-          name: Bon partage
-          description: Message partagé avec 300 visiteurs uniques
-        great_share:
-          name: Super Partage
-          description: Message partagé avec 1000 visiteurs uniques
-        first_like:
-          name: Premier j'aime
-          description: A aimé un message
-        first_flag:
-          name: Premier signalement
-          description: A signalé un message
-        promoter:
-          name: Ambassadeur
-          description: A invité un utilisateur
-        campaigner:
-          name: Militant
-          description: A invité 3 utilisateurs basiques (Niveau de confiance 1)
-        champion:
-          name: Champion
-          description: A invité 5 membres (Niveau de confiance 2)
-        first_share:
-          name: Premier partage
-          description: A partagé un message
-        first_link:
-          name: Premier lien
-          description: A ajouté un lien interne vers un autre sujet
-        first_quote:
-          name: Première citation
-          description: A cité un utilisateur
-        read_guidelines:
-          name: Règlement lu
-          description: A lu le <a href="/guidelines">règlement de la communauté</a>
-        reader:
-          name: Lecteur
-          description: A lu tous les messages d'un sujet contenant plus de 100 messages
-        popular_link:
-          name: Lien populaire
-          description: A posté un lien externe avec au moins 50 clics
-        hot_link:
-          name: Lien tendance
-          description: A posté un lien externe avec au moins 300 clics
-        famous_link:
-          name: Lien célèbre
-          description: A posté un lien externe avec au moins 1000 clics
     google_search: |
       <h3>Rechercher avec Google</h3>
       <p>
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
new file mode 100644
index 0000000000..a294fe96a6
--- /dev/null
+++ b/config/locales/client.gl.yml
@@ -0,0 +1,2676 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl:
+  js:
+    number:
+      format:
+        separator: "."
+        delimiter: ","
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              one: Byte
+              other: Bytes
+            gb: GB
+            kb: KB
+            mb: MB
+            tb: TB
+      short:
+        thousands: "{{number}}k"
+        millions: "{{number}}M"
+    dates:
+      time: "h:mm a"
+      long_no_year: "D MMM h:mm a"
+      long_no_year_no_time: "D MMM"
+      full_no_year_no_time: "D MMMM"
+      long_with_year: "D MMM, YYYY h:mm a"
+      long_with_year_no_time: "D MMM, YYYY"
+      full_with_year_no_time: "D MMMM, YYYY"
+      long_date_with_year: "D MMM, 'YY LT"
+      long_date_without_year: "D MMM, LT"
+      long_date_with_year_without_time: "D MMM, 'YY"
+      long_date_without_year_with_linebreak: "D MMM <br/>LT"
+      long_date_with_year_with_linebreak: "D MMM, 'YY <br/>LT"
+      tiny:
+        half_a_minute: "< 1m"
+        less_than_x_seconds:
+          one: "< 1s"
+          other: "< %{count}s"
+        x_seconds:
+          one: "1s"
+          other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
+        x_minutes:
+          one: "1m"
+          other: "%{count}m"
+        about_x_hours:
+          one: "1h"
+          other: "%{count}h"
+        x_days:
+          one: "1d"
+          other: "%{count}d"
+        about_x_years:
+          one: "1ano"
+          other: "%{count}anos"
+        over_x_years:
+          one: "> 1ano"
+          other: "> %{count}anos"
+        almost_x_years:
+          one: "1ano"
+          other: "%{count}anos"
+        date_month: "D MMM"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          one: "1 min"
+          other: "%{count} mins"
+        x_hours:
+          one: "1 hora"
+          other: "%{count} horas"
+        x_days:
+          one: "1 día"
+          other: "%{count} días"
+        date_year: "D MMM, 'YY"
+      medium_with_ago:
+        x_minutes:
+          one: "Hai 1 min."
+          other: "Hai %{count} min."
+        x_hours:
+          one: "Hai 1 hora"
+          other: "Hai %{count} horas"
+        x_days:
+          one: "Hai 1 día"
+          other: "Hai %{count} días"
+      later:
+        x_days:
+          one: "1 día despois"
+          other: "%{count} días despois"
+        x_months:
+          one: "1 mes despois"
+          other: "%{count} meses despois"
+        x_years:
+          one: "1 anos despois"
+          other: "%{count} anos despois"
+      previous_month: 'Mes anterior'
+      next_month: 'Mes seguinte'
+    share:
+      topic: 'compartir unha ligazón a este tema'
+      post: 'publicación %{postNumber}'
+      close: 'pechar'
+      twitter: 'compartir esta ligazón no Twitter'
+      facebook: 'compartir esta ligazón no Facebook'
+      google+: 'compartir esta ligazón no Google+'
+      email: 'enviar esta ligazón nun correo electrónico'
+    action_codes:
+      split_topic: "este tema dividiuse o %{when}"
+      invited_user: "convidou a %{who} %{when}"
+      removed_user: "eliminou a %{who} %{when}"
+      autoclosed:
+        enabled: 'pechado o %{when}'
+        disabled: 'aberto o %{when}'
+      closed:
+        enabled: 'pechado o %{when}'
+        disabled: 'aberto o %{when}'
+      archived:
+        enabled: 'arquivado o %{when}'
+        disabled: 'desarquivado o %{when}'
+      pinned:
+        enabled: 'pegado o %{when}'
+        disabled: 'despegado o %{when}'
+      pinned_globally:
+        enabled: 'pegado globalmente o %{when}'
+        disabled: 'despegado o %{when}'
+      visible:
+        enabled: 'listado o %{when}'
+        disabled: 'retirado da lista o %{when}'
+    topic_admin_menu: "accións do administrador de temas"
+    emails_are_disabled: "Todos os correos electrónicos saíntes foron desactivados globalmente por un administrador. Non se enviará ningún tipo de notificación por correo electrónico."
+    s3:
+      regions:
+        us_east_1: "EE.UU. Leste (N. Virxinia)"
+        us_west_1: "EE.UU. Oeste (N. California)"
+        us_west_2: "EE.UU. Oeste (Oregón)"
+        us_gov_west_1: "AWS GovCloud (EE.UU)"
+        eu_west_1: "EU (Irlanda)"
+        eu_central_1: "EU (Frankfurt)"
+        ap_southeast_1: "Asia Pacífico (Singapur)"
+        ap_southeast_2: "Asia Pacífico (Sidney)"
+        ap_northeast_1: "Asia Pacífico (Tokio)"
+        ap_northeast_2: "Asia Pacífico (Seúl)"
+        sa_east_1: "América do Sur (São Paulo)"
+    edit: 'editar o título e a categoría deste tema'
+    not_implemented: "Sentímolo pero esta funcionalidade non se implementou aínda."
+    no_value: "Non"
+    yes_value: "Si"
+    generic_error: "Sentímolo pero produciuse un erro."
+    generic_error_with_reason: "Produciuse un erro: %{error}"
+    sign_up: "Crear unha conta"
+    log_in: "Iniciar sesión"
+    age: "Idade"
+    joined: "Inscrito"
+    admin_title: "Admin"
+    flags_title: "Denuncias"
+    show_more: "amosar máis"
+    show_help: "opcións"
+    links: "Ligazóns"
+    links_lowercase:
+      one: "ligazón"
+      other: "ligazóns"
+    faq: "FAQ"
+    guidelines: "Directrices"
+    privacy_policy: "Normas de confidencialidade"
+    privacy: "Confidencialidade"
+    terms_of_service: "Termos do servizo"
+    mobile_view: "Visualización móbil"
+    desktop_view: "Visualización en escritorio"
+    you: "Ti"
+    or: "ou"
+    now: "agora mesmiño"
+    read_more: 'ler máis'
+    more: "Máis"
+    less: "Menos"
+    never: "nunca"
+    every_30_minutes: "cada 30 minutos"
+    every_hour: "cada hora"
+    daily: "diariamente"
+    weekly: "semanalmente"
+    every_two_weeks: "cada dúas semanas"
+    every_three_days: "cada tres días"
+    max_of_count: "máx. de {{count}}"
+    alternation: "ou"
+    character_count:
+      one: "{{count}} carácter"
+      other: "{{count}} caracteres"
+    suggested_topics:
+      title: "Temas suxeridos"
+      pm_title: "Mensaxes suxeridas"
+    about:
+      simple_title: "Verbo de"
+      title: "Verbo de %{title}"
+      stats: "Estatísticas do sitio"
+      our_admins: "Administradores"
+      our_moderators: "Os moderadores"
+      stat:
+        all_time: "De sempre"
+        last_7_days: "Últimos 7 días"
+        last_30_days: "Últimos 30 días"
+      like_count: "Gústames"
+      topic_count: "Temas"
+      post_count: "Publicacións"
+      user_count: "Novos usuarios"
+      active_user_count: "Usuarios activos"
+      contact: "Contacta connosco"
+      contact_info: "No caso dunha incidencia crítica ou asunto urxente que afecte este sitio, contacta connosco en %{contact_info}."
+    bookmarked:
+      title: "Marcador"
+      clear_bookmarks: "Limpar marcadores"
+      help:
+        bookmark: "Preme para engadir aos marcadores a publicación inicial deste tema"
+        unbookmark: "Preme para retirar todos os marcadores deste tema"
+    bookmarks:
+      not_logged_in: "cómpre que teñas a sesión iniciada para engadir unha publicación aos marcadores"
+      created: "engadiches aos marcadores esta publicación"
+      not_bookmarked: "Acabas de ler esta publicación; preme para engadila aos  marcadores"
+      last_read: "esta é a última publicación lida por ti; preme para engadila aos marcadores"
+      remove: "Eliminar marcador"
+      confirm_clear: "Confirmas o borrado de todos os marcadores deste tema?"
+    topic_count_latest:
+      one: "{{count}} tema novo ou actualizado."
+      other: "{{count}} temas novos ou actualizados."
+    topic_count_unread:
+      one: "{{count}} tópico sen ler."
+      other: "{{count}} temas sen ler."
+    topic_count_new:
+      one: "{{count}} tópico novo"
+      other: "{{count}} temas novos"
+    click_to_show: "Preme para amosar."
+    preview: "previsualizar"
+    cancel: "cancelar"
+    save: "Gardar cambios"
+    saving: "Gardando...."
+    saved: "Gardado!"
+    upload: "Actualizar"
+    uploading: "Actualizando..."
+    uploading_filename: "Actualizando {{filename}}..."
+    uploaded: "Actualizado!"
+    enable: "Activar"
+    disable: "Desactivar"
+    undo: "Desfacer"
+    revert: "Reverter"
+    failed: "Fallou"
+    switch_to_anon: "Modo anónimo"
+    switch_from_anon: "Saír do Modo anónimo"
+    banner:
+      close: "Desbotar este báner."
+      edit: "Editar este báner »"
+    choose_topic:
+      none_found: "Non se atoparon temas."
+      title:
+        search: "Buscar un tema polo nome, URL ou ID:"
+        placeholder: "escribe o título do tema aquí"
+    queue:
+      topic: "Tema:"
+      approve: 'Aprobar'
+      reject: 'Rexeitar'
+      delete_user: 'Eliminar usuario'
+      title: "Cómpre aprobación"
+      none: "Non hai publicacións para revisar."
+      edit: "Editar"
+      cancel: "Cancelar"
+      view_pending: "ver as publicacións pendentes"
+      has_pending_posts:
+        one: "Este tema ten <b>{{count}}</b> publicación agardando aprobación"
+        other: "Este tema ten <b>{{count}}</b> publicacións agardando aprobación."
+      confirm: "Gardar os cambios"
+      delete_prompt: "Confirmas a eliminación de <b>%{username}</b>? Eliminaranse todas as súas publicacións e bloquearase o seu correo electrónico e enderezo IP."
+      approval:
+        title: "A publicación necesita aprobación"
+        description: "Recibimos a túa nova publicación pero cómpre que sexa aprobada por un moderador antes de aparecer. Ten paciencia."
+        pending_posts:
+          one: "Tes <strong>{{count}}</strong> publicación pendente."
+          other: "Tes <strong>{{count}}</strong> publicacións pendentes."
+        ok: "De acordo"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicou <a href='{{topicUrl}}'>o tema</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Ti</a> publicaches <a href='{{topicUrl}}'>o tema</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> respondeu a <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Ti</a> respondiches a <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> respondeu ao tema <a href='{{topicUrl}}'></a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Ti</a> respondiches ao tema <a href='{{topicUrl}}'></a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> citou a <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> citou a <a href='{{user2Url}}'>, vaia, a ti.</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Ti</a> citaches a <a href='{{user2Url}}'>{{another_user}}</a>"
+      posted_by_user: "Publicado por <a href='{{userUrl}}'>{{user}}</a>"
+      posted_by_you: "Publicado por <a href='{{userUrl}}'>ti</a>"
+      sent_by_user: "Enviado por <a href='{{userUrl}}'>{{user}}</a>"
+      sent_by_you: "Enviado por <a href='{{userUrl}}'>, vaia, ti mesmo.</a>"
+    directory:
+      filter_name: "filtrar por nome de usuario"
+      title: "Usuarios"
+      likes_given: "Dados"
+      likes_received: "Recibidos"
+      topics_entered: "Introducidos"
+      topics_entered_long: "Temas introducidos"
+      time_read: "Tempo de lectura"
+      topic_count: "Temas"
+      topic_count_long: "Temas creados"
+      post_count: "Respostas"
+      post_count_long: "Respostas publicadas"
+      no_results: "Non se atoparon resultados."
+      days_visited: "Visitas"
+      days_visited_long: "Días visitados"
+      posts_read: "Lidas"
+      posts_read_long: "Publicacións lidas"
+      total_rows:
+        one: "Un usuario"
+        other: "%{count} usuarios"
+    groups:
+      empty:
+        posts: "Non hai publicacións de membros deste grupo."
+        members: "Non hai ningún membro neste grupo."
+        mentions: "Non hai ningunha mención deste grupo."
+        messages: "Non hai ningunha mensaxe para este grupo."
+        topics: "Non hai temas por membros deste grupo."
+      add: "Engadir"
+      selector_placeholder: "Engadir membros"
+      owner: "propietario"
+      visible: "O grupo é visíbel para todos os usuarios."
+      title:
+        one: "grupo"
+        other: "grupos"
+      members: "Membros"
+      topics: "Temas"
+      posts: "Publicacións"
+      mentions: "Mencións"
+      messages: "Mensaxes"
+      alias_levels:
+        title: "Quen pode enviar mensaxes e @mención a este grupo?"
+        nobody: "Ninguén"
+        only_admins: "Só administradores"
+        mods_and_admins: "Só moderadores e administradores"
+        members_mods_and_admins: "Só membros do grupo, moderadores e administradores"
+        everyone: "Todos"
+      trust_levels:
+        title: "Nivel de confianza automático concedido aos membros cando son engadidos:"
+        none: "Ningún"
+      notifications:
+        watching:
+          title: "Ver"
+          description: "Notificaráseche cada publicación nova en cada mensaxe e amosarase o número de novas respostas."
+        tracking:
+          title: "Seguimento"
+          description: "Notificaráseche se alguén menciona o teu @nome ou che responde e tamén  aparecerá o número de novas respostas."
+        regular:
+          title: "Normal"
+          description: "Notificaráseche se alguén menciona o teu @nome ou che responde."
+        muted:
+          title: "Silenciado"
+          description: "Non recibirás notificacións de nada relacionado con novos temas neste grupo."
+    user_action_groups:
+      '1': "Gústames dados"
+      '2': "Gústames recibidos"
+      '3': "Marcadores"
+      '4': "Temas"
+      '5': "Respostas"
+      '6': "Respostas"
+      '7': "Mencións"
+      '9': "CItas"
+      '11': "Edicións"
+      '12': "Enviar elementos"
+      '13': "Caixa de entrada"
+      '14': "Pendente"
+    categories:
+      all: "todas as categorías"
+      all_subcategories: "todas"
+      no_subcategory: "ningunha"
+      category: "Categoría"
+      category_list: "Amosar a lista de categorías"
+      reorder:
+        title: "Reordenar as categorías"
+        title_long: "Reorganizar a lista de categorías"
+        fix_order: "Fixar as posicións"
+        fix_order_tooltip: "Non todas as categorías teñen un número de posición único, e iso pode causar resultados inesperados."
+        save: "Gardar orde"
+        apply_all: "Aplicar"
+        position: "Posición"
+      posts: "Publicacións"
+      topics: "Temas"
+      latest: "Últimos"
+      latest_by: "últimos de"
+      toggle_ordering: "trocar o control de ordenación"
+      subcategories: "Subcategorías"
+      topic_stats: "Número de temas novos."
+      topic_stat_sentence:
+        one: "%{count} tema novo nos últimos %{unit}."
+        other: "%{count} temas novos nos últimos %{unit}."
+      post_stats: "O número de publicacións novas."
+      post_stat_sentence:
+        one: "%{count} nova publicación no último %{unit}."
+        other: "%{count} novas publicacións nos últimos %{unit}."
+    ip_lookup:
+      title: Busca do enderezo IP
+      hostname: Nome do servidor
+      location: Localización
+      location_not_found: (descoñecido)
+      organisation: Organización
+      phone: Teléfono
+      other_accounts: "Outras contas co mesmo enderezo IP:"
+      delete_other_accounts: "Eliminar %{count}"
+      username: "nome do usuario"
+      trust_level: "NdeC"
+      read_time: "tempo de lectura"
+      topics_entered: "temas introducidos"
+      post_count: "# publicacións"
+      confirm_delete_other_accounts: "Confirma que quere eliminar estas contas?"
+    user_fields:
+      none: "(seleccione unha opción)"
+    user:
+      said: "{{username}}:"
+      profile: "Perfil"
+      mute: "Silenciar"
+      edit: "Editar preferencias"
+      download_archive: "Descargar as miñas publicacións"
+      new_private_message: "Nova mensaxe"
+      private_message: "Mensaxe"
+      private_messages: "Mensaxes"
+      activity_stream: "Actividade"
+      preferences: "Preferencias"
+      expand_profile: "Expandir"
+      bookmarks: "Marcadores"
+      bio: "Verbo de min"
+      invited_by: "Convidado por"
+      trust_level: "Nivel de confianza"
+      notifications: "Notificacións"
+      statistics: "Estatísticas"
+      desktop_notifications:
+        label: "Notificacións en escritorio"
+        not_supported: "Este navegador non admite notificacións. Desculpe."
+        perm_default: "Acender notificacións"
+        perm_denied_btn: "Permiso denegado"
+        perm_denied_expl: "Denegaches o permiso para notificacións no teu navegador. Modifica os axustes para recibir notificacións no teu navegador."
+        disable: "Desactivar as notificacións"
+        enable: "Activar as notificacións"
+        each_browser_note: "Nota: Tes que cambiar este axuste en cadanseu navegador que utilices."
+      dismiss_notifications: "Marcar todas como lidas"
+      dismiss_notifications_tooltip: "Marcar todas notificacións sen ler como lidas"
+      disable_jump_reply: "Non saltar á miña publicación despois de que responda"
+      dynamic_favicon: "Amosar o número de temas novos / actualizados na icona do navegador"
+      edit_history_public: "Permitirlles a outros usuarios ver as revisións das miñas publicacións"
+      external_links_in_new_tab: "Abrir todas as ligazóns externas nunha nova lapela"
+      enable_quoting: "Activar as comiñas de resposta para o texto realzado"
+      change: "cambiar"
+      moderator: "{{user}} é moderador"
+      admin: "{{user}} é administrador"
+      moderator_tooltip: "Este usuario é  un moderador"
+      admin_tooltip: "Este usuario é un administrador"
+      blocked_tooltip: "Este usuario está bloqueado"
+      suspended_notice: "Este usuario está suspendido até o {{date}}."
+      suspended_reason: "Razón:"
+      github_profile: "Github"
+      mailing_list_mode: "Enviar un correo por cada nova publicación (a non ser que eu silencie o tema ou categoría)"
+      watched_categories: "Visto"
+      watched_categories_instructions: "Mirarás automaticamente todos os temas novos nestas categorías. Notificaránseche todas as novas publicacións e temas, e o número de novas publicacións aparecerá tamén preto do tema."
+      tracked_categories: "Seguido"
+      tracked_categories_instructions: "Seguirás automaticamente todos os temas novos nestas categorías. Un número de novas publicacións aparecerá preto do tema."
+      muted_categories: "Silenciado"
+      muted_categories_instructions: "Non se che notificará nada sobre os temas novos nestas categorías e non aparecerán na lista de últimos."
+      delete_account: "Eliminar a miña conta"
+      delete_account_confirm: "Confirmas que queres eliminar definitivamente a túa conta? Esta acción non se pode desfacer!"
+      deleted_yourself: "A túa conta acaba de ser eliminada completamente."
+      delete_yourself_not_allowed: "Non podes eliminar a túa conta neste intre. Contacta cun administrador para que este a elimine por ti. "
+      unread_message_count: "Mensaxes"
+      admin_delete: "Eliminar"
+      users: "Usuarios"
+      muted_users: "Silenciado"
+      muted_users_instructions: "Suprimir todas as notificacións destes usuarios."
+      muted_topics_link: "Amosar os temas silenciados"
+      automatically_unpin_topics: "Despegar os temas automaticamente cando eu chegue á banda inferior."
+      staff_counters:
+        flags_given: "denuncias útiles"
+        flagged_posts: "publicacións denunciadas"
+        deleted_posts: "publicacións eliminadas"
+        suspensions: "suspensións"
+        warnings_received: "advertencias"
+      messages:
+        all: "Todas"
+        inbox: "Caixa de entrada"
+        sent: "Enviados"
+        archive: "Arquivo"
+        groups: "Os meus grupos"
+        bulk_select: "Seleccionar mensaxes"
+        move_to_inbox: "Mover á caixa de entrada"
+        move_to_archive: "Arquivo"
+        failed_to_move: "Produciuse un fallo ao mover as mensaxes seleccionadas (quizais a rede está caída)"
+        select_all: "Seleccionar todo"
+      change_password:
+        success: "(correo enviado)"
+        in_progress: "(enviando o correo)"
+        error: "(erro)"
+        action: "Enviar correo para restabelecer o contrasinal"
+        set_password: "Estabelecer o contrasinal"
+      change_about:
+        title: "Cambiar «Verbo de min»"
+        error: "Produciuse un erro ao cambiar este valor."
+      change_username:
+        title: "Cambiar o nome do usuario"
+        confirm: "Se cambias o nome de usuario, todas as citas anteriores das túas publicacións e as mencións ao teu @nome romperanse. Estás totalmente seguro?"
+        taken: "Sentímolo pero este nome xa está en uso."
+        error: "Produciuse un erro cambiando o teu nome de usuario."
+        invalid: "Este usuario é incorrecto. Só pode contar números e letras."
+      change_email:
+        title: "Cambiar o correo electrónico"
+        taken: "Sentímolo pero este correo non está dispoñíbel."
+        error: "Produciuse un erro cambiando o correo electrónico. Quizais ese enderezo xa está en uso."
+        success: "Enviamos un correo electrónico a ese enderezo. Sigue as instrucións de confirmación."
+      change_avatar:
+        title: "Cambia a foto do perfil"
+        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado en"
+        gravatar_title: "Cambia o avatar no sitio web de Gravatar"
+        refresh_gravatar_title: "Actualiza o teu Gravatar"
+        letter_based: "Imaxe do perfil asignada polo sistema"
+        uploaded_avatar: "Imaxe personalizada"
+        uploaded_avatar_empty: "Engadir unha imaxe personalizada"
+        upload_title: "Envía a túa imaxe"
+        upload_picture: "Enviar imaxe"
+        image_is_not_a_square: "Aviso: recortamos a túa imaxe; a largura e a altura eran distintas."
+        cache_notice: "Cambiaches correctamente a túa imaxe do perfil pero quizais tarde un chisco en aparecer debido á xestión da caché do navegador."
+      change_profile_background:
+        title: "Fondo do perfil"
+        instructions: "Os fondos dos perfís centraranse e terán unha largura predeterminada de 850px."
+      change_card_background:
+        title: "Fondo das fichas dos usuarios"
+        instructions: "As imaxes dos fondos centraranse e terán unha largura predeterminada de 590px."
+      email:
+        title: "Correo electrónico"
+        instructions: "Non se verá nunca en público"
+        ok: "Enviarémosche un correo electrónico para confirmar"
+        invalid: "Introduce un enderezo de correo electrónico correcto"
+        authenticated: "O teu enderezo de correo electrónico foi autenticado por {{provider}}"
+        frequency_immediately: "Enviarémosche un correo-e axiña se non liches sobre o que che estamos a enviar."
+        frequency:
+          one: "Só che eviaremos un correo-e se non te vimos no último minuto."
+          other: "Só che eviaremos un correo-e se non te vimos nos últimos {{count}} minutos."
+      name:
+        title: "Nome"
+        instructions: "Nome completo (opcional)"
+        instructions_required: "Nome completo"
+        too_short: "O nome é curto de mais"
+        ok: "O nome parece correcto"
+      username:
+        title: "Nome do usuario"
+        instructions: "Único, sen espazos, curto"
+        short_instructions: "A xente pode mencionarte como @{{username}}"
+        available: "O nome de usuario está dispoñíbel"
+        global_match: "O correo electrónico correspóndese co nome do usuario rexistrado"
+        global_mismatch: "Xa rexistrado. Tentar {{suggestion}}?"
+        not_available: "Non dispoñíbel. Tentar {{suggestion}}?"
+        too_short: "O nome do usuario é curto de máis"
+        too_long: "O nome do usuario é longo de máis"
+        checking: "Comprobando a dispoñibilidade do nome do usuario..."
+        enter_email: 'Atopouse o nome do usuario; introduce o correo electrónico'
+        prefilled: "O correo electrónico coincide co nome do usuario rexistrado"
+      locale:
+        title: "Idioma da interface"
+        instructions: "Idioma da interface do usuario. Cambiará cando actualices a páxina."
+        default: "(predeterminado)"
+      password_confirmation:
+        title: "O contrasinal outra vez"
+      last_posted: "Última publicación"
+      last_emailed: "Últimos envíos por correo-e"
+      last_seen: "Visto"
+      created: "Inscrito"
+      log_out: "Saír da sesión"
+      location: "Localización"
+      card_badge:
+        title: "Insignia na ficha do usuario"
+      website: "Sitio web"
+      email_settings: "Correo electrónico"
+      like_notification_frequency:
+        title: "Notificar cando reciba gústames"
+        always: "Sempre"
+        first_time_and_daily: "A primeira vez que unha publicación reciba un gústame e diariamente"
+        first_time: "A primeira vez que unha publicación lle gusta a alguén"
+        never: "Nunca"
+      email_previous_replies:
+        title: "Incluír as respostas previas no final dos correos electrónicos"
+        unless_emailed: "excepto os enviados anteriormente"
+        always: "sempre"
+        never: "nunca"
+      email_digests:
+        title: "Cando non veña por aquí, enviarme un compendio das novidade por correo-e:"
+        every_30_minutes: "cada 30 minutos"
+        every_hour: "cada hora"
+        daily: "diariamente"
+        every_three_days: "cada tres días"
+        weekly: "semanalmente"
+        every_two_weeks: "cada dúas semanas"
+      email_in_reply_to: "Incluír nos correos un extracto das respostas á publicación"
+      email_direct: "Enviarme un correo electrónico cando alguén me cite, responda a unha das miñas publicacións, mencione o meu @nome_do_usuario ou me convide a un tema."
+      email_private_messages: "Enviar correo electrónico cando alguén me mande unha mensaxe"
+      email_always: "Enviádeme notificación por correo-e incluso cando estea activo no sitio"
+      other_settings: "Outro"
+      categories_settings: "Categorías"
+      new_topic_duration:
+        label: "Considerar novos temas cando"
+        not_viewed: "Aínda non os vin"
+        last_here: "creados desde a última vez que estiven aquí"
+        after_1_day: "creados no último día"
+        after_2_days: "creados nos últimos 2 días"
+        after_1_week: "creados na última semana"
+        after_2_weeks: "creados nas última 2 semanas"
+      auto_track_topics: "Facer seguimento automático dos temas nos que entro"
+      auto_track_options:
+        never: "nunca"
+        immediately: "inmediatamente"
+        after_30_seconds: "despois de 30 segundos "
+        after_1_minute: "despois de 1 minuto"
+        after_2_minutes: "despois de 2 minutos"
+        after_3_minutes: "despois de 3 minutos"
+        after_4_minutes: "despois de 4  minutos"
+        after_5_minutes: "despois de 5 minutos"
+        after_10_minutes: "despois de 10 minutos"
+      invited:
+        search: "escribir para buscar convites..."
+        title: "Convites"
+        user: "Usuario convidado"
+        sent: "Enviado"
+        none: "Non hai convites pendentes de ver."
+        truncated:
+          one: "Amosando o primeiro convite."
+          other: "Amosando os primeiros {{count}} convites."
+        redeemed: "Convites utilizados"
+        redeemed_tab: "Utilizados"
+        redeemed_tab_with_count: "Utilizados ({{count}})"
+        redeemed_at: "Utilizados"
+        pending: "Convites pendentes"
+        pending_tab: "Pendente"
+        pending_tab_with_count: "Pendentes ({{count}})"
+        topics_entered: "Temas vistos"
+        posts_read_count: "Publicacións lidas"
+        expired: "Este convite caducou."
+        rescind: "Eliminar"
+        rescinded: "Convite eliminado"
+        reinvite: "Reenviar convite"
+        reinvited: "Convite reenviado"
+        time_read: "Tempo de lectura"
+        days_visited: "Días visitado"
+        account_age_days: "Tempo da conta en días"
+        create: "Enviar un convite"
+        generate_link: "Copiar a ligazón do convite"
+        generated_link_message: '<p>A ligazón do convite xerouse correctamente.</p><p><input class="invite-link-input" style="width: 75%;" type="text" value="%{inviteLink}"></p><p>A ligazón do convite só é válida para este enderezo de correo-e: <b>%{invitedEmail}</b></p>'
+        bulk_invite:
+          none: "Aínda non convidaches a ninguén. Podes enviar convites individuais ou en grupo se <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>subes un ficheiro para convites múltiples</a>."
+          text: "Convidar en grupo desde un ficheiro"
+          uploading: "Enviando..."
+          success: "O ficheiro enviouse correctamente, notificaráseche por mensaxe cando remate o proceso."
+          error: "Produciuse un erro ao subir «{{filename}}»: {{message}}"
+      password:
+        title: "Contrasinal"
+        too_short: "O teu contrasinal é demasiado curto."
+        common: "O contrasinal é demasiado habitual."
+        same_as_username: "O contrasinal é igual ao nome do usuario."
+        same_as_email: "O contrasinal é igual ao correo electrónico."
+        ok: "O contrasinal semella bo."
+        instructions: "Como mínimo %{count} caracteres."
+      summary:
+        title: "Resumo"
+        stats: "Estatísticas"
+        topic_count: "Temas creados"
+        post_count: "Publicacións creadas"
+        likes_given: "Gústames dados"
+        likes_received: "Gústames recibidos"
+        days_visited: "Días visitado"
+        posts_read_count: "Publicacións lidas"
+        top_replies: "Respostas destacadas"
+        top_topics: "Temas destacados"
+        top_badges: "Insignias principais"
+        more_topics: "Máis temas"
+        more_replies: "Máis respostas"
+        more_badges: "Máis insignias"
+      associated_accounts: "Accesos"
+      ip_address:
+        title: "Último enderezo IP"
+      registration_ip_address:
+        title: "Rexistro de enderezos IP"
+      avatar:
+        title: "Imaxe do perfil"
+        header_title: "perfil, mensaxes, marcadores e preferencias"
+      title:
+        title: "Título"
+      filters:
+        all: "Todas"
+      stream:
+        posted_by: "Publicado por"
+        sent_by: "Enviado por"
+        private_message: "mensaxe"
+        the_topic: "o tema"
+    loading: "Cargando..."
+    errors:
+      prev_page: "ao tentar cargar"
+      reasons:
+        network: "Erro de rede"
+        server: "Erro do servidor"
+        forbidden: "Acceso denegado"
+        unknown: "Erro"
+        not_found: "Páxina non atopada"
+      desc:
+        network: "Por favor, comproba a conexión."
+        network_fixed: "Parece que xa estamos de volta."
+        server: "Código do erro: {{status}}"
+        forbidden: "Non tes permiso para ver isto"
+        not_found: "Vaites, o aplicativo tentou cargar unha URL inexistente."
+        unknown: "Algo foi mal."
+      buttons:
+        back: "Volver"
+        again: "Tentar de novo"
+        fixed: "Cargar páxina"
+    close: "Pechar"
+    assets_changed_confirm: "Este sitio acaba de actualizarse. Queres recargar a páxina para ter a última versión?"
+    logout: "Fuches desconectado."
+    refresh: "Actualizar"
+    read_only_mode:
+      enabled: "Este sitio está en modo só-lectura. Continúe navegando pero responder, gustar e outras accións estarán desactivadas polo de agora."
+      login_disabled: "Cando o sitio está no modo de só-lectura, desactívase o inicio de sesión."
+      logout_disabled: "O peche de sesión desactívase mentres o sitio está en modo de só lectura."
+    too_few_topics_and_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Comecemos a discusión!</a> Hai actualmente <strong>%{currentTopics} / %{requiredTopics}</strong> temas e <strong>%{currentPosts} / %{requiredPosts}</strong> publicacións. Os novos visitantes precisan algunhas conversas par ler e participar."
+    too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Comecemos a discusión!</a> Hai actualmente <strong>%{currentTopics} / %{requiredTopics}</strong> temas. Os novos visitantes precisan algunhas conversas par ler e participar."
+    too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Comecemos a discusión!</a> Hai actualmente <strong>%{currentPosts} / %{requiredPosts}</strong> publicacións. Os novos visitantes precisan algunhas conversas par ler e participar."
+    learn_more: "saber máis..."
+    year: 'ano'
+    year_desc: 'temas creados nos últimos 365 días'
+    month: 'mes'
+    month_desc: 'temas creados nos últimos 30 días'
+    week: 'semana'
+    week_desc: 'temas creados nos últimos 7 días'
+    day: 'día'
+    first_post: Publicación inicial
+    mute: Silenciar
+    unmute: Non silenciar
+    last_post: Última publicación
+    last_reply_lowercase: última resposta
+    replies_lowercase:
+      one: resposta
+      other: respostas
+    signup_cta:
+      sign_up: "Rexistrarse"
+      hide_session: "Lembrarmo mañá"
+      hide_forever: "non grazas"
+      hidden_for_session: "De acordo, preguntareicho mañá. Tamén podes usar «Iniciar sesión» para crear unha conta."
+      intro: "Ei! :heart_eyes: Semella que gozas coa discusión pero non abriches ningunha conta."
+      value_prop: "Cando creas unha conta, lembramos exactamente o que liches. Deste xeito sempre volves exactamente onde o deixaches. Podes recibir notificación aquí e vía correo electrónico sempre que se fagan publicacións. E podes darlle a Gústame nas publicacións para compartir o cariño. :heartbeat: "
+    summary:
+      enabled_description: "Estás vendo un resumo deste tema: as publicacións máis interesantes determinadas pola comunidade"
+      description: "Hai <b>{{replyCount}}</b> respostas."
+      description_time: "Hai <b>{{replyCount}}</b> respostas cun tempo estimado de lectura de <b>{{readingTime}} minutos</b>."
+      enable: 'Resumir este tema'
+      disable: 'Amosar todas as publicacións'
+    deleted_filter:
+      enabled_description: "Este tema contén publicacións eliminadas, que se ocultaron."
+      disabled_description: "Móstranse as publicacións eliminadas do tema."
+      enable: "Ocultar publicacións eliminadas"
+      disable: "Amosar as publicacións eliminadas"
+    private_message_info:
+      title: "Mensaxe"
+      invite: "Convidar a outros..."
+      remove_allowed_user: "Confirmas a eliminación de {{name}} desta mensaxe?"
+    email: 'Correo electrónico'
+    username: 'Nome do usuario'
+    last_seen: 'Visto'
+    created: 'Creado'
+    created_lowercase: 'creado'
+    trust_level: 'Nivel de confianza'
+    search_hint: 'nome do usuario, correo-e ou enderezo IP'
+    create_account:
+      title: "Crear unha conta nova"
+      failed: "Algo foi mal, quizais este correo electrónico xa está rexistrado, tenta coa ligazón de «Esquecín o contrasinal»."
+    forgot_password:
+      title: "Contrasinal restabelecido"
+      action: "Esquecín o contrasinal"
+      invite: "Introduce o nome do usuario ou correo electrónico, e enviaráseche un correo para restabelecer o contrasinal"
+      reset: "Restabelecer contrasinal"
+      complete_username: "Se unha conta corresponde ao nome de usuario <b>%{username}</b>, deberas recibir en breve un correo-e coas instrucións sobre como restabelecer o teu contrasinal."
+      complete_email: "Se unha conta coincide con <b>%{email}</b>, deberías recibir en breve un correo-e con instrucións sobre como restabelecer o teu contrasinal."
+      complete_username_found: "Atopamos unha conta co mesmo nome de usuario <b>%{username}</b>, deberas recibir en breve un correo-e coas instrucións sobre como restabelecer o teu contrasinal."
+      complete_email_found: "Atopamos unha conta que coincide con <b>%{email}</b>, deberas recibir en breve unha mensaxe coas instrucións sobre como restabelecer o contrasinal."
+      complete_username_not_found: "Ningunha conta coincide co nome do usuario <b>%{username}</b>"
+      complete_email_not_found: "Ningunha conta coincide co <b>%{email}</b>"
+    login:
+      title: "Iniciar sesión"
+      username: "Usuario"
+      password: "Contrasinal"
+      email_placeholder: "correo electrónico ou nome de usuario"
+      caps_lock_warning: " Bloqueo de maiúsculas activado"
+      error: "Erro descoñecido"
+      rate_limit: "Por favor, agarda antes de tentalo outra vez."
+      blank_username_or_password: "Introduce o teu correo electrónico ou nome de usuario e o contrasinal."
+      reset_password: 'Restabelecer contrasinal'
+      logging_in: "Iniciando sesión..."
+      or: "ou"
+      authenticating: "Autenticando..."
+      awaiting_confirmation: "A túa conta está pendente de se activar, emprega a ligazón de contrasinal esquecido para emitir outro correo de activación."
+      awaiting_approval: "A túa conta non foi aínda aprobada polos membros do equipo. Enviaráseche unha mensaxe cando así for."
+      requires_invite: "Sentímolo pero o acceso a este foro é unicamente por convite."
+      not_activated: "Non podes acceder aínda. Antes debemos enviarche unha mensaxe a <b>{{sentTo}}</b>. Por favor, sigue as instrucións desta mensaxe para activar a túa conta."
+      not_allowed_from_ip_address: "Non podes acceder desde este enderezo IP."
+      admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
+      resend_activation_email: "Preme aquí para enviar outro correo de activación."
+      sent_activation_email_again: "Enviamos outro correo-e de activación a <b>{{currentEmail}}</b>. Pode tardar uns minutos en chegar; asegúrate de revisar o cartafol do spam."
+      to_continue: "Por favor, inicia sesión"
+      preferences: "Precisas iniciar sesión para cambiar as túas preferencias de usuario."
+      forgot: "Non lembro os detalles da miña conta"
+      google:
+        title: "co Google"
+        message: "Autenticación mediante Google (asegúrate de ter desactivado o bloqueador de xanelas emerxentes)"
+      google_oauth2:
+        title: "co Google"
+        message: "Autenticación mediante Google (asegúrate de ter desactivado o bloqueador de xanelas emerxentes)"
+      twitter:
+        title: "co Twitter"
+        message: "Autenticación mediante Twitter (asegúrate de ter desactivado o bloqueador de xanelas emerxentes)"
+      instagram:
+        title: "con Instagram"
+        message: "Autenticación con Instagram (asegúrate que os bloqueadores de publicidade estean desactivados)"
+      facebook:
+        title: "co Facebook"
+        message: "Autenticación mediante Facebook (asegúrate de ter desactivado o bloqueador de xanelas emerxentes)"
+      yahoo:
+        title: "co Yahoo"
+        message: "Autenticación mediante Yahoo (asegúrate de ter desactivado o bloqueador de xanelas emerxentes)"
+      github:
+        title: "co GitHub"
+        message: "Autenticación mediante Github (asegúrate de ter desactivado o bloqueador de xanelas emerxentes)"
+    apple_international: "Apple/Internacional"
+    google: "Google"
+    twitter: "Twitter"
+    emoji_one: "Emoji One"
+    shortcut_modifier_key:
+      shift: 'Maiús.'
+      ctrl: 'Ctrl'
+      alt: 'Alt'
+    composer:
+      emoji: "Emoji :)"
+      more_emoji: "máis..."
+      options: "Opcións"
+      whisper: "bisbar"
+      add_warning: "Este é un aviso oficial."
+      toggle_whisper: "Cambiar Bisbar"
+      posting_not_on_topic: "A que tema queres responder?"
+      saving_draft_tip: "gardando..."
+      saved_draft_tip: "gardado"
+      saved_local_draft_tip: "gardado localmente"
+      similar_topics: "O teu tema é semellante a..."
+      drafts_offline: "borradores sen conexión"
+      group_mentioned: "Usando {{group}}, vas enviar a notificación a <a href='{{group_link}}'>{{count}} persoas</a>."
+      error:
+        title_missing: "O título é obrigatorio"
+        title_too_short: "O título debe ter alomenos {{min}} caracteres"
+        title_too_long: "O título non debe ter máis de {{max}} caracteres"
+        post_missing: "A publicación non pode estar baleira"
+        post_length: "A publicación debe ter alomenos {{min}} caracteres"
+        try_like: 'Probaches o botón <i class="fa fa-heart"></i>?'
+        category_missing: "Debes seleccionar unha categoría"
+      save_edit: "Gardar a edición"
+      reply_original: "Responder no tema orixinal"
+      reply_here: "Responder aquí"
+      reply: "Responder"
+      cancel: "Cancelar"
+      create_topic: "Crear tema"
+      create_pm: "Mensaxe"
+      title: "Ou preme Ctrl+Intro"
+      users_placeholder: "Engadir un usuario"
+      title_placeholder: "Sobre que trata a discusión nunha soa frase?"
+      edit_reason_placeholder: "por que estás editando?"
+      show_edit_reason: "(engadir unha razón para editar)"
+      reply_placeholder: "Escribe aquí. Usa Markdown, BBCode ou HTML para formatar. Arrastra ou pega imaxes."
+      view_new_post: "Ver a nova publicación."
+      saving: "Gardando"
+      saved: "Gardado!"
+      saved_draft: "A publicación do borrador está en proceso. Selecciona continuar."
+      uploading: "Enviando..."
+      show_preview: 'amosar visualización &raquo;'
+      hide_preview: '&laquo; ocultar previsualización'
+      quote_post_title: "Citar a publicación enteira"
+      bold_title: "Grosa"
+      bold_text: "Texto groso"
+      italic_title: "Resalte"
+      italic_text: "texto resaltado"
+      link_title: "Hiperligazón"
+      link_description: "introducir a descrición da ligazón aquí"
+      link_dialog_title: "Inserir hiperligazón"
+      link_optional_text: "título opcional"
+      link_placeholder: "http://exemplo.com \"texto opcional\""
+      quote_title: "Citación"
+      quote_text: "Citación"
+      code_title: "Texto preformatado"
+      code_text: "Texto preformatado cun sangrado de 4 espazos"
+      upload_title: "Enviar"
+      upload_description: "introducir a descrición do envío aquí"
+      olist_title: "Lista numerada"
+      ulist_title: "Lista con símbolos"
+      list_item: "Elemento da lista"
+      heading_title: "Cabeceira"
+      heading_text: "Cabeceira"
+      hr_title: "Regra horizontal"
+      help: "Axuda para edición con Markdown"
+      toggler: "agochar ou amosar o panel de composición"
+      modal_ok: "De acordo"
+      modal_cancel: "Cancelar"
+      cant_send_pm: "Sentímolo pero non podes enviar unha mensaxe a %{username}."
+      admin_options_title: "Axustes do equipo para este tema"
+      auto_close:
+        label: "Tempo para o peche automático deste tema:"
+        error: "Introduce un valor correcto."
+        based_on_last_post: "Non pechar até que a última publicación do tema teña alomenos este tempo."
+        all:
+          examples: 'Introducir o número de horas (24), hora absoluta (17:30) ou a marca data/hora (2013-11-22 14:00).'
+        limited:
+          units: "(# de horas)"
+          examples: 'Introducir o número de horas (24).'
+    notifications:
+      title: "notificacións das mencións ao teu @nome, respostas ás túas publicacións e temas, mensaxes, etc"
+      none: "Non é posíbel cargar as notificacións neste intre"
+      more: "ver notifiacións anteriores"
+      total_flagged: "total de publicacións denunciadas"
+      mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
+      group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
+      quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
+      replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      posted: "<i title='posted' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked_2: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
+      liked_many:
+        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} and 1 máis</span> {{description}}</p>"
+        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} e {{count}} máis</span> {{description}}</p>"
+      private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
+      invited_to_private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
+      invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
+      invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> aceptou o teu convite</p>"
+      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moveu {{description}}</p>"
+      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
+      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Obtiveches «{{description}}»</p>"
+      group_message_summary:
+        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensaxe na caixa do correo de {{group_name}} </p>"
+        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensaxes na caixa do correo de {{group_name}} </p>"
+      alt:
+        mentioned: "Mencionado por"
+        quoted: "Citado por"
+        replied: "Respondido"
+        posted: "Publicado por"
+        edited: "A túa publicación ediotuna"
+        liked: "Gustoulles a túa publicación"
+        private_message: "Mensaxe privada de"
+        invited_to_private_message: "Convidado a unha mensaxe privada de"
+        invited_to_topic: "Convidado a un tema de"
+        invitee_accepted: "Convite aceptado por"
+        moved_post: "A túa publicación foi movida por"
+        linked: "Ligazón á túa publicación"
+        granted_badge: "Insignias concedidas"
+        group_message_summary: "Mensaxes na caixa do grupo"
+      popup:
+        mentioned: '{{username}} mencionoute en "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} mencionoute en "{{topic}}" - {{site_title}}'
+        quoted: '{{username}} citoute en "{{topic}}" - {{site_title}}'
+        replied: '{{username}} respondeute en "{{topic}}" - {{site_title}}'
+        posted: '{{username}} publicou en "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} enviouche unha mensaxe privada en "{{topic}}" - {{site_title}}'
+        linked: '{{username}} ligou a túa publicación desde "{{topic}}" - {{site_title}}'
+    upload_selector:
+      title: "Engadir unha imaxe"
+      title_with_attachments: "Engadir imaxe ou ficheiro"
+      from_my_computer: "Desde o meu dispositivo"
+      from_the_web: "Desde a web"
+      remote_tip: "ligazón á imaxe"
+      remote_tip_with_attachments: "ligazón á imaxe ou ficheiro {{authorized_extensions}}"
+      local_tip: "seleccionar imaxes do teu dispositivo"
+      local_tip_with_attachments: "selecciona imaxes ou ficheiros do teu dispositivo {{authorized_extensions}}"
+      hint: "(tamén podes arrastrar e soltar no editor para envialos)"
+      hint_for_supported_browsers: "tamén podes arrastrar e soltar ou pegar imaxes no editor"
+      uploading: "Enviando"
+      select_file: "Seleccionar ficheiro"
+      image_link: "ligazón onde levará a túa imaxe"
+    search:
+      sort_by: "Ordenar por"
+      relevance: "Relevancia"
+      latest_post: "Últimas publicacións"
+      most_viewed: "Máis vistos"
+      most_liked: "Con máis Gústames"
+      select_all: "Seleccionar todo"
+      clear_all: "Borrar todo"
+      result_count:
+        one: "Un resultado para <span class='term'>\"{{term}}\"</span>"
+        other: "{{count}} resultados para <span class='term'>\"{{term}}\"</span>"
+      title: "buscar temas, publicacións, usuarios ou categorías"
+      no_results: "Non se atoparon resultados."
+      no_more_results: "Non se atoparon máis resultados."
+      search_help: Buscar axuda
+      searching: "Buscando..."
+      post_format: "#{{post_number}} de {{username}}"
+      context:
+        user: "Buscar publicacións de @{{username}}"
+        category: "Buscar na categoría \"{{category}}\""
+        topic: "Buscar neste tema"
+        private_messages: "Buscar mensaxes"
+    hamburger_menu: "ir a outra lista de temas ou categoría"
+    new_item: "novo"
+    go_back: 'volver'
+    not_logged_in_user: 'páxina do usuario cun resumo das actividades e preferencias actuais'
+    current_user: 'ir á túa páxina do usuario'
+    topics:
+      bulk:
+        unlist_topics: "Retirar temas da lista"
+        reset_read: "Restabelecer Lidos"
+        delete: "Eliminar temas"
+        dismiss: "Desbotar"
+        dismiss_read: "Desbotar os non lidos"
+        dismiss_button: "Desbotar..."
+        dismiss_tooltip: "Desbotar só as publicacións novas ou deixar de seguir temas"
+        also_dismiss_topics: "Deter o seguimento destes temas para que non se me amosen como non lidos"
+        dismiss_new: "Desbotar novas"
+        toggle: "cambiar a selección en bloque dos temas"
+        actions: "Accións en bloque"
+        change_category: "Cambiar categoría"
+        close_topics: "Pechar temas"
+        archive_topics: "Arquivar temas"
+        notification_level: "Cambiar o nivel de notificación"
+        choose_new_category: "Seleccionar a nova categoría dos temas:"
+        selected:
+          one: "Seleccionaches <b>un</b> tema."
+          other: "Seleccionaches <b>{{count}}</b> temas."
+      none:
+        unread: "Non tes temas sen ler."
+        new: "Non tes novos temas."
+        read: "Aínda non liches ningún tema."
+        posted: "Aínda non publicaches en ningún tema."
+        latest: "Non hai últimos temas. Triste."
+        hot: "Non hai temas quentes."
+        bookmarks: "Aínda non marcaches este tema."
+        category: "Non hai temas en {{category}}."
+        top: "Non hai temas destacados."
+        search: "Non hai resultados da busca."
+        educate:
+          new: '<p>Aquí aparecen os teus temas novos.</p><p>De xeito predeterminado, os temas considéranse novos e amosan un indicador <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> se se crearon nos últimos dous días.</p><p>Podes ir ás <a href="%{userPrefsUrl}">preferencias</a> para cambiar este axuste.</p>'
+          unread: '<p>Os teus temas sen ler aparecen aquí.</p><p>De xeito predeterminado, os temas considéranse sen ler e amosarase o número dos non lidos. <span class="badge new-posts badge-notification">1</span> se ti:</p><ul><li>Creaches o tema</li><li>Respondiches o tema</li><li>Liches o tema durante máis de catro minutos</li></ul><p>Ou estabeleciches o tema para ser Seguido ou Visto no control de notificacións na banda inferior de cada tema.</p><p>Vai ás túas <a href="%{userPrefsUrl}">preferencias</a> se queres cambiar isto.</p>'
+      bottom:
+        latest: "Non hai máis últimos temas."
+        hot: "Non hai máis temas  quentes."
+        posted: "Non hai máis temas publicados."
+        read: "Non hai máis temas lidos."
+        new: "Non hai máis temas novos."
+        unread: "Non hai máis temas sen ler."
+        category: "Non hai máis temas en {{category}}."
+        top: "Non hai máis temas destacados."
+        bookmarks: "Non hai máis temas marcados."
+        search: "Non hai máis resultados da busca."
+    topic:
+      unsubscribe:
+        stop_notifications: "Agora recibirás menos notificacións sobre <strong>{{title}}</strong>"
+        change_notification_state: "O estado actual das túas notificacións é"
+      filter_to: "{{post_count}} publicacións no tema"
+      create: 'Novo tema'
+      create_long: 'Crear un novo tema'
+      private_message: 'Iniciar unha mensaxe'
+      archive_message:
+        help: 'Mover mensaxes ao arquivo'
+        title: 'Arquivo'
+      move_to_inbox:
+        title: 'Mover á caixa de entrada'
+        help: 'Mover mensaxes á caixa de entrada'
+      list: 'Temas'
+      new: 'novo tema'
+      unread: 'sen ler'
+      new_topics:
+        one: 'Un tema novo'
+        other: '{{count}} temas novos'
+      unread_topics:
+        one: 'Un tema sen ler'
+        other: '{{count}} temas sen ler'
+      title: 'Tema'
+      invalid_access:
+        title: "O tema é privado"
+        description: "Sentímolo pero non tes acceso a este tema."
+        login_required: "Debes iniciar sesión para ver este tema."
+      server_error:
+        title: "A carga do tema fallou"
+        description: "Sentímolo pero non podemos cargar este tema, posibelmente debido a problemas de conexión. Ténato de novo e se o problema continúa fáinolo saber."
+      not_found:
+        title: "Non foi posíbel atopar o tema"
+        description: "Sentímolo pero non foi posíbel atopar este tema. Quizais foi eliminado por un moderador."
+      total_unread_posts:
+        one: "Tes unha publicación sen ler neste tema"
+        other: "Tes {{count}} publicacións sen ler neste tema"
+      unread_posts:
+        one: "Tes unha publicación antiga sen ler neste tema"
+        other: "Tes {{count}} publicacións antigas sen ler neste tema"
+      new_posts:
+        one: "hai unha nova publicación neste tema desde a túa última lectura"
+        other: "hai {{count}} novas publicacións neste tema desde a túa última lectura"
+      likes:
+        one: "hai un gústame neste tema"
+        other: "hai {{count}} gústames neste tema"
+      back_to_list: "Volver á lista de temas"
+      options: "Opcións de temas"
+      show_links: "amosar as ligazóns cara este tema"
+      toggle_information: "cambiar detalles do tema"
+      read_more_in_category: "Queres ler máis? explora outros temas en {{catLink}} ou {{latestLink}}."
+      read_more: "Queres ler máis? {{catLink}} ou {{latestLink}}."
+      read_more_MF: "Hai { UNREAD, plural, =0 {} one { <a href='/unread'>1 sen ler</a> } other { <a href='/unread'># sen ler</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e} false { } other{}} <a href='/new'>1 novo</a> topic} other { {BOTH, select, true{e} false { } other{}} <a href='/new'># novos</a> topics} } restantes, ou {CATEGORY, select, true {explora outros temas en {catLink}} false {{latestLink}} other {}}"
+      browse_all_categories: Explorar todas as categorías
+      view_latest_topics: ver últimos temas
+      suggest_create_topic: Porque non crear un tema?
+      jump_reply_up: ir a unha resposta anterior
+      jump_reply_down: ir a unha resposta posterior
+      deleted: "Eliminouse o tema"
+      auto_close_notice: "Este tema pechará automaticamente en %{timeLeft}."
+      auto_close_notice_based_on_last_post: "Este tema pechará %{duration} despois da última resposta."
+      auto_close_title: 'Axustes do peche automático'
+      auto_close_save: "Gardar"
+      auto_close_remove: "arriba"
+      auto_close_immediate: "A última publicación deste tema xa ten %{hours} horas. O tema pecharase inmediatamente."
+      progress:
+        title: progreso do tema
+        go_top: "principio"
+        go_bottom: "final"
+        go: "ir"
+        jump_bottom: "ir á última publicación"
+        jump_bottom_with_number: "ir á publicación %{post_number}"
+        total: publicacións totais
+        current: publicación actual
+        position: "publicación %{current} de %{total}"
+      notifications:
+        reasons:
+          '3_6': 'Recibirás notificacións porque estás vendo esta categoría.'
+          '3_5': 'Recibirás notificacións porque comezaches a ver este tema automaticamente.'
+          '3_2': 'Recibirás notificacións porque estás vendo este tema.'
+          '3_1': 'Recibirás notificacións por ser o creador deste tema.'
+          '3': 'Recibirás notificacións porque estás vendo este tema.'
+          '2_8': 'Recibirás notificacións porque segues esta categoría.'
+          '2_4': 'Recibirás notificacións porque publicaches unha resposta neste tema.'
+          '2_2': 'Recibirás notificacións porque segues este tema.'
+          '2': 'Recibirás notificacións porque <a href="/users/{{username}}/preferences">liches este tema</a>.'
+          '1_2': 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
+          '1': 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
+          '0_7': 'Estás ignorando todas as notificacións desta categoría.'
+          '0_2': 'Estás ignorando todas as notificacións deste tema.'
+          '0': 'Estás ignorando todas as notificacións deste tema.'
+        watching_pm:
+          title: "Ver"
+          description: "Recibirás notificacións de cada resposta a esta mensaxe e aparecerá o número de novas respostas."
+        watching:
+          title: "Ver"
+          description: "Notificaránseche as respostas recibidas neste tema e amosarase o número de novas respostas."
+        tracking_pm:
+          title: "Seguimento"
+          description: "Amosarase o número de novas respostas desta mensaxe. Notificaránseche as mencións ao teu @name ou cando alguén che responda."
+        tracking:
+          title: "Seguimento"
+          description: "Amosarase o número de novas respostas para este tema. Notificaránseche as mencións ao teu @name ou cando alguén che responda."
+        regular:
+          title: "Normal"
+          description: "Notificarémosche se alguén menciona o teu @nome ou che responde."
+        regular_pm:
+          title: "Normal"
+          description: "Notificarémosche se alguén menciona o teu @nome ou che responde."
+        muted_pm:
+          title: "Silenciado"
+          description: "Non recibirás ningunha notificación sobre esta mensaxe."
+        muted:
+          title: "Silenciado"
+          description: "Non se che notificará nada sobre este tema e non aparecerá no listado de últimos."
+      actions:
+        recover: "Recuperar tema"
+        delete: "Eliminar tema"
+        open: "Abrir tema"
+        close: "Pechar tema"
+        multi_select: "Seleccionar publicacións..."
+        auto_close: "Pechar automaticamente..."
+        pin: "Pegar tema..."
+        unpin: "Despegar tema..."
+        unarchive: "Desarquivar tema"
+        archive: "Arquivar tema"
+        invisible: "Retirar da lista"
+        visible: "Engadir á lista"
+        reset_read: "Restabelecer datos de lecturas"
+      feature:
+        pin: "Pegar tema"
+        unpin: "Despegar tema"
+        pin_globally: "Pegar tema globalmente"
+        make_banner: "Tema do báner"
+        remove_banner: "Eliminar o tema do báner"
+      reply:
+        title: 'Responder'
+        help: 'responder a este tema'
+      clear_pin:
+        title: "Borrar o estado Pegar"
+        help: "Borra o estado Pegado deste tema para que non apareza na banda superior da lista de temas."
+      share:
+        title: 'Compartir'
+        help: 'compartir unha ligazón a este tema'
+      flag_topic:
+        title: 'Denunciar'
+        help: 'denunciar privadamente este tema para revisalo ou enviar unha notificación privada sobre el'
+        success_message: 'Denunciaches o tema correctamente.'
+      feature_topic:
+        title: "Destacar este tema"
+        pin: "Facer que este tema apareza no alto da categoría {{categoryLink}} até"
+        confirm_pin: "Xa tes {{count}} temas pegados. Demasiados temas pegados pode resultar pesado para usuarios novos e anónimos. Confirmas que queres pegar outro tema nesta categoría?"
+        unpin: "Eliminar este tema da banda superior da categoría {{categoryLink}}."
+        unpin_until: "Retirar este tema do alto da {{categoryLink}} ou agardar até <strong>%{until}</strong>."
+        pin_note: "Os usuarios poden despegar o tema por si mesmos."
+        pin_validation: "Requírese unha data para pegar este tema."
+        not_pinned: "Non hai temas pegados en {{categoryLink}}."
+        already_pinned:
+          one: "Temas pegados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Temas pegados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        pin_globally: "Facer que este tema apareza no alto de todas as listas de temas até"
+        confirm_pin_globally: "Xa tes {{count}} temas pegados globalmente. Demasiados temas pegados pode resultar pesado para usuarios novos e anónimos. Confirmas que queres pegar outro tema globalmente?"
+        unpin_globally: "Eliminar este tema da banda superior de todas as listas de temas."
+        unpin_globally_until: "Eliminar este tema do alto de todas as listas de temas ou agardar até <strong>%{until}</strong>."
+        global_pin_note: "Os usuarios poden despegar o tema por si mesmos."
+        not_pinned_globally: "Non hai temas pegados globalmente."
+        already_pinned_globally:
+          one: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        make_banner: "Facer deste tema un báner que apareza na banda superior de todas as páxinas."
+        remove_banner: "Eliminar o báner que aparece na banda superior de todas as páxinas."
+        banner_note: "Os usuarios poden desbotar un báner se o pechan. Unicamente pode haber un tema que sexa un báner ao mesmo tempo."
+        no_banner_exists: "Non hai tema para o báner."
+        banner_exists: "<strong class='badge badge-notification unread'>Hai</strong> actualmente un tema para o báner."
+      inviting: "Convidando..."
+      automatically_add_to_groups_optional: "Este convite tamén inclúe o acceso a estes grupos: (opcional, só administradores)"
+      automatically_add_to_groups_required: "Este convite tamén inclúe o acceso a estes grupos: (<b>Obrigatorio</b>, só administradores)"
+      invite_private:
+        title: 'Convidar á mensaxe'
+        email_or_username: "Nome do usuario ou correo-e do convidado"
+        email_or_username_placeholder: "correo electrónico e nome do usuario"
+        action: "Convidar"
+        success: "Convidamos este usuario a participar nesta mensaxe."
+        error: "Sentímolo pero houbo un erro convidando este usuario."
+        group_name: "nome do grupo"
+      controls: "Controis do tema"
+      invite_reply:
+        title: 'Convidar'
+        username_placeholder: "nome do usuario"
+        action: 'Enviar convite'
+        help: 'convidar a outros a este tema por correo electrónico ou notificacións'
+        to_forum: "Enviaremos un correo electrónico permitindo ao teu amigo que se una inmediatamente ao premer nunha ligazón. Non require iniciar sesión."
+        sso_enabled: "Introduce o nome do usuario da persoa que desexas convidar a este tema."
+        to_topic_blank: "Introduce o nome do usuario ou o correo electrónico da persoa que desexas convidar a este tema."
+        to_topic_email: "Introduciches un enderezo de correo-e. Enviarémosche un convite que permitirá os teus amigos responder inmediatamente a este tema."
+        to_topic_username: "Introduciches un nome de usuario. Enviarémoslle unha notificación cunha ligazón convidándoo a este tema."
+        to_username: "Introduce o nome do usuario da persoa que desexas convidar. Enviarémoslle unha notificación cunha ligazón convidándoa a este tema."
+        email_placeholder: 'name@example.com'
+        success_email: "Enviamos un convite a <b>{{emailOrUsername}}</b>. Notificarémosche cando utilice a invitación. Mira a lapela de convites na túa páxina de usuario para facer un seguimento das túas invitacións."
+        success_username: "Convidamos este usuario a participar neste tema."
+        error: "Sentímolo, non foi posíbel convidar esta persoa. Quizais xa foi convidada? (os convites teñen un límite)"
+      login_reply: 'Inicia sesión para responder'
+      filters:
+        n_posts:
+          one: "Unha publicación"
+          other: "{{count}} publicacións"
+        cancel: "Eliminar filtro"
+      split_topic:
+        title: "Mover ao tema novo"
+        action: "mover ao tema novo"
+        topic_name: "Nome do tema novo"
+        error: "Produciuse un erro movendo as publicacións ao novo tema."
+        instructions:
+          one: "Vas crear un novo tema e enchelo coa publicación que seleccionaches."
+          other: "Vas crear un novo tema e enchelo coas <b>{{count}}</b> publicacións que seleccionaches."
+      merge_topic:
+        title: "Mover a un tema existente"
+        action: "mover a un tema existente"
+        error: "Produciuse un erro movendo publicacións nese tema."
+        instructions:
+          one: "Selecciona o tema ao que queres mover esta publicación."
+          other: "Selecciona o tema ao que queres mover estas <b>{{count}}</b> publicacións."
+      change_owner:
+        title: "Cambiar propietario das publicacións"
+        action: "cambiar propiedade"
+        error: "Produciuse un erro cambiando a propiedade das publicacións."
+        label: "Novo propietario das publicacións"
+        placeholder: "nome do usuario do novo propietario"
+        instructions:
+          one: "Selecciona o novo propietario da publicación de <b>{{old_user}}</b>."
+          other: "Selecciona o novo propietario das {{count}} publicacións de <b>{{old_user}}</b>."
+        instructions_warn: "Decátate que ningunha notificación sobre esta publicación se transferirá retroactivamente ao novo usuario.<br>Aviso: actualmente, non se transfire ao novo usuario ningún dato relacionado cunha publicación. Usa isto con tino."
+      change_timestamp:
+        title: "Cambiar a marca data/hora"
+        action: "cambiar a marca data/hora"
+        invalid_timestamp: "A marca data/hora non pode ser no futuro."
+        error: "Produciuse un erro cambiando a marca data/hora do tema."
+        instructions: "Selecciona a marca data/hora para o tema. As publicacións do tema actualizaranse para ter a mesma diferenza de tempo."
+      multi_select:
+        select: 'seleccionar'
+        selected: 'seleccionados ({{count}})'
+        select_replies: 'seleccionar +respostas'
+        delete: eliminar seleccionados
+        cancel: 'cancelar selección '
+        select_all: seleccionar todo
+        deselect_all: deseleccionar todo
+        description:
+          one: Seleccionaches <b>unha</b> publicación.
+          other: Seleccionaches <b>{{count}}</b> publicacións.
+    post:
+      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
+      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
+      quote_reply: "citar resposta"
+      edit: "Editando {{link}} {{replyAvatar}} {{username}}"
+      edit_reason: "Razón:"
+      post_number: "publicación {{number}}"
+      last_edited_on: "última edición da publicación"
+      reply_as_new_topic: "Responder como tema ligado"
+      continue_discussion: "Continuar a discusión de {{postLink}}:"
+      follow_quote: "ir á publicación citada"
+      show_full: "Amosar a publicación completa"
+      show_hidden: 'Ver o contido oculto.'
+      deleted_by_author:
+        one: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} hora, excepto que fosen denunciadas)"
+        other: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} horas, excepto que fosen denunciadas)"
+      expand_collapse: "ampliar/reducir"
+      gap:
+        one: "ver unha resposta oculta"
+        other: "ver {{count}} respostas ocultas"
+      more_links: "{{count}} máis..."
+      unread: "Publicación sen ler"
+      has_replies:
+        one: "{{count}} resposta"
+        other: "{{count}} respostas"
+      has_likes:
+        one: "{{count}} gústame"
+        other: "{{count}} gústames"
+      has_likes_title:
+        one: "A unha persoa gustoulle esta publicación"
+        other: "A {{count}} persoas gustoulles esta publicación"
+      has_likes_title_only_you: "gustouche esta publicación"
+      has_likes_title_you:
+        one: "A ti e a outro máis gustouvos esta publicación"
+        other: "A ti e a {{count}} persoas máis gustouvos esta publicación"
+      errors:
+        create: "Sentímolo pero produciuse un erro creando a publicación. Téntao de novo."
+        edit: "Sentímolo pero produciuse un erro editando a publicación. Téntao de novo."
+        upload: "Sentímolo pero produciuse un erro enviando a publicación. Téntao de novo."
+        attachment_too_large: "Sentímolo pero o ficheiro é demasiado grande (o tamaño máximo son {{max_size_kb}}kb)."
+        file_too_large: "Sentímolo pero o ficheiro é demasiado grande (o tamaño máximo son {{max_size_kb}}kb)"
+        too_many_uploads: "Sentímolo pero só podes enviar un ficheiro de cada vez."
+        too_many_dragged_and_dropped_files: "Sentímolo pero só podes arrastrar e soltar até 10 ficheiros dunha vez."
+        upload_not_authorized: "Sentímolo pero o ficheiro que tentas enviar non está autorizado (extensións autorizadas: {{authorized_extensions}})."
+        image_upload_not_allowed_for_new_user: "Sentímolo pero os novos usuarios non poden subir imaxes."
+        attachment_upload_not_allowed_for_new_user: "Sentímolo pero os novos usuarios non poden subir anexos."
+        attachment_download_requires_login: "Sentímolo pero debes iniciar sesión para descargar anexos."
+      abandon:
+        confirm: "Confirmas o abandono da túa publicación?"
+        no_value: "Non, seguir"
+        yes_value: "Si, abandonar"
+      via_email: "esta publicación chegou por correo-e"
+      whisper: "este é un bisbar privado para moderadores"
+      wiki:
+        about: "esta publicación é unha wiki"
+      archetypes:
+        save: 'Gardar opcións'
+      controls:
+        reply: "escribir unha resposta a esta publicación"
+        like: "gústame esta publicación"
+        has_liked: "gustouche esta publicación"
+        undo_like: "desfacer o gústame"
+        edit: "editar publicación"
+        edit_anonymous: "Sentímolo pero debes iniciar sesión para editar esta publicación."
+        flag: "denunciar privadamente esta publicación ou enviar unha notificación privada sobre ela"
+        delete: "eliminar publicación"
+        undelete: "recuperar publicación"
+        share: "compartir ligazón á publicación"
+        more: "Máis"
+        delete_replies:
+          confirm:
+            one: "Tamén desexas eliminar a resposta directa desta publicación?"
+            other: "Tamén desexas eliminar as {{count}} respostas directas desta publicación?"
+          yes_value: "Si, eliminar tamén as respostas"
+          no_value: "Non, só esta publicación"
+        admin: "accións admin. nas publicacións"
+        wiki: "Crear wiki"
+        unwiki: "Eliminar wiki"
+        convert_to_moderator: "Engadir cor do Equipo"
+        revert_to_regular: "Eliminar cor do Equipo"
+        rebake: "Reconstruír HTML"
+        unhide: "Non ocultar"
+        change_owner: "Cambiar propietario"
+      actions:
+        flag: 'Denunciar'
+        defer_flags:
+          one: "Pospor denuncia"
+          other: "Pospor denuncias"
+        it_too:
+          off_topic: "Denuncialo tamén"
+          spam: "Denuncialo tamén"
+          inappropriate: "Denuncialo tamén"
+          custom_flag: "Denuncialo tamén"
+          bookmark: "Marcalo tamén"
+          like: "Gústame tamén"
+          vote: "Votalo tamén"
+        undo:
+          off_topic: "Desfacer denuncia"
+          spam: "Desfacer denuncia"
+          inappropriate: "Desfacer denuncia"
+          bookmark: "Desfacer marcador"
+          like: "Desfacer o gústame"
+          vote: "Desfacer voto"
+        people:
+          off_topic: "notificado como sen relación co tema"
+          spam: "denunciou isto como spam"
+          inappropriate: "denunciou isto como inapropiado"
+          notify_moderators: "moderadores notificados"
+          notify_user: "enviou unha mensaxe"
+          bookmark: "marcou isto"
+          like: "gustou disto"
+          vote: "votou por isto"
+        by_you:
+          off_topic: "Informaches disto como non relacionado"
+          spam: "Denunciaches isto como spam"
+          inappropriate: "Denunciaches isto como inapropiado"
+          notify_moderators: "Denunciaches isto para moderación"
+          notify_user: "Enviaches unha mensaxe a este usuario"
+          bookmark: "Marcaches esta publicación"
+          like: "Gustouche isto"
+          vote: "Votaches esta publicación"
+        by_you_and_others:
+          off_topic:
+            one: "Ti e outro máis informastes disto como non relacionado"
+            other: "Ti e {{count}} máis informastes disto como non relacionado"
+          spam:
+            one: "Ti e outro máis denunciastes isto como spam"
+            other: "Ti e {{count}} máis denunciastes isto com spam"
+          inappropriate:
+            one: "Ti e outro máis denunciastes isto como inapropiado"
+            other: "Ti e {{count}} máis denunciastes isto como inapropiado"
+          notify_moderators:
+            one: "Ti e outro máis denunciastes isto para moderación"
+            other: "Ti e {{count}} máis denunciastes isto para moderación"
+          notify_user:
+            one: "Ti e unha persoa máis enviastes unha mensaxe a este usuario"
+            other: "Ti e {{count}} persoas máis enviastes unha mensaxe a este usuario"
+          bookmark:
+            one: "Ti e outra persoa marcastes esta publicación"
+            other: "Ti e {{count}} persoas máis marcastes esta publicación"
+          like:
+            one: "A ti e a un máis gustouvos isto"
+            other: "A ti e a {{count}} máis gustouvos isto"
+          vote:
+            one: "Ti e outra persoa votastes esta publicación"
+            other: "Ti e {{count}} persoas máis votastes esta publicación"
+        by_others:
+          off_topic:
+            one: "Unha persoa marcou isto como non relacionado"
+            other: "{{count}} persoas informaron disto como non relacionado"
+          spam:
+            one: "Unha persoa marcou isto como spam"
+            other: "{{count}} persoas denunciaron isto como spam"
+          inappropriate:
+            one: "Unha persoa denunciou isto como inapropiado"
+            other: "{{count}} persoas denunciaron isto como inapropiado"
+          notify_moderators:
+            one: "Unha persoa denunciou isto para moderación"
+            other: "{{count}} persoas denunciaron isto para moderación"
+          notify_user:
+            one: "Unha persoa enviou unha mensaxe a este usuario"
+            other: "{{count}} persoas enviaron unha mensaxe a este usuario"
+          bookmark:
+            one: "Unha persoa marcou esta publicación"
+            other: "{{count}} persoas marcaron esta publicación"
+          like:
+            one: "A unha persoa gustoulle isto"
+            other: "A {{count}} persoas gustoulles isto"
+          vote:
+            one: "Unha persoa votou por esta publicación"
+            other: "{{count}} persoas votaron por esta publicación"
+      delete:
+        confirm:
+          one: "Confirmas a eliminación desta publicación?"
+          other: "Confirmas a eliminación de todas estas publicacións?"
+      revisions:
+        controls:
+          first: "Primeira revisión"
+          previous: "Revisión anterior"
+          next: "Revisión seguinte"
+          last: "Última revisión"
+          hide: "Ocultar revisión"
+          show: "Amosar revisión"
+          revert: "Reverter a esta revisión"
+          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
+        displays:
+          inline:
+            title: "Amosar o resultado coas adicións e eliminacións inseridas"
+            button: '<i class="fa fa-square-o"></i> HTML'
+          side_by_side:
+            title: "Amosar o resultado coas diferenzas comparadas"
+            button: '<i class="fa fa-columns"></i> HTML'
+          side_by_side_markdown:
+            title: "Amosar a fonte crúa coas diferenzas comparadas"
+            button: '<i class="fa fa-columns"></i> Crúa'
+    category:
+      can: 'podes&hellip; '
+      none: '(sen categoría)'
+      all: 'Todas as categorías'
+      choose: 'Seleccionar unha categoría&hellip;'
+      edit: 'editar'
+      edit_long: "Editar"
+      view: 'Ver os Temas na Categoría'
+      general: 'Xeral'
+      settings: 'Axustes'
+      topic_template: "Modelo para o tema"
+      delete: 'Eliminar categoría'
+      create: 'Nova categoría'
+      create_long: 'Crear unha nova categoría'
+      save: 'Gardar categoría'
+      slug: '«Slug» da Categoría'
+      slug_placeholder: 'Inserir guións entre palabras para url (opcional) '
+      creation_error: Produciuse un erro durante a creación desta categoría.
+      save_error: Produciuse un erro gardando a categoría.
+      name: "Nome da categoría"
+      description: "Descrición"
+      topic: "tema da categoría"
+      logo: "Logotipo da categoría"
+      background_image: "Imaxe do fondo da categoría"
+      badge_colors: "Cores das insignias"
+      background_color: "Cor do fondo"
+      foreground_color: "Cor do primeiro plano"
+      name_placeholder: "Dúas palabras como máximo"
+      color_placeholder: "Calquera cor web"
+      delete_confirm: "Confirmas a eliminación desta categoría?"
+      delete_error: "Produciuse un erro elimando esta categoría."
+      list: "Listar categorías"
+      no_description: "Engade unha descrición a esta categoría."
+      change_in_category_topic: "Editar a descrición"
+      already_used: 'Esta cor usouna outra categoría'
+      security: "Seguranza"
+      special_warning: "Aviso: esta categoría ten axustes predeterminados e as opcións de seguranza non se poden modificar. Se non queres usala, elimínaa no canto de reciclala."
+      images: "Imaxes"
+      auto_close_label: "Pechar automaticamente os temas despois de:"
+      auto_close_units: "horas"
+      email_in: "Personalizar enderezos de correos-e entrantes:"
+      email_in_allow_strangers: "Aceptar correos-e de usuarios anónimos sen contas"
+      email_in_disabled: "A publicación de novos temas vía correo-e está desactivada nos axustes do sitio. Para activala,"
+      email_in_disabled_click: 'activar o axuste «email in».'
+      suppress_from_homepage: "Retirar esta categoría da páxina de inicio."
+      allow_badges_label: "Permitir adxudicar insignias nesta categoría"
+      edit_permissions: "Editar permisos"
+      add_permission: "Engadir permisos"
+      this_year: "este ano"
+      position: "posición"
+      default_position: "Posición predeterminada"
+      position_disabled: "As categorías amosaranse en orde de actividade. Para controlar a orde das categorías nas listas."
+      position_disabled_click: 'activar o axuste «fixed category positions».'
+      parent: "Categoría pai"
+      notifications:
+        watching:
+          title: "Ver"
+          description: "Verás automaticamente todos os novos temas destas categorías. Notificaránseche as novas publicacións de cada tema e amosaráseche o número de novas respostas."
+        tracking:
+          title: "Seguimento"
+          description: "Seguirás automaticamente todos os novos temas destas categorías. Notificaránseche ás mencións ao teu @name e as respostas que recibas, e amosaráseche o número de novas respostas."
+        regular:
+          title: "Normal"
+          description: "Notificarémosche se alguén menciona o teu @nome ou che responde."
+        muted:
+          title: "Silenciado"
+          description: "Non se che notificarán novos temas nestas categorías e non aparecerán nos Últimos."
+    flagging:
+      title: 'Grazas por axudar a manter a nosa comunidade.'
+      action: 'Denunciar publicación'
+      take_action: "Tomar medidas"
+      notify_action: 'Mensaxe'
+      delete_spammer: "Eliminar spammer"
+      delete_confirm: "Vas borrar <b>%{posts}</b> publicacións e <b>%{topics}</b> temas deste usuario, eliminar a súa conta, bloquear o rexistro desde os seus enderezos IP <b>%{ip_address}</b> e engadir o seu correo-e <b>%{email}</b> a unha lista de bloqueos permanentes. Confirmas que este usuario é un spammer?"
+      yes_delete_spammer: "Si, eliminar o spammer"
+      ip_address_missing: "(N/D)"
+      hidden_email_address: "(oculto)"
+      submit_tooltip: "Enviar a denuncia privada"
+      take_action_tooltip: "Alcanzar o limiar de denuncias inmediatamente no canto de agardar por máis denuncias da comunidade"
+      cant: "Sentímolo pero non podes denunciar esta publicación neste intre."
+      notify_staff: 'Notificar ao equipo privadamente'
+      formatted_name:
+        off_topic: "Non está relacionado"
+        inappropriate: "É inapropiado"
+        spam: "É spam"
+      custom_placeholder_notify_user: "Se específico, construtivo e sempre amábel."
+      custom_placeholder_notify_moderators: "Especifícanos sobre o que estás preocupado e proporciónanos ligazóns relevantes e exemplos cando sexa posíbel."
+      custom_message:
+        at_least: "introduce cando menos {{n}} caracteres"
+        more: "{{n}} restantes..."
+        left: "{{n}} restantes"
+    flagging_topic:
+      title: "Grazas por axudar a manter a nosa comunidade."
+      action: "Denunciar tema"
+      notify_action: "Mensaxe"
+    topic_map:
+      title: "Resumo do tema"
+      participants_title: "Publicadores frecuentes"
+      links_title: "Ligazóns populares"
+      links_shown: "amosar as {{totalLinks}} ligazóns..."
+      clicks:
+        one: "Un clic"
+        other: "%{count} clics"
+    topic_statuses:
+      warning:
+        help: "Este é un aviso oficial."
+      bookmarked:
+        help: "Marcaches este tema"
+      locked:
+        help: "Este tema está pechado, xa non acepta respostas"
+      archived:
+        help: "Este tema está arquivado; está conxelado e non se pode cambiar"
+      locked_and_archived:
+        help: "Este tema está pechado e arquivado; xa non acepta novas respostas e non se pode cambiar"
+      unpinned:
+        title: "Despegado"
+        help: "Este tema está despegado para vostede; presentarase na orde normal"
+      pinned_globally:
+        title: "Pegado globalmente"
+        help: "Este tema pegouse globalmente; presentarase na banda superior dos máis recentes e na súa categoría"
+      pinned:
+        title: "Pegado"
+        help: "Este tema pegouse globalmente; presentarase na banda superior da súa categoría"
+      invisible:
+        help: "Este tema non está listado. Non se presentará nas listas de temas e só estará accesíbel vía ligazón directa"
+    posts: "Publicacións"
+    posts_lowercase: "publicacións"
+    posts_long: "hai {{number}} publicacións neste tema"
+    posts_likes_MF: |
+      Este tema ten {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
+        low {cun alto índice de gústames}
+        med {cun moi alto índice de gústames}
+        high {cun extremadamente alto índice de gústames}
+        other {}}
+    original_post: "Publicación orixinal"
+    views: "Vistas"
+    views_lowercase:
+      one: "vista"
+      other: "vistas"
+    replies: "Respostas"
+    views_long: "este tema visitouse {{number}} veces"
+    activity: "Actividade"
+    likes: "Gústames"
+    likes_lowercase:
+      one: "gústame"
+      other: "gústames"
+    likes_long: "hai {{number}} gústames neste tema"
+    users: "Usuarios"
+    users_lowercase:
+      one: "usuario"
+      other: "usuarios"
+    category_title: "Categoría"
+    history: "Historial"
+    changed_by: "por {{author}}"
+    raw_email:
+      title: "Fonte do correo"
+      not_available: "Non dispoñíbel."
+    categories_list: "Lista de categorías"
+    filters:
+      with_topics: "%{filter} temas"
+      with_category: "Temas de %{filter} %{category}"
+      latest:
+        title: "Últimos"
+        title_with_count:
+          one: "Último (1)"
+          other: "({{count}}) últimos"
+        help: "temas con publicacións recentes"
+      hot:
+        title: "Quentes"
+        help: "unha selección dos temas máis quentes"
+      read:
+        title: "Lidos"
+        help: "temas que liches, partindo da última lectura"
+      search:
+        title: "Buscar"
+        help: "buscar todos os temas"
+      categories:
+        title: "Categorías"
+        title_in: "Categoría - {{categoryName}}"
+        help: "todos os temas agrupados por categoría"
+      unread:
+        title: "Sen ler"
+        title_with_count:
+          one: "Un sen ler"
+          other: "({{count}}) sen ler"
+        help: "temas con publicacións sen ler que estás vendo ou seguindo"
+        lower_title_with_count:
+          one: "Unha sen ler"
+          other: "{{count}} sen ler"
+      new:
+        lower_title_with_count:
+          one: "Un novo"
+          other: "{{count}} novos"
+        lower_title: "novo"
+        title: "Novo"
+        title_with_count:
+          one: "Un novo"
+          other: "({{count}}) novos"
+        help: "temas creados nos últimos días"
+      posted:
+        title: "As miñas publicacións"
+        help: "temas nos que publicaches"
+      bookmarks:
+        title: "Marcadores"
+        help: "temas que marcaches"
+      category:
+        title: "{{categoryName}}"
+        title_with_count:
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
+        help: "últimos temas na categoría {{categoryName}}"
+      top:
+        title: "Banda superior"
+        help: "os temas máis activos no último ano, mes, semana ou día"
+        all:
+          title: "De sempre"
+        yearly:
+          title: "Anual"
+        quarterly:
+          title: "Trimestral"
+        monthly:
+          title: "Mensual"
+        weekly:
+          title: "Semanal"
+        daily:
+          title: "Diario"
+        all_time: "De sempre"
+        this_year: "Ano"
+        this_quarter: "Trimestre"
+        this_month: "Mes"
+        this_week: "Semana"
+        today: "Hoxe"
+        other_periods: "ver arriba"
+    browser_update: 'Desgraciadamente, <a href="http://www.discourse.org/faq/#browser">o navegador é demasiado vello para funcionar nesta web</a>. <a href="http://browsehappy.com">Anóvao</a>.'
+    permission_types:
+      full: "Crear / Responder / Ver"
+      create_post: "Responder / Ver"
+      readonly: "Ver"
+  admin_js:
+    type_to_filter: "escribe para filtrar..."
+    admin:
+      title: 'Administrador de Discourse'
+      moderator: 'Moderador'
+      dashboard:
+        title: "Panel"
+        last_updated: "Última actualización de Panel:"
+        version: "Versión"
+        up_to_date: "Estás actualizado."
+        critical_available: "Está dispoñíbel unha actualización crítica."
+        updates_available: "Hai actualizacións dispoñíbeis."
+        please_upgrade: "Por favor actualiza."
+        no_check_performed: "Non se efectuou unha busca de actualizacións. Asegúrate de que sidekiq está executándose."
+        stale_data: "Non se efectuou unha busca de actualizacións ultimamente. Asegúrate de que sidekiq está executándose."
+        version_check_pending: "Parece que actualizaches recentemente. Caralludo!"
+        installed_version: "Instalado"
+        latest_version: "Últimos"
+        problems_found: "Atopáronse algúns problemas coa instalación do Discourse."
+        last_checked: "Última comprobación"
+        refresh_problems: "Actualizar"
+        no_problems: "Non se atoparon problemas."
+        moderators: 'Moderadores:'
+        admins: 'Administradores:'
+        blocked: 'Bloqueados:'
+        suspended: 'Suspendidos:'
+        private_messages_short: "Mensaxes"
+        private_messages_title: "Mensaxes"
+        mobile_title: "Móbil"
+        space_free: "{{size}} libres"
+        uploads: "subidas"
+        backups: "copias de seguranza"
+        traffic_short: "Tráfico"
+        traffic: "Peticións web de aplicativos"
+        page_views: "Peticións API"
+        page_views_short: "Peticións API"
+        show_traffic_report: "Amosar o informe detallado do tráfico"
+        reports:
+          today: "Hoxe"
+          yesterday: "Onte"
+          last_7_days: "Últimos 7 días"
+          last_30_days: "Últimos 30 días"
+          all_time: "De sempre"
+          7_days_ago: "Hai 7 días"
+          30_days_ago: "Hai 30 días"
+          all: "Todas"
+          view_table: "táboa"
+          view_chart: "gráfica de barras"
+          refresh_report: "Actualiza informe"
+          start_date: "Data de inicio"
+          end_date: "Data de remate"
+          groups: "Todos os grupos"
+      commits:
+        latest_changes: "Últimos cambios: por favor, actualiza a miúdo."
+        by: "por"
+      flags:
+        title: "Denuncias"
+        old: "Antigo"
+        active: "Activo"
+        agree: "Aceptar"
+        agree_title: "Confirmar esta denuncia como válida"
+        agree_flag_modal_title: "Aceptar e..."
+        agree_flag_hide_post: "Aceptar (ocultar publicación + enviar msx. privada)"
+        agree_flag_hide_post_title: "Ocultar esta publicación e enviar automaticamente unha mensaxe ao usuario para que a edite axiña"
+        agree_flag_restore_post: "Aceptar (restabelecer publicación)"
+        agree_flag_restore_post_title: "Restabelecer esta publicación"
+        agree_flag: "Aceptar denuncia"
+        agree_flag_title: "Aceptar a denuncia e manter a publicación sen cambios"
+        defer_flag: "Pospor"
+        defer_flag_title: "Eliminar esta denuncia; non precisa medidas neste momento."
+        delete: "Eliminar"
+        delete_title: "Eliminar a publicación á que se refire esta denuncia."
+        delete_post_defer_flag: "Eliminar publicación e pospor a denuncia"
+        delete_post_defer_flag_title: "Eliminar publicación. Se é a inicial, eliminar tamén o tema"
+        delete_post_agree_flag: "Eliminar a publicación e aceptar a denuncia"
+        delete_post_agree_flag_title: "Eliminar publicación. Se é a inicial, eliminar tamén o tema."
+        delete_flag_modal_title: "Eliminar e..."
+        delete_spammer: "Eliminar spammer"
+        delete_spammer_title: "Eliminar o usuario e todas as súas publicacións e temas."
+        disagree_flag_unhide_post: "En desacordo (amosar publicación)"
+        disagree_flag_unhide_post_title: "Eliminar as denuncias desta publicación e facela visíbel de novo"
+        disagree_flag: "Non aceptar"
+        disagree_flag_title: "Denegar esta denuncia por incorrecta"
+        clear_topic_flags: "Feito"
+        clear_topic_flags_title: "Este tema investigouse e as incidencias arranxáronse. Preme Feito para eliminar as denuncias."
+        more: "(máis respostas...)"
+        dispositions:
+          agreed: "aceptar"
+          disagreed: "non aceptar"
+          deferred: "posposta"
+        flagged_by: "Denunciado por"
+        resolved_by: "Arranxado por"
+        took_action: "Tomadas medidas"
+        system: "Sistema"
+        error: "Algo foi mal"
+        reply_message: "Responder"
+        no_results: "Non hai denuncias"
+        topic_flagged: "Este <strong>tema</strong> foi denunciado."
+        visit_topic: "Visite o tema para actuar"
+        was_edited: "A publicación editouse despois da primeira denuncia"
+        previous_flags_count: "Esta publicación xa se denunciou {{count}} veces."
+        summary:
+          action_type_3:
+            one: "sen relación"
+            other: "sen relación x{{count}}"
+          action_type_4:
+            one: "inapropiado"
+            other: "inapropiados x{{count}}"
+          action_type_6:
+            one: "personalizar"
+            other: "personalizar x{{count}}"
+          action_type_7:
+            one: "personalizar"
+            other: "personalizar x{{count}}"
+          action_type_8:
+            one: "spam"
+            other: "spam x{{count}}"
+      groups:
+        primary: "Grupo primario"
+        no_primary: "(non hai un grupo primario)"
+        title: "Grupos"
+        edit: "Editar grupos"
+        refresh: "Actualizar"
+        new: "Novo"
+        selector_placeholder: "escribe o nome do usuario"
+        name_placeholder: "Nome do grupo sen espazos, como na regra do nome do usuario"
+        about: "Edita aquí a túa pertenza a un grupo e nomes"
+        group_members: "Membros do grupo"
+        delete: "Eliminar"
+        delete_confirm: "Eliminar este grupo?"
+        delete_failed: "Non é posíbel eliminar o grupo. Se este é un grupo automático, non se pode destruír."
+        delete_member_confirm: "Queres eliminar a «%{username}» do grupo «%{group}»?"
+        delete_owner_confirm: "Eliminar os privilexios de usuario de «%{username}»?"
+        name: "Nome"
+        add: "Engadir"
+        add_members: "Engadir membros"
+        custom: "Personalizar"
+        bulk_complete: "Engadíronse os usuarios ao grupo."
+        bulk: "Engadir ao grupo en bloque"
+        bulk_paste: "Pegar unha lista de nomes de usuario ou correos-e, un por liña:"
+        bulk_select: "(seleccionar un grupo)"
+        automatic: "Automático"
+        automatic_membership_email_domains: "Os usuarios que se rexistraron cun dominio de correo electrónico que coincida exactamente con algún da lista engadiranse automaticamente a este grupo:"
+        automatic_membership_retroactive: "Aplicar a regra do mesmo dominio de correo electrónico para engadir os usuarios rexistrados."
+        default_title: "Título predeterminado para os usuarios deste grupo"
+        primary_group: "Estabelecer automaticamente como grupo primario"
+        group_owners: Propietarios
+        add_owners: Engadir propietarios
+        incoming_email: "Personalizar enderezos de correo-e entrantes"
+        incoming_email_placeholder: "introducir enderezos de correo-e"
+      api:
+        generate_master: "Xerar unha chave maestra da API"
+        none: "Non hai chaves activas da API agora mesmo."
+        user: "Usuario"
+        title: "API"
+        key: "Chave da API"
+        generate: "Xerar"
+        regenerate: "Rexenerar"
+        revoke: "Revogar"
+        confirm_regen: "Confirmas a substitución da chave da API por unha nova?"
+        confirm_revoke: "Confirmas a revogación desta chave?"
+        info_html: "A chave da API permitirache crear e actualizar temas usando chamadas JSON."
+        all_users: "Todos os usuarios"
+        note_html: "Manter esta chave en <strong>secreto</strong>, todos os usuarios que a teñan poderían crear e publicar co nome da calquera usuario."
+      plugins:
+        title: "Plugins"
+        installed: "Plugins instalados"
+        name: "Nome"
+        none_installed: "Non tes ningún plugin instalado."
+        version: "Versión"
+        enabled: "Activado?"
+        is_enabled: "S"
+        not_enabled: "N"
+        change_settings: "Cambiar axustes"
+        change_settings_short: "Axustes"
+        howto: "Como podo instalar un plugin?"
+      backups:
+        title: "Copias de seguranza"
+        menu:
+          backups: "Copias de seguranza"
+          logs: "Rexistros"
+        none: "Non hai copia de seguranza dispoñíbel"
+        read_only:
+          enable:
+            title: "Activar o modo de só-lectura"
+            label: "Activar modo de só-lectura"
+            confirm: "Confirmas a activación do modo de só-lectura?"
+          disable:
+            title: "Desactivar o modo de só-lectura"
+            label: "Desactivar modo de só-lectura"
+        logs:
+          none: "Aínda non hai rexistros..."
+        columns:
+          filename: "Nome do ficheiro"
+          size: "Tamaño"
+        upload:
+          label: "Enviar"
+          title: "Subir unha copia de seguranza a esta instancia"
+          uploading: "Enviando..."
+          success: "«{{filename}}» subiuse correctamente."
+          error: "Produciuse un erro durante o envío de «{{filename}}»: {{message}}"
+        operations:
+          is_running: "Estase executando unha operación..."
+          failed: "Produciuse un fallo {{operation}} . Revisa os rexistros."
+          cancel:
+            label: "Cancelar"
+            title: "Cancelar a operación actual"
+            confirm: "Confirmas a cancelación da operación actual?"
+          backup:
+            label: "Copia de seguranza"
+            title: "Crear unha copia de seguranza"
+            confirm: "Confirmas a execución dunha nova copia de seguranza?"
+            without_uploads: "Si (non incluír ficheiros)"
+          download:
+            label: "Descargar"
+            title: "Descargar a copia de seguranza"
+          destroy:
+            title: "Eliminar a copia de seguranza"
+            confirm: "Confirmas a destrución desta copia de seguranza?"
+          restore:
+            is_disabled: "«Restabelecer» está desactivado nos axustes do sitio."
+            label: "Restabelecer"
+            title: "Restabelecer a copia de seguranza"
+            confirm: "Confirmas a restauración desta copia de seguranza?"
+          rollback:
+            label: "Reverter"
+            title: "Reverter a base de datos ao estado de funcionamento anterior"
+            confirm: "Confirmas a reversión da base de datos ao estado de funcionamento anterior?"
+      export_csv:
+        user_archive_confirm: "Confirmas a descarga das túas publicacións?"
+        success: "Iniciouse a exportación, notificarémosche cunha mensaxe o remate do proceso."
+        failed: "Produciuse un fallo na exportación. Comproba os rexistros."
+        rate_limit_error: "Só se poden descargar as publicacións unha vez por día. Téntao de novo mañá."
+        button_text: "Exportar"
+        button_title:
+          user: "Exportar a lista completa de usuarios en formato CSV."
+          staff_action: "Exportar o rexistro con todas as accións do equipo en formato CSV."
+          screened_email: "Exportar a lista de correos-e controlados en formato CSV."
+          screened_ip: "Exportar a lista de IP controladas en formato CSV."
+          screened_url: "Exportar a lista de URL controladas en formato CSV."
+      export_json:
+        button_text: "Exportar"
+      invite:
+        button_text: "Enviar convites"
+        button_title: "Enviar convites"
+      customize:
+        title: "Personalizar"
+        long_title: "Personalización do sitio"
+        css: "CSS"
+        header: "Cabeceira"
+        top: "Banda superior"
+        footer: "Pé de páxina"
+        embedded_css: "CSS encaixado"
+        head_tag:
+          text: "</head>"
+          title: "HTML que se inserirá antes da etiqueta </head>"
+        body_tag:
+          text: "</body>"
+          title: "HTML que se inserirá antes da etiqueta </body>"
+        override_default: "Non incluír folla de estilo estándar"
+        enabled: "Activado?"
+        preview: "previsualizar"
+        undo_preview: "eliminar previsualización"
+        rescue_preview: "estilo predeterminado"
+        explain_preview: "Ver o sitio con esta folla de estilo personalizada"
+        explain_undo_preview: "Volver á folla de estilo personalizada activada actualmente"
+        explain_rescue_preview: "Ver o sitio coa folla de estilo predeterminada"
+        save: "Gardar"
+        new: "Novo"
+        new_style: "Novo estilo"
+        import: "Importar"
+        import_title: "Seleccionar un ficheiro ou pegar un texto"
+        delete: "Eliminar"
+        delete_confirm: "Queres eliminar esta personalización?"
+        about: "Modificar as follas de estilo CSS e as cabeceiras HTML do sitio. Engadir unha personalización para comezar."
+        color: "Cor"
+        opacity: "Opacidade"
+        copy: "Copiar"
+        email_templates:
+          title: "Modelos de correo-e"
+          subject: "Asunto"
+          multiple_subjects: "Este modelo de correo-e ten varios asuntos."
+          body: "Corpo"
+          none_selected: "Selecciona un modelo de correo-e para comezar a edición."
+          revert: "Reverter os cambios"
+          revert_confirm: "Confirmas a reversión dos cambios?"
+        css_html:
+          title: "CSS/HTML"
+          long_title: "Personalizacións do CSS e do HTML"
+        colors:
+          title: "Cores"
+          long_title: "Esquemas de cor"
+          about: "Modifica as cores usadas no sitio sen ter que escribir en CSS. Engade un esquema para comezar."
+          new_name: "Novo esquema de cores"
+          copy_name_prefix: "Copiar de"
+          delete_confirm: "Queres eliminar este esquema de cor?"
+          undo: "desfacer"
+          undo_title: "Desfai os teus cambio nesta cor desde a última vez que a gardaches."
+          revert: "reverter"
+          revert_title: "Restabelecer o esquema de cor ao predeterminado de Discourse."
+          primary:
+            name: 'primario'
+            description: 'Principalmente texto, iconas e bordos.'
+          secondary:
+            name: 'secundario'
+            description: 'Cor principal do fondo e cor do texto dalgúns botóns.'
+          tertiary:
+            name: 'terciario'
+            description: 'Ligazóns, algúns botóns, notificacións e cor de resalte.'
+          quaternary:
+            name: "cuaternario"
+            description: "Ligazóns de navegación"
+          header_background:
+            name: "Fondo da cabeceira"
+            description: "Cor do fondo na cabeceira do sitio."
+          header_primary:
+            name: "cabeceira primaria"
+            description: "Texto e iconas na cabeceira do sitio."
+          highlight:
+            name: 'resaltes'
+            description: 'Cor do fondo dos elementos resaltados da páxina, como publicacións e temas.'
+          danger:
+            name: 'perigo'
+            description: 'Cor de resalte para accións como eliminar publicacións e temas.'
+          success:
+            name: 'correcto'
+            description: 'Usado para indicar que unha acción se realizou correctamente.'
+          love:
+            name: 'gústame'
+            description: "Cor do botón Gústame."
+      email:
+        title: "Correos electrónicos"
+        settings: "Axustes"
+        templates: "Modelos"
+        preview_digest: "Previsualización do compendio"
+        sending_test: "Enviando correo-e de proba..."
+        error: "<b>ERRO</b> - %{server_error}"
+        test_error: "Produciuse un problema enviando o correo-e de proba. Revisa os teus axustes de correo electrónico, comproba que o teu host non está bloqueando as conexións de correo e téntao de novo."
+        sent: "Enviado"
+        skipped: "Saltado"
+        received: "Recibidos"
+        rejected: "Rexeitado"
+        sent_at: "Enviado ás"
+        time: "Hora"
+        user: "Usuario"
+        email_type: "Tipo de correo-e"
+        to_address: "Ao enderezo"
+        test_email_address: "enderezo de correo-e de proba"
+        send_test: "Enviar correo-e de proba"
+        sent_test: "enviado!"
+        delivery_method: "Metodo de entrega"
+        preview_digest_desc: "Previsualiza o contido dos correos-e compendio enviados a usuarios inactivos."
+        refresh: "Actualizar"
+        format: "Formato"
+        html: "html"
+        text: "texto"
+        last_seen_user: "Último usuario visto:"
+        reply_key: "Tecla para responder"
+        skipped_reason: "Saltar razón"
+        incoming_emails:
+          from_address: "De"
+          to_addresses: "A"
+          cc_addresses: "Cc"
+          subject: "Asunto"
+          error: "Erro"
+          none: "Non se atoparon correos entrantes."
+          modal:
+            title: "Detalles dos correos-e entrantes"
+            error: "Erro"
+            return_path: "Ruta de retorno"
+            message_id: "Id da mensaxe"
+            in_reply_to: "En resposta a"
+            references: "Referencias"
+            date: "Data"
+            from: "De"
+            to: "A"
+            cc: "Cc"
+            subject: "Asunto"
+            body: "Corpo"
+            rejection_message: "Correo-e de rexeitamento"
+          filters:
+            from_placeholder: "de@exemplo.com"
+            to_placeholder: "a@exemplo.com"
+            cc_placeholder: "cc@exemplo.com"
+            subject_placeholder: "Asunto..."
+            error_placeholder: "Erro"
+        logs:
+          none: "Non se atoparon rexistros."
+          filters:
+            title: "Filtro"
+            user_placeholder: "nome de usuario"
+            address_placeholder: "nome@exemplo.com"
+            type_placeholder: "compendio, rexistro..."
+            reply_key_placeholder: "tecla para responder"
+            skipped_reason_placeholder: "razón"
+      logs:
+        title: "Rexistros"
+        action: "Acción"
+        created_at: "Creado"
+        last_match_at: "Último resultado"
+        match_count: "Resultados"
+        ip_address: "IP"
+        topic_id: "ID do tema"
+        post_id: "ID da publicación"
+        category_id: "ID da categoría"
+        delete: 'Eliminar'
+        edit: 'Editar'
+        save: 'Gardar'
+        screened_actions:
+          block: "bloquear"
+          do_nothing: "non facer nada"
+        staff_actions:
+          title: "Accións do equipo"
+          instructions: "Premer nos nomes dos usuarios e nas accións para filtrar a lista. Premer nas imaxes dos perfís para ir ás páxinas dos usuarios."
+          clear_filters: "Amosar todo"
+          staff_user: "Usuario do equipo"
+          target_user: "Usuario obxectivo"
+          subject: "Asunto"
+          when: "Cando"
+          context: "Contexto"
+          details: "Detalles"
+          previous_value: "Anterior"
+          new_value: "Novo"
+          diff: "Diferenzas"
+          show: "Amosar"
+          modal_title: "Detalles"
+          no_previous: "Non hai ningún valor previo."
+          deleted: "Non hai ningún valor. O rexistro foi eliminado."
+          actions:
+            delete_user: "eliminar usuario"
+            change_trust_level: "cambiar nivel de confianza"
+            change_username: "cambiar nome do usuario"
+            change_site_setting: "cambiar axuste do sitio"
+            change_site_customization: "cambiar a personalización do sitio"
+            delete_site_customization: "eliminar a personalización do sitio"
+            change_site_text: "cambiar o texto do sitio"
+            suspend_user: "suspender usuario"
+            unsuspend_user: "non suspender usuario"
+            grant_badge: "conceder insignia"
+            revoke_badge: "revogar insignia"
+            check_email: "comprobar correo-e"
+            delete_topic: "eliminar tema"
+            delete_post: "eliminar publicación"
+            impersonate: "suplantar"
+            anonymize_user: "facer o usuario anónimo"
+            roll_up: "encartar os bloques de IP"
+            change_category_settings: "cambiar axustes da categoría"
+            delete_category: "eliminar categoría"
+            create_category: "crear categoría"
+            block_user: "bloquear usuario"
+            unblock_user: "desbloquear usuario"
+            grant_admin: "conceder administración"
+            revoke_admin: "revogar administración"
+            grant_moderation: "conceder moderación"
+            revoke_moderation: "revogar moderación"
+            backup_operation: "operación de copia de seguranza"
+        screened_emails:
+          title: "Correos-e controlados"
+          description: "Cando alguén tente crear unha nova conta, comprobaranse os seguintes enderezos de correo electrónico e bloquearase o rexistro ou se tomará outra medida."
+          email: "Enderezo de correo-e"
+          actions:
+            allow: "Permitir"
+        screened_urls:
+          title: "URL controladas"
+          description: "As URL listadas aquí usáronse en publicacións de usuarios que foron identificados como spammers."
+          url: "URL"
+          domain: "Dominio"
+        screened_ips:
+          title: "IP controladas"
+          description: 'Enderezos IP observados. Usa «Permitir» para engadilos á lista branca.'
+          delete_confirm: "Confirmas a eliminación da regra para %{ip_address}?"
+          roll_up_confirm: "Confirmas que queres agrupar en subredes os enderezos IP controlados comunmente?"
+          rolled_up_some_subnets: "Agrupáronse correctamente en subredes as entradas de IP para bloquear: %{subnets}."
+          rolled_up_no_subnet: "Non hai nada que agrupar."
+          actions:
+            block: "Bloquear"
+            do_nothing: "Permitir"
+            allow_admin: "Permitir administrador"
+          form:
+            label: "Novo:"
+            ip_address: "Enderezo IP"
+            add: "Engadir"
+            filter: "Buscar"
+          roll_up:
+            text: "Agrupar"
+            title: "Crea unha nova subrede de entradas para bloquear se hai cando menos «min_ban_entries_for_roll_up» entradas."
+        logster:
+          title: "Rexistros de erros"
+      impersonate:
+        title: "Suplantar"
+        help: "Usar esta ferramenta para suplantar unha conta de usuario co obxecto de detectar e corrixir erros. Deberás saír da sesión ao rematar."
+        not_found: "Non é posíbel atopar o usuario."
+        invalid: "Sentímolo pero non podes suplantar este usuario."
+      users:
+        title: 'Usuarios'
+        create: 'Engadir usuario administrador'
+        last_emailed: "Últimos envíos por correo-e"
+        not_found: "Sentímolo pero o nome do usuario non existe no sistema."
+        id_not_found: "Sentímolo pero o usuario non existe no sistema."
+        active: "Activo"
+        show_emails: "Amosar correos-e"
+        nav:
+          new: "Novo"
+          active: "Activo"
+          pending: "Pendente"
+          staff: 'Equipo'
+          suspended: 'Suspendido'
+          blocked: 'Bloqueado'
+          suspect: 'Sospeitoso'
+        approved: "Aprobado?"
+        approved_selected:
+          one: "aprobar usuario"
+          other: "aprobar os ({{count}}) usuarios"
+        reject_selected:
+          one: "rexeitar usuario"
+          other: "rexeitar os ({{count}}) usuarios"
+        titles:
+          active: 'Usuarios activos'
+          new: 'Novos usuarios'
+          pending: 'Usuarios pendentes de revisión'
+          newuser: 'Usuarios cun nivel de confianza 0 (novo usuario)'
+          basic: 'Usuarios cun nivel de confianza 1 (usuario básico)'
+          member: 'Usuarios cun nivel de confianza 2 (membro)'
+          regular: 'Usuarios cun nivel de confianza 3 (normal)'
+          leader: 'Usuarios cun nivel de confianza 4 (líder)'
+          staff: "Equipo"
+          admins: 'Usuarios administradores'
+          moderators: 'Moderadores'
+          blocked: 'Usuarios bloqueados'
+          suspended: 'Usuarios suspendidos'
+          suspect: 'Usuarios sospeitosos'
+        reject_successful:
+          one: "Rexeitouse un usuario correctamente."
+          other: "Rexeitáronse %{count} usuarios correctamente."
+        reject_failures:
+          one: "Produciuse un fallo rexeitando o usuario."
+          other: "Produciuse un fallo rexeitando os %{count} usuarios."
+        not_verified: "Sen verificar"
+        check_email:
+          title: "Amosar o enderezo de correo-e deste usuario"
+          text: "Amosar"
+      user:
+        suspend_failed: "Algo fallou rexeitando este usuario {{error}}"
+        unsuspend_failed: "Algo foi mal levantando a suspensión deste usuario {{error}}"
+        suspend_duration: "Canto tempo estará suspendido o usuario?"
+        suspend_duration_units: "(días)"
+        suspend_reason_label: "Cal é o motivo da suspensión? Este texto <b>será visíbel para todo o mundo</b> na páxina do perfil deste usuario e amosaráselle ao usuario cando tente iniciar sesión. Procura ser breve."
+        suspend_reason: "Razón"
+        suspended_by: "Suspendido por"
+        delete_all_posts: "Eliminar todas as publicacións"
+        delete_all_posts_confirm: "Confirmas a eliminación de %{posts} publicacións e %{topics} temas?"
+        suspend: "Suspender"
+        unsuspend: "Non suspender"
+        suspended: "Suspendido?"
+        moderator: "Moderador?"
+        admin: "Administrador?"
+        blocked: "Bloqueado?"
+        staged: "Transitorio?"
+        show_admin_profile: "Administración"
+        edit_title: "Editar título"
+        save_title: "Gardar título"
+        refresh_browsers: "Forzar a actualización do navegador"
+        refresh_browsers_message: "Mensaxe enviada a todos os clientes."
+        show_public_profile: "Amosar o perfil público"
+        impersonate: 'Suplantar'
+        ip_lookup: "Busca de IP"
+        log_out: "Saír da sesión"
+        logged_out: "O usuario foi desconectado en todos os dispositivos"
+        revoke_admin: 'Revogar administrador'
+        grant_admin: 'Facer administrador'
+        revoke_moderation: 'Revogar moderación'
+        grant_moderation: 'Conceder moderación'
+        unblock: 'Desbloquear'
+        block: 'Bloquear'
+        reputation: Reputación
+        permissions: Permisos
+        activity: Actividade
+        like_count: Gústames dados / Recibidos
+        last_100_days: 'nos últimos 100 días'
+        private_topics_count: Temas privados
+        posts_read_count: Publicacións lidas
+        post_count: Publicacións creadas
+        topics_entered: Temas vistos
+        flags_given_count: Denuncias dadas
+        flags_received_count: Denuncias recibidas
+        warnings_received_count: Avisos recibidos
+        flags_given_received_count: 'Denuncias dadas / Recibidas'
+        approve: 'Aprobar'
+        approved_by: "aprobado por"
+        approve_success: "Usuario aprobado, enviouse un correo-e coas instrucións de activación."
+        approve_bulk_success: "Todos os usuarios seleccionados foron aprobados e notificados."
+        time_read: "Tempo de lectura"
+        anonymize: "Facer o usuario anónimo"
+        anonymize_confirm: "Confirmas que desexas converter esta conta en anónima? Cambiaranse o nome do usuario e o correo electrónico e restabelecerase toda a información do perfil."
+        anonymize_yes: "Si, converter a conta en anónima"
+        anonymize_failed: "Produciuse un problema convertendo a conta en anónima."
+        delete: "Eliminar usuario"
+        delete_forbidden_because_staff: "Non é posíbel eliminiar os administradores e moderadores."
+        delete_posts_forbidden_because_staff: "Non é posíbel eliminar todas as publicacións dos administradores ou moderadores."
+        delete_forbidden:
+          one: "Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} día)"
+          other: "Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} días)"
+        cant_delete_all_posts:
+          one: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} día. (o axuste delete_user_max_post_age.)"
+          other: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} días. (o axuste delete_user_max_post_age.)"
+        cant_delete_all_too_many_posts:
+          one: "Non é posíbel eliminar todas as publicacións porque o usuario ten máis dunha publicación.  (delete_all_posts_max)"
+          other: "Non é posíbel eliminar todas as publicacións porque o usuario ten máis de %{count} publicacións.  (delete_all_posts_max)"
+        delete_confirm: "CONFIRMAS a eliminación deste usuario? Non se poderá desfacer!"
+        delete_and_block: "Eliminar e <b>bloquear</b> este correo-e e enderezo IP"
+        delete_dont_block: "Só eliminar"
+        deleted: "Eliminouse o usuario."
+        delete_failed: "Produciuse un erro eliminando este usuario. Asegúrate que se eliminan todas as publicacións antes de tentar eliminar o usuario."
+        send_activation_email: "Enviar correo-e de activación"
+        activation_email_sent: "Enviouse un correo electrónico de activación."
+        send_activation_email_failed: "Produciuse un problema enviando outro correo-e de activación. %{error}"
+        activate: "Activar conta"
+        activate_failed: "Produciuse un problema activando o usuario."
+        deactivate_account: "Desactivar a conta"
+        deactivate_failed: "Produciuse un problema desactivando o usuario."
+        unblock_failed: 'Produciuse un problema desbloqueando o usuario.'
+        block_failed: 'Produciuse un problema bloqueando o usuario.'
+        block_confirm: 'Confirmas o bloqueo deste usuario? Non poderá crear máis temas nin publicacións.'
+        block_accept: 'Si, bloquealo'
+        deactivate_explanation: "Un usuario desactivado debe revalidar o seu correo-e."
+        suspended_explanation: "Un usuario suspendido non pode iniciar sesión."
+        block_explanation: "Un usuario bloquedo non pode publicar nin iniciar temas."
+        stage_explanation: "Un usuario transitorio só pode publicar por correo electrónico en temas específicos."
+        trust_level_change_failed: "Produciuse un problema cambiando o nivel de confianza do usuario."
+        suspend_modal_title: "Suspender usuario"
+        trust_level_2_users: "Usuarios con nivel 2 de confianza"
+        trust_level_3_requirements: "Requirimentos para o nivel de confianza 3"
+        trust_level_locked_tip: "o nivel de confianza está bloqueado, o sistema non promocionará nin rebaixará o usuario"
+        trust_level_unlocked_tip: "o nivel de confianza está desbloqueado, o sistema pode promocionar ou rebaixar o usuario"
+        lock_trust_level: "Bloquear o nivel de confianza"
+        unlock_trust_level: "Desbloquear o nivel de confianza"
+        tl3_requirements:
+          title: "Requerimentos para o nivel 3 de confianza"
+          table_title: "Nos últimos %{time_period} días:"
+          value_heading: "Valor"
+          requirement_heading: "Requirimento"
+          visits: "Visitas"
+          days: "días"
+          topics_replied_to: "Temas os que respondeu"
+          topics_viewed: "Temas vistos"
+          topics_viewed_all_time: "Temas vistos (todo o tempo)"
+          posts_read: "Publicacións lidas"
+          posts_read_all_time: "Publicacións lidas (todo o tempo)"
+          flagged_posts: "Publicacións denunciadas"
+          flagged_by_users: "Usuarios que denunciaron"
+          likes_given: "Gústames dados"
+          likes_received: "Gústames recibidos"
+          likes_received_days: "Gústames recibidos: por días"
+          likes_received_users: "Gústames recibidos: usuarios"
+          qualifies: "Cumpre os requisitos para o nivel de confianza 3."
+          does_not_qualify: "Non cumpre os requisitos para o nivel de confianza 3."
+          will_be_promoted: "Será promocionado pronto."
+          will_be_demoted: "Será rebaixado pronto."
+          on_grace_period: "Actualmente ne periodo de graza da promoción, non será rebaixado"
+          locked_will_not_be_promoted: "Nivel de confianza bloqueado. Non se promocionará nunca."
+          locked_will_not_be_demoted: "Nivel de confianza bloqueado. Non será rebaixado nunca."
+        sso:
+          title: "Inicio de sesión simple"
+          external_id: "ID externo"
+          external_username: "Nome do usuario"
+          external_name: "Nome"
+          external_email: "Correo electrónico"
+          external_avatar_url: "URL da imaxe do perfil"
+      user_fields:
+        title: "Campos do usuario"
+        help: "Engade campos que os usuarios poidan encher."
+        create: "Crear un campo de usuario"
+        untitled: "Sen título"
+        name: "Nome do campo"
+        type: "TIpo de campo"
+        description: "Descrición do campo"
+        save: "Gardar"
+        edit: "Editar"
+        delete: "Eliminar"
+        cancel: "Cancelar"
+        delete_confirm: "Confirmas a eliminación deste campo do usuario?"
+        options: "Opcións"
+        required:
+          title: "Requirido para rexistrarse?"
+          enabled: "obrigatorio"
+          disabled: "non obrigatorio"
+        editable:
+          title: "Editábel despois do rexistro?"
+          enabled: "editábel"
+          disabled: "non editábel"
+        show_on_profile:
+          title: "Amosar no perfil público?"
+          enabled: "amosado no perfil"
+          disabled: "non amosado no perfil"
+        field_types:
+          text: 'Campo de texto'
+          confirm: 'Confirmación'
+          dropdown: "Despregábel"
+      site_text:
+        description: "Podes personalizar calquera texto do teu foro. Comeza por buscar debaixo:"
+        search: "Busca o texto que queres editar"
+        title: 'Contido do texto'
+        edit: 'editar'
+        revert: "Reverter os cambios"
+        revert_confirm: "Confirmas a reversión dos cambios?"
+        go_back: "Volver á busca"
+        recommended: "Recomendamos personalizar o seguinte texto para axeitalo ás túas necesidades:"
+        show_overriden: 'Amosar só os cambios'
+      site_settings:
+        show_overriden: 'Amosar só os cambios'
+        title: 'Axustes'
+        reset: 'restabelecer'
+        none: 'ningunha'
+        no_results: "Non se atoparon resultados."
+        clear_filter: "Borrar"
+        add_url: "engadir URL"
+        add_host: "engadir host"
+        categories:
+          all_results: 'Todas'
+          required: 'Obrigatorio'
+          basic: 'Configuración básica'
+          users: 'Usuarios'
+          posting: 'Publicación'
+          email: 'Correo electrónico'
+          files: 'Ficheiros'
+          trust: 'Niveis de confianza'
+          security: 'Seguranza'
+          onebox: "Onebox"
+          seo: 'SEO'
+          spam: 'Spam'
+          rate_limits: 'Límites de frecuencia'
+          developer: 'Desenvolvedor'
+          embedding: "Encaixado"
+          legal: "Legal"
+          uncategorized: 'Outro'
+          backups: "Copias de seguranza"
+          login: "Iniciar sesión"
+          plugins: "Plugins"
+          user_preferences: "Preferencias do usuario"
+      badges:
+        title: Insignias
+        new_badge: Nova insignia
+        new: Novo
+        name: Nome
+        badge: Insignia
+        display_name: Nome público
+        description: Descrición
+        badge_type: Tipo de insignia
+        badge_grouping: Grupo
+        badge_groupings:
+          modal_title: Grupos de insignias
+        granted_by: Concedido por
+        granted_at: Concedido
+        reason_help: (Ligazón a unha publicación ou tema)
+        save: Gardar
+        delete: Eliminar
+        delete_confirm: Confirmas a eliminación desta insignia?
+        revoke: Revogar
+        reason: Razón
+        expand: Expandir &hellip;
+        revoke_confirm: Confirmas a revogación desta insignia?
+        edit_badges: Editar insignias
+        grant_badge: Conceder insignia
+        granted_badges: Insignias concedidas
+        grant: Conceder
+        no_user_badges: "A %{name} non se lle concedeu ningunha insignia."
+        no_badges: Non hai insignias para conceder.
+        none_selected: "Selecciona unha insignia para comezar"
+        allow_title: Permitir que se use a insignia como un título
+        multiple_grant: Pode concederse múltiples veces
+        listable: Amosar a insignia na páxina de insignias públicas
+        enabled: Activar insignia
+        icon: Icona
+        image: Imaxe
+        icon_help: "Usar a clase Font Awesome ou unha URL a unha imaxe"
+        query: Consulta sobre insignia (SQL)
+        target_posts: Consulta dirixida a mensaxes
+        auto_revoke: Executar a consulta de revogación diariamente
+        show_posts: Amosar a publicación concedendo a insignia na páxina das insignias
+        trigger: Activador
+        trigger_type:
+          none: "Actualizar diariamente"
+          post_action: "Cando un usuario actúa sobre unha publicación"
+          post_revision: "Cando un usuario edita ou crea unha publicación"
+          trust_level_change: "Cando un usuario cambia o nivel de confianza"
+          user_change: "Cando se crea ou edita un usuario"
+        preview:
+          link_text: "Previsualizar as insignias concedidas"
+          plan_text: "Vista previa do plan da consulta"
+          modal_title: "Previsualizar a consulta de insignias"
+          sql_error_header: "Produciuse un erro coa consulta."
+          error_help: "Busca axuda nas seguintes ligazóns sobre consultas de insignias."
+          bad_count_warning:
+            header: "AVISO"
+            text: "Faltan algunhas mostras para a concesión da insignia. Isto acontece cando a consulta sobre insignias devolve unha ID do usuario, ou de publicacións que non existen. Pode causar resultados inesperados posteriormente. Revisa outra vez a solicitude."
+          no_grant_count: "Non hai insignias para asignar."
+          grant_count:
+            one: "<b>1</b> insignia para asignar."
+            other: "<b>%{count}</b> insignias para asignar."
+          sample: "Mostra:"
+          grant:
+            with: <span class="username">%{username}</span>
+            with_post: <span class="username">%{username}</span> para publicación en %{link}
+            with_post_time: <span class="username">%{username}</span> para publicación en %{link} o <span class="time">%{time}</span>
+            with_time: <span class="username">%{username}</span> o <span class="time">%{time}</span>
+      emoji:
+        title: "Emoji"
+        help: "Engade novo emoji que estará dispoñíbel para todos. (Suxestión: arrastra e solta múltiples ficheiros dunha vez)"
+        add: "Engadir novo Emoji"
+        name: "Nome"
+        image: "Imaxe"
+        delete_confirm: "Confirmas a eliminación do emoji :%{name}:?"
+      embedding:
+        get_started: "Se queres encaixar o Discourse noutro sitio web, comeza engadindo o seu host."
+        confirm_delete: "Confirmas a eliminación deste host?"
+        sample: "Usa o seguinte código HTML no teu sitio para crear e encaixar temas do Discourse. Substitúe <b>REPLACE_ME</b> pola URL canónica da páxina que recibe o encaixado. "
+        title: "Encaixado"
+        host: "Hosts permitidos"
+        edit: "editar"
+        category: "Publicación a categoría"
+        add_host: "Engadir host"
+        settings: "Axustes para o encaixado"
+        feed_settings: "Axustes das fontes"
+        feed_description: "Dotar dunha fonte RSS/ATOM o teu sitio pode mellorar a capacidade de Discourse para importar o teu contido."
+        crawling_settings: "Axustes do extractor"
+        crawling_description: "Cando o Discourse crea temas para as túas publicacións, se non existe unha fonte RSS/ATOM, tentará analizar o contido do teu HTML. Ás veces pode ser difícil extraer o contido, por iso damos a posibilidade de especificar as regras do CSS para facilitar a extracción."
+        embed_by_username: "Nome do usuario para crear o tema"
+        embed_post_limit: "Número máximo de publicacións a encaixar"
+        embed_username_key_from_feed: "Clave para extraer da fonte o nome do usuario do discourse"
+        embed_truncate: "Truncar as publicacións encaixadas"
+        embed_whitelist_selector: "Selector CSS de elementos permitidos nos encaixados"
+        embed_blacklist_selector: "Selector CSS para elementos retirados nos encaixados"
+        feed_polling_enabled: "Importar publicacións vía RSS/ATOM"
+        feed_polling_url: "URL da fonte RSS/ATOM para facer a extracción"
+        save: "Gardar axustes de encaixado"
+      permalink:
+        title: "Ligazóns permanentes"
+        url: "URL"
+        topic_id: "ID do tema"
+        topic_title: "Tema"
+        post_id: "ID da publicación"
+        post_title: "Publicación"
+        category_id: "ID da categoría"
+        category_title: "Categoría"
+        external_url: "URL externa"
+        delete_confirm: Confirmas a eliminación desta ligazón permanente?
+        form:
+          label: "Novo:"
+          add: "Engadir"
+          filter: "Buscar (URLou URL externa)"
+    lightbox:
+      download: "descargar"
+    search_help:
+      title: 'Buscar axuda'
+    keyboard_shortcuts_help:
+      title: 'Atallos do teclado'
+      jump_to:
+        title: 'Ir a'
+        home: '<b>g</b>, <b>h</b> Inicio'
+        latest: '<b>g</b>, <b>l</b> Último'
+        new: '<b>g</b>, <b>n</b> Novo'
+        unread: '<b>g</b>, <b>u</b> Sen ler'
+        categories: '<b>g</b>, <b>c</b> Categorías'
+        top: '<b>g</b>, <b>t</b> Arriba'
+        bookmarks: '<b>g</b>, <b>b</b> Marcadores'
+        profile: '<b>g</b>, <b>p</b> Perfil'
+        messages: '<b>g</b>, <b>m</b> Mensaxes'
+      navigation:
+        title: 'Navegación'
+        jump: '<b>#</b> Ir á publicación #'
+        back: '<b>u</b> Volver'
+        up_down: '<b>k</b>/<b>j</b> Mover selección &uarr; &darr;'
+        open: '<b>o</b> ou <b>Intro</b> Abrir tema seleccionado'
+        next_prev: '<b>maiús.</b>+<b>j</b>/<b>maiús.</b>+<b>k</b> Sección Seguinte/Anterior'
+      application:
+        title: 'Aplicativo'
+        create: '<b>c</b> Crear un novo tema'
+        notifications: '<b>n</b> Abrir notificacións'
+        hamburger_menu: '<b>=</b> Abrir o menú hamburguesa'
+        user_profile_menu: '<b>p</b> Abrir o menú do usuario'
+        show_incoming_updated_topics: '<b>.</b> Amosar temas actualizados'
+        search: '<b>/</b> Buscar'
+        help: '<b>?</b> Abrir a axuda do teclado'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Desbotar Novas/Publicacións'
+        dismiss_topics: '<b>x</b>, <b>t</b> Desbotar temas'
+        log_out: '<b>maiús.</b>+<b>z</b> <b>maiús.</b>+<b>z</b> Saír da sesión'
+      actions:
+        title: 'Accións'
+        bookmark_topic: '<b>f</b> Cambiar marcar tema'
+        pin_unpin_topic: '<b>Maiús</b>+<b>p</b> Pegar/Despegar tema'
+        share_topic: '<b>maiús.</b>+<b>s</b> Compartir tema'
+        share_post: '<b>s</b> Compartir publicación'
+        reply_as_new_topic: '<b>t</b> Responder como tema ligado'
+        reply_topic: '<b>maiús.</b>+<b>r</b> Responder o tema'
+        reply_post: '<b>r</b> Responder a publicación'
+        quote_post: '<b>q</b> Citar publicación'
+        like: '<b>l</b> Gústame a publicación'
+        flag: '<b>!</b> Denunciar publicación'
+        bookmark: '<b>b</b> Marcar publicación'
+        edit: '<b>e</b> Editar publicación'
+        delete: '<b>d</b> Eliminar publicación'
+        mark_muted: '<b>m</b>, <b>m</b> Silenciar tema'
+        mark_regular: '<b>m</b>, <b>r</b> Tema normal (predeterminado)'
+        mark_tracking: '<b>m</b>, <b>t</b> Seguir tema'
+        mark_watching: '<b>m</b>, <b>w</b> Ver tema'
+    badges:
+      earned_n_times:
+        one: "Conseguiu esta insignia unha vez"
+        other: "Conseguiu esta insignia %{count} veces"
+      title: Insignias
+      badge_count:
+        one: "1 insignia"
+        other: "%{count} insignias"
+      more_badges:
+        one: "1 máis"
+        other: "%{count} máis"
+      granted:
+        one: "1 concedido"
+        other: "%{count} concedidos"
+      select_badge_for_title: Selecciona insignia para usar como o teu título
+      none: "<none>"
+      badge_grouping:
+        getting_started:
+          name: Comezar
+        community:
+          name: Comunidade
+        trust_level:
+          name: Nivel de confianza
+        other:
+          name: Outro
+        posting:
+          name: Publicación
+    google_search: |
+      <h3>Buscar no Google</h3>
+      <p>
+        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+          <input type="text" id='user-query' value="">
+          <input type='hidden' id='google-query' name="q">
+          <button class="btn btn-primary">Google</button>
+        </form>
+      </p>
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index c2a191f2ae..8572aba7dc 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -265,7 +265,6 @@ he:
         one: " בנושא זה ישנה הודעה אחת הממתינה לאישור"
         other: "בפוסט זה ישנם <b>{{count}}</b>  הודעות הממתינות לאישור"
       confirm: "שמור שינויים"
-      delete_prompt: "אתה בטוח שאתה רוצה למחוק את המשתמש <b>%{username}</b>? פעולה זו תמחק את כל ההודעות , תחסום את הדואר האלקטרוני וכתובת ה-IP של המשתמש."
       approval:
         title: "ההודעה זקוקה לאישור"
         description: "קיבלנו את הודעתך אך נדרש אישור של מנחה לפני שההודעה תוצג, אנא המתן בסבלנות."
@@ -419,9 +418,7 @@ he:
         perm_default: "הדלק התראות"
         perm_denied_btn: "הרשאות נדחו"
         disable: "כבה התראות"
-        currently_enabled: "(כרגע מאופשר)"
         enable: "אפשר התראות"
-        currently_disabled: "(כרגע לא מאופשר)"
         each_browser_note: "הערה: עליך לשנות הגדרה זו עבור כל דפדפן בנפרד."
       dismiss_notifications: "סימון הכל כנקרא"
       dismiss_notifications_tooltip: "סימון כל ההתראות שלא נקראו כהתראות שנקראו"
@@ -686,8 +683,6 @@ he:
       value_prop: "כשאתה נרשם, אנחנו זוכרים בדיוק מה קראת כך כשאתה חוזר אתה ממשיך בדיוק מאיפה שהפסקת. בנוסף אתה תקבל התראות דרך האתר ודרך הדואר האלקטרוני שלך כשפוסטים חדשים נוצרים ועוד משהו, אתה יכול לעשות לייק לפוסטים שאהבת. :heartbeat:"
     summary:
       enabled_description: "אתם צופים בסיכום פוסט זה: הפרסומים המעניינים ביותר כפי שסומנו על ידי הקהילה."
-      description: "ישנן <b> {{replyCount}}</b> תגובות"
-      description_time: "ישנן  <b>{{replyCount}}</b> תגובות, עם הערכת זמן קריאה של כ- <b>{{readingTime}}  דקות </b>."
       enable: 'סכם פוסט זה'
       disable: 'הצג את כל ההודעות'
     deleted_filter:
@@ -855,7 +850,6 @@ he:
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -957,9 +951,6 @@ he:
         category: "אין פוסטים בקטגוריה {{category}}."
         top: "אין פוסטים מובילים."
         search: "אין תוצאות חיפוש"
-        educate:
-          new: '<p>הפוסטים החדשים שלך יופיעו כאן.</p><p> כברירת מחדל, פוסטים נחשבים חדשים ויופיעו עם האינדיקציה <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"> חדש </span> אם הם נוצרו ב-2 הימים האחרונים. .</p><p> תוכלו לשנות זאת ב <a href="%{userPrefsUrl}">העדפות </a>.</p>'
-          unread: '<p> הפוסטים הלא-נקראים שלך מופיעים כאן.</p><p>כברירת מחדל פוסטים נחשבים ככאלה שלא נקראו ויוצגו כ- <span class="badge new-posts badge-notification">1</span> אם את/ה:</p><ul><li> יצרת את הפוסט</li></ul><p>או אם כיוונתם את הנושא הזה להיות תחת מעקב או צפייה באמצעות כפתור ההתראות שבתחתית כל פוסט. </p><p> את/ה יכולים לשנות זאת ב<a href="%{userPrefsUrl}">העדפות</a>.</p>'
       bottom:
         latest: "אין עוד פוסטים מדוברים."
         hot: "אין עוד פוסטים חמים."
@@ -1299,18 +1290,6 @@ he:
           bookmark: "בטל העדפה"
           like: "בטל לייק"
           vote: "בטל הצבעה"
-        people:
-          off_topic: "{{icons}} סומן כמחוץ לנושא הפוסט"
-          spam: "{{icons}} סומן כספאם"
-          spam_with_url: "{{icons}} סימון <a href='{{postUrl}}'> של זה כספאם </a>"
-          inappropriate: "{{icons}} סומן בלתי ראוי"
-          notify_moderators: "{{icons}} הודיעו למנהלים"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>הודיעו למנהלים</a>"
-          notify_user: "{{icons}} שלח הודעה"
-          notify_user_with_url: "{{icons}}  שלח <a href='{{postUrl}}'>הודעה</a>"
-          bookmark: "{{icons}} סימנו כמועדף"
-          like: "{{icons}} נתנו לייק"
-          vote: "{{icons}} הצביעו עבור זה"
         by_you:
           off_topic: "סמנת פרסום זה כמחוץ לנושא הפוסט"
           spam: "סמנת את זה כספאם"
@@ -1462,7 +1441,6 @@ he:
           description: "לא תקבלו התראות על נושאים חדשים בקטגוריות אלו, והם לא יופיעו בעמוד הלא נקראו שלך."
     flagging:
       title: 'תודה על עזרתך לשמירה על תרבות הקהילה שלנו!'
-      private_reminder: 'דגלים הם פרטיים וניתנים לצפייה ע"י הצוות <b>בלבד</b>'
       action: 'סימון פרסום'
       take_action: "בצע פעולה"
       notify_action: 'הודעה'
@@ -1474,7 +1452,6 @@ he:
       submit_tooltip: "שידור הסימון  כ \"פרטי\""
       take_action_tooltip: "הגעה באופן מיידי למספר הסימונים האפשרי, במקום להמתין לסימונים נוספים מן הקהילה"
       cant: "סליחה, לא ניתן לסמן הודעה זו כרגע."
-      notify_staff: 'התרע למשתמש'
       formatted_name:
         off_topic: "מחוץ לנושא הפוסט"
         inappropriate: "לא ראוי"
@@ -1835,11 +1812,9 @@ he:
             is_disabled: "שחזור אינו מאופשר לפי הגדרות האתר."
             label: "שחזר"
             title: "שחזר את הגיבוי"
-            confirm: "אתה בטוח שברצונך לשחזר את הגיבוי הזה?"
           rollback:
             label: "חזור לאחור"
             title: "הזחר את מסד הנתונים למצב עבודה קודם"
-            confirm: "אתה בטוח שברצונך להחזיר את מסד הנתונים למצב עבודה קודם?"
       export_csv:
         user_archive_confirm: "האם את/ה בטוח/ה שאתם רוצים להוריד את הפרסומים שלכם?"
         success: "יצוא החל, תקבלו הודעה כשהתהליך יסתיים"
@@ -1941,9 +1916,6 @@ he:
           love:
             name: 'חבב'
             description: "צבע הרקע של הכפתור \"חבב\""
-          wiki:
-            name: 'ויקי'
-            description: "צבעי יסוד משמשים כצבעי רקע בפרסומי ויקי."
       email:
         settings: "הגדרות"
         preview_digest: "תצוגה מקדימה של סיכום"
@@ -2466,8 +2438,6 @@ he:
         mark_watching: '<b>m</b>, <b>w</b>צפייה בפוסט'
     badges:
       title: תגים
-      allow_title: "יכול לשמש ככותרת"
-      multiple_grant: "יכול להיות מוענק מספר פעמים"
       badge_count:
         one: "תג אחד"
         other: "%{count} תגים"
@@ -2490,97 +2460,6 @@ he:
           name: אחר
         posting:
           name: פרסום
-      badge:
-        editor:
-          name: עורך
-          description: עריכה ראשונה של פוסט
-        basic_user:
-          name: בסיסי
-          description: <a href="https://meta.d הפעולות הקהילתיות הבסיסיותiscourse.org/t/what-do-user-trust-levels-do/4924/4">מאושרות</a> כל
-        member:
-          name: חבר/ה
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">הענקת</a> הזמנות
-        regular:
-          name: רגיל/ה
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">הענקת</a> קטרוג מחודש, שינוי שם, קישורים עוקבים ולאונג'
-        leader:
-          name: מוביל/ה
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">הענקת</a> עריכה גלובלית, הצמדה, סגירה, ארכוב, פיצול ומיזוג
-        welcome:
-          name: ברוכים הבאים
-          description: קיבל לייק
-        autobiographer:
-          name: אוטוביוגרפר/ית?
-          description: פרופיל <a href="/my/preferences">מידע</a> משתמש
-        anniversary:
-          name: יום השנה
-          description: חבר/ה פעיל/ה במשך שנה, פרסמ/ה לפחות פעם אחת
-        nice_post:
-          name: פרסום נחמד
-          description: קיבל/ה 10 לייקים על הפוסט. תג זה ניתן להעניק שוב ושוב ללא הגבלה
-        good_post:
-          name: פרסום מוצלח
-          description: קיבל/ה 25 לייקים על הפוסט. תג זה ניתן להעניק שוב ושוב ללא הגבלה
-        great_post:
-          name: פרסום מצויין
-          description: קבלת 50 לייקים על פרסום. תג זה יכול להיות מוענק מספר פעמים
-        nice_topic:
-          name: פוסט נחמד
-          description: קיבל/ה 10 לייקים על פוסט. תג זה יכול להיות מוענק כמה פעמים
-        good_topic:
-          name: פוסט טוב
-          description: קיבל/ה 25 לייקים על הפוסט. תג זה יכול להיות מוענק כמה פעמים
-        great_topic:
-          name: פוסט מצויין
-          description: קיבל/ה 50 לייקים על הפוסט. תג זה יכול להיות מוענק מספר פעמים
-        nice_share:
-          name: שיתוף נחמד
-          description: שיתפ/ה פרסום עם 25 מבקרים ייחודיים
-        good_share:
-          name: שיתוף טוב
-          description: שיתפ/ה פרסום עם 300 מבקרים ייחודיים
-        great_share:
-          name: שיתוף מעולה
-          description: חלק/ה פרסום עם 1000 מבקרים ייחודיים
-        first_like:
-          name: לייק ראשון
-          description: חיבב/ה פרסום
-        first_flag:
-          name: סימון ראשון
-          description: סימן/סימנה פרסום
-        promoter:
-          name: מקדם
-          description: הזמן משתמש
-        campaigner:
-          name: קמפיינר
-          description: הזמן 3 משתמשים בסיסים (דרגת אמון 1)
-        champion:
-          name: אלוף
-          description: הזמן 5 משתמשים (דרגת אמון 2)
-        first_share:
-          name: שיתוף ראשון
-          description: שיתף/שיתפה פרסום
-        first_link:
-          name: קישור (link) ראשון
-          description: הוסיף/הוסיפה קישור פנימי לפוסט אחר
-        first_quote:
-          name: ציטוט ראשון
-          description: ציטוט משתמש
-        read_guidelines:
-          name: קריאת כללים מנחים
-          description: קראו את <a href="/guidelines">הכללים המנחים של הקהילה</a>
-        reader:
-          name: מקראה
-          description: קראו כל פרסום בפוסט עם יותר מ-100 פרסומים
-        popular_link:
-          name: לינק פופלארי
-          description: פרסם קישור חיצוני עם לפחות 50 לחיצות
-        hot_link:
-          name: קישור חם
-          description: פרסם קישור חיצוני עם לפחות 300 לחיצות
-        famous_link:
-          name: קישור מפורסם
-          description: פרסם קישור חיצוני עם לפחות 1000 לחיצות
     google_search: |
       <h3>חפש עם גוגל</h3>
       <p>
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 6809b9a58f..32c523008a 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -475,26 +475,6 @@ id:
         search: '<b>/</b> Cari'
       actions:
         title: 'Aksi'
-    badges:
-      badge:
-        first_quote:
-          name: Kutipan Pertama
-          description: Kutip pengguna
-        read_guidelines:
-          name: Baca Pedoman
-          description: Baca <a href="/guidelines">pedoman komunitas</a>
-        reader:
-          name: Pembaca
-          description: Baca setiap pos di sebuah topik dengan lebih dari 100 pos
-        popular_link:
-          name: Tautan Populer
-          description: Pos sebuah tautan eksternal dengan setidaknya 50 klik
-        hot_link:
-          name: Tautan
-          description: Pos sebuah tautan eksternal dengan setidaknya 300 klik
-        famous_link:
-          name: Tautan terkenal
-          description: Pos sebuah tautan eksternal dengan setidaknya 1000 klik
     google_search: |
       <h3>Cari dengan Google</h3>
       <p>
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 70cc7e88cc..58e6d10646 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -100,6 +100,8 @@ it:
         x_years:
           one: "1 anno dopo"
           other: "%{count} anni dopo"
+      previous_month: 'Mese Precedente'
+      next_month: 'Mese Successivo'
     share:
       topic: 'Condividi un link a questa conversazione'
       post: 'messaggio n°%{postNumber}'
@@ -253,7 +255,6 @@ it:
         one: "Questo argomento ha <b>1</b> messaggio in attesa di approvazione"
         other: "Questo argomento ha <b>{{count}}</b> messaggi in attesa di approvazione"
       confirm: "Salva Modifiche"
-      delete_prompt: "Sei sicuro di voler eliminare <b>%{username}</b>? Ciò cancellerà tutti i suoi messaggi e bloccherà il suo indirizzo email e l'IP."
       approval:
         title: "Il Messaggio Richiede Approvazione"
         description: "Abbiamo ricevuto il tuo messaggio ma prima che appaia è necessario che venga approvato da un moderatore. Per favore sii paziente."
@@ -310,7 +311,10 @@ it:
         one: "gruppo"
         other: "gruppi"
       members: "Membri"
+      topics: "Argomenti"
       posts: "Messaggi"
+      mentions: "Menzioni"
+      messages: "Messaggi"
       alias_levels:
         title: "Chi può inviare @menzionare e inviare messaggi a questo gruppo?"
         nobody: "Nessuno"
@@ -416,9 +420,7 @@ it:
         perm_default: "Attiva Notifiche"
         perm_denied_btn: "Permesso Negato"
         disable: "Disabilita Notifiche"
-        currently_enabled: "(attualmente attivate)"
         enable: "Abilita Notifiche"
-        currently_disabled: "(attualmente disabilitate)"
         each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi."
       dismiss_notifications: "Imposta tutti come Letti"
       dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette "
@@ -453,7 +455,6 @@ it:
       muted_users: "Silenziati"
       muted_users_instructions: "Occulta tutte le notifiche da questi utenti."
       muted_topics_link: "Mostra argomenti silenziati"
-      automatically_unpin_topics: "Spunta automaticamente gli argomenti quando arrivi in fondo."
       staff_counters:
         flags_given: "segnalazioni utili"
         flagged_posts: "messaggi segnalati"
@@ -553,6 +554,9 @@ it:
         title: "Targhetta Scheda Utente"
       website: "Sito Web"
       email_settings: "Email"
+      like_notification_frequency:
+        always: "Sempre"
+        never: "Mai"
       email_digests:
         title: "Quando non visito il sito, invia un riassunto delle novità per email: "
         daily: "ogni giorno"
@@ -884,7 +888,6 @@ it:
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -989,9 +992,6 @@ it:
         category: "Non ci sono argomenti in {{category}}."
         top: "Non ci sono argomenti di punta."
         search: "Non ci sono risultati della ricerca."
-        educate:
-          new: '<p>Qui compaiono i tuoi nuovi argomenti.</p><p>Per difetto, gli argomenti creati negli ultimi 2 giorni saranno considerati nuovi e mostreranno l''indicatore <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nuovo</span>.</p><p>Puoi cambiare questa configurazione nelle tue <a href="%{userPrefsUrl}">preferenze</a>.</p>'
-          unread: '<p>Qui compaiono i tuoi argomenti non letti.</p><p>Per difetto, gli argomenti sono considerati non letti e mostrano un conteggio di non lettura <span class="badge new-posts badge-notification">1</span> se hai:</p><ul><li>Creato l''argomento</li><li>Risposto all''argomento</li><li>Letto l''argomento per più di 4 minuti</li></ul><p>Oppure se hai esplicitamente impostato l''argomento come Seguito o Osservato usando il pannello di controllo delle notifiche in fondo ad ogni argomento.</p><p>Puoi cambiare questa configurazione nelle tue <a href="%{userPrefsUrl}">preferenze</a>.</p>'
       bottom:
         latest: "Non ci sono altri argomenti più recenti."
         hot: "Non ci sono altri argomenti caldi."
@@ -1356,17 +1356,10 @@ it:
           like: "Annulla il \"Mi piace\""
           vote: "Rimuovi voto"
         people:
-          off_topic: "{{icons}} l'hanno segnalato come fuori tema"
-          spam: "{{icons}} l'hanno segnalato come spam"
-          spam_with_url: "{{icons}} ha segnalato <a href='{{postUrl}}'>questo come spam</a>"
-          inappropriate: "{{icons}} l'hanno segnalato come inappropriato"
-          notify_moderators: "{{icons}} hanno informato i moderatori"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>hanno informato i moderatori</a>"
-          notify_user: "{{icons}} ha inviato un messaggio"
-          notify_user_with_url: "{{icons}} ha inviato un <a href='{{postUrl}}'>messaggio</a>"
-          bookmark: "{{icons}} l'hanno inserito nei segnalibri"
-          like: "A {{icons}} è piaciuto"
-          vote: "{{icons}} l'hanno votato"
+          off_topic: "l'hanno segnalato come fuori tema"
+          spam: "l'hanno segnalato come spam"
+          inappropriate: "l'hanno segnalato come inappropriato"
+          notify_moderators: "hanno informato i moderatori"
         by_you:
           off_topic: "L'hai segnalato come fuori tema"
           spam: "L'hai segnalato come spam"
@@ -1518,7 +1511,6 @@ it:
           description: "Non ti verrà mai notificato nulla sui nuovi argomenti di queste categorie, e non compariranno nell'elenco dei Non letti."
     flagging:
       title: 'Grazie per aiutarci a mantenere la nostra comunità civile!'
-      private_reminder: 'le segnalazioni sono private, visibili <b>soltanto</b> allo staff  '
       action: 'Segnala Messaggio'
       take_action: "Procedi"
       notify_action: 'Messaggio'
@@ -1530,7 +1522,6 @@ it:
       submit_tooltip: "Invia la segnalazione privata"
       take_action_tooltip: "Raggiungi la soglia di segnalazioni immediatamente, piuttosto che aspettare altre segnalazioni della comunità"
       cant: "Spiacenti, al momento non puoi segnalare questo messaggio."
-      notify_staff: 'Notifica Staff'
       formatted_name:
         off_topic: "E' fuori tema"
         inappropriate: "È inappropriato"
@@ -1906,11 +1897,9 @@ it:
             is_disabled: "Il ripristino è disabilitato nelle opzioni del sito."
             label: "Ripristina"
             title: "Ripristina il backup"
-            confirm: "Sicuro di voler ripristinare questo backup?"
           rollback:
             label: "Rollback"
             title: "Ripristina il database a una versione funzionante precedente"
-            confirm: "Sicuro di voler ripristinare una precedente versione funzionante del database?"
       export_csv:
         user_archive_confirm: "Sei sicuro di voler scaricare i tuoi messaggi?"
         success: "Esportazione iniziata, verrai avvertito con un messaggio al termine del processo."
@@ -2013,9 +2002,6 @@ it:
           love:
             name: 'amo'
             description: "Il colore del bottone \"Mi piace\"."
-          wiki:
-            name: 'wiki'
-            description: "Colore base usato per lo sfondo dei messaggi wiki."
       email:
         settings: "Impostazioni"
         templates: "Template"
@@ -2551,10 +2537,7 @@ it:
         mark_tracking: '<b>m</b>, <b>t</b> Segui argomento'
         mark_watching: '<b>m</b>, <b>w</b> Osserva argomento'
     badges:
-      more_with_badge: "Altri con questa targhetta"
       title: Targhette
-      allow_title: "può essere usata come titolo"
-      multiple_grant: "può essere assegnata più volte"
       badge_count:
         one: "1 Targhetta"
         other: "%{count} Targhette"
@@ -2577,97 +2560,6 @@ it:
           name: Altro
         posting:
           name: Pubblicazione
-      badge:
-        editor:
-          name: Editor
-          description: Prima modifica ad un messaggio
-        basic_user:
-          name: Base
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Assegnate</a> tutte le funzioni essenziali della comunità
-        member:
-          name: Assiduo
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Assegnata</a> inviti
-        regular:
-          name: Esperto
-          description: '<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Concessi</a> i permessi di: ricategorizzare, rinominare, collegamenti seguiti e accesso al Lounge'
-        leader:
-          name: Leader
-          description: '<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Concessi</a> i permessi di: modifica globale, evidenziare, chiudere, archiviare, separare e fondere'
-        welcome:
-          name: Benvenuto
-          description: Ricevuto un "Mi piace"
-        autobiographer:
-          name: Autobiografo
-          description: Completato le informazioni del tuo <a href="/my/preferences">profilo</a> utente
-        anniversary:
-          name: Compleanno
-          description: Membro attivo da un anno, ha scritto almeno una volta
-        nice_post:
-          name: Buon Messaggio
-          description: Ricevuto 10 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte
-        good_post:
-          name: Ottimo Messaggio
-          description: Ricevuto 25 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte.
-        great_post:
-          name: Fantastico Messaggio
-          description: Ricevuto 50 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte.
-        nice_topic:
-          name: Argomento Buono
-          description: Ricevuti 10 "Mi piace" per un argomento. Questa targhetta può essere assegnata più volte
-        good_topic:
-          name: Argomento Ottimo
-          description: Ricevuti 25 "Mi piace" per un argomento. Questa targhetta può essere assegnata più volte
-        great_topic:
-          name: Argomento Eccellente
-          description: Ricevuti 50 "Mi piace" per un argomento. Questa targhetta può essere assegnata più volte
-        nice_share:
-          name: Condivisione Buona
-          description: Condiviso un messaggio con 25 visitatori unici
-        good_share:
-          name: Condivisione Ottima
-          description: Condiviso un messaggio con 300 visitatori unici
-        great_share:
-          name: Condivisione Eccellente
-          description: Condiviso un messaggio con 1000 visitatori unici
-        first_like:
-          name: Primo Mi Piace
-          description: Assegnato un "Mi piace" ad un messaggio
-        first_flag:
-          name: Prima Segnalazione
-          description: Segnalato un messaggio
-        promoter:
-          name: Promotore
-          description: Ha invitato un utente
-        campaigner:
-          name: Pubblicitario
-          description: Ha invitato 3 utenti Base (livello di esperienza 1)
-        champion:
-          name: Campione
-          description: Ha invitato 5 utenti Assiduo (livello di esperienza 2)
-        first_share:
-          name: Prima Condivisione
-          description: Condiviso un messaggio
-        first_link:
-          name: Primo Collegamento
-          description: Aggiunto un collegamento interno ad un altro argomento
-        first_quote:
-          name: Prima Citazione
-          description: Citato un utente
-        read_guidelines:
-          name: Linee Guida Lette
-          description: Letto le <a href="/guidelines">linee guida della comunità</a>
-        reader:
-          name: Lettore
-          description: Letto tutti i messaggi in un argomento con più di 100 messaggi
-        popular_link:
-          name: Collegamento Popolare
-          description: Ha pubblicato un collegamento esterno con almeno 50 clic
-        hot_link:
-          name: Collegamento Caldo
-          description: Pubblicato un collegamento esterno con almeno 300 clic
-        famous_link:
-          name: Collegamento Famoso
-          description: Ha pubblicato un collegamento esterno con almeno 1000 clic
     google_search: |
       <h3>Cerca con Google</h3>
       <p>
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 481d6608ef..3cf5e2b3a3 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -221,7 +221,6 @@ ja:
       has_pending_posts:
         other: "このトピックは<b>{{count}}</b>個の投稿が承認待ちです"
       confirm: "変更を保存"
-      delete_prompt: "<b>%{username}</b>を本当に削除しますか？全ての投稿が削除されるのと同時にメールアドレスとIPアドレスがブロックされます。"
       approval:
         title: "この投稿は承認が必要"
         description: "投稿された新規のポストは受付されましたがモデレータによる承認が必要です。もう少々お待ち下さい。"
@@ -350,9 +349,7 @@ ja:
         perm_default: "通知をONにする"
         perm_denied_btn: "アクセス拒否"
         disable: "通知を無効にする"
-        currently_enabled: "(現在有効化されています)"
         enable: "通知を有効化"
-        currently_disabled: "(現在無効化されています)"
         each_browser_note: "注意: 利用するブラウザ全てでこの設定を変更する必要があります"
       dismiss_notifications: "全て既読にする"
       dismiss_notifications_tooltip: "全ての未読の通知を既読にします"
@@ -594,8 +591,6 @@ ja:
       sign_up: "新しいアカウントを作成"
     summary:
       enabled_description: "トピックのまとめを表示されています。"
-      description: "<b>{{replyCount}}</b> 返信があります。"
-      description_time: "全てを確認するのに <b>{{readingTime}} 分</b> 前後を要する <b>{{replyCount}}</b> 個の回答があります。"
       enable: 'このトピックを要訳する'
       disable: '全ての投稿を表示する'
     deleted_filter:
@@ -749,7 +744,6 @@ ja:
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -818,9 +812,6 @@ ja:
         category: "{{category}} トピックはありません。"
         top: "トップトピックはありません。"
         search: "検索結果はありません。"
-        educate:
-          new: '２日以内に投稿されたトピックは「最新」トピックとして表示されます。<a href="%{userPrefsUrl}">設定画面</a>で日数変更が可能です。'
-          unread: '参加中のトピックに対して新しい投稿がある場合、未読記事として表示されます。'
       bottom:
         latest: "最新のトピックはこれ以上ありません。"
         hot: "ホットなトピックはこれ以上ありません。"
@@ -1127,18 +1118,6 @@ ja:
           bookmark: "ブックマークを取り消す"
           like: "「いいね！」を取り消す"
           vote: "投票を取り消す"
-        people:
-          off_topic: "{{icons}} オフトピックとしてマーク"
-          spam: "{{icons}} スパムとしてマーク"
-          spam_with_url: "{{icons}} <a href='{{postUrl}}'>スパムとして</a>フラグ付き"
-          inappropriate: "{{icons}} 不適切であると報告するフラグを立つ"
-          notify_moderators: "{{icons}} がモデレータに通報しました"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>通知されたモデレータ</a>"
-          notify_user: "{{icons}} メッセージを送信しました"
-          notify_user_with_url: "{{icons}} <a href='{{postUrl}}'>メッセージ</a>を送信しました"
-          bookmark: "{{icons}} がブックマークしました"
-          like: "{{icons}} が「いいね！」しています"
-          vote: "{{icons}} が投票しました"
         by_you:
           off_topic: "オフトピックのフラグを立てました"
           spam: "スパムを報告するフラグを立てました"
@@ -1266,7 +1245,6 @@ ja:
           title: "ミュート中"
     flagging:
       title: '私達のコミュニティの維持を助けてくれてありがとうごうざいます'
-      private_reminder: 'フラグはプライベートです。スタッフ<b>のみ</b>が参照できます'
       action: 'フラグをつける'
       take_action: "アクションをする"
       notify_action: 'メッセージ'
@@ -1628,11 +1606,9 @@ ja:
             is_disabled: "バックアップ復元を無効にされています。"
             label: "復元"
             title: "バックアップを復元"
-            confirm: "本当にバックアップを復元しますか？"
           rollback:
             label: "ロールバック"
             title: "データベースを元の作業状態にロールバックする"
-            confirm: "本当にデータベースを元の作業状態にロールバックしますか？"
       export_csv:
         user_archive_confirm: "あなたのポストをダウンロードしてよいですか？"
         success: "エスクポートを開始しました。処理が完了すると、メッセージで通知されます。"
@@ -1726,9 +1702,6 @@ ja:
           love:
             name: 'love'
             description: "ライクボタンの色"
-          wiki:
-            name: 'wiki'
-            description: "Wiki投稿の背景に使用する基本色"
       email:
         settings: "設定"
         preview_digest: "ダイジェストのプレビュー"
@@ -2223,8 +2196,6 @@ ja:
         mark_watching: '<b>m</b>, <b>w</b> トピックを参加中にする'
     badges:
       title: バッジ
-      allow_title: "タイトルとして使用できる"
-      multiple_grant: "複数回受け取ることができる"
       badge_count:
         other: "%{count} バッジ"
       more_badges:
@@ -2244,85 +2215,3 @@ ja:
           name: その他
         posting:
           name: 投稿中
-      badge:
-        editor:
-          name: 編集者
-          description: 最初のポスト編集
-        basic_user:
-          name: ベーシックユーザ
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Granted</a> all essential community functions
-        member:
-          name: メンバー
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Granted</a> invitations
-        regular:
-          name: レギュラー
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Granted</a> recategorize, rename, followed links and lounge
-        leader:
-          name: リーダー
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Granted</a> global edit, pin, close, archive, split and merge
-        welcome:
-          name: ようこそ
-          description: 「いいね！」を受けました
-        autobiographer:
-          name: Autobiographer
-          description: Filled user <a href="/my/preferences">profile</a> information
-        anniversary:
-          name: アニバーサリー
-          description: 今年一度でも投稿したアクティブメンバー
-        nice_post:
-          name: 良いポスト
-          description: 10人に「いいね！」をされました。このバッジは何度でももらえます。
-        good_post:
-          name: 良い投稿！
-          description: 25人に「いいね！」をされました。このバッジは何度でももらえます。
-        great_post:
-          name: 素晴らしい投稿！
-          description: 50人に「いいね！」をされました。このバッジは何度でももらえます。
-        nice_topic:
-          name: ナイストピック
-          description: トピックが10回「いいね！」されました。このバッジは何度でももらえます
-        good_topic:
-          name: グッドトピック
-          description: トピックが25回「いいね！」されました。このバッジは何度でももらえます
-        great_topic:
-          name: グレートトピック
-          description: トピックが50回「いいね！」されました。このバッジは何度でももらえます
-        nice_share:
-          name: ナイスシェア
-          description: 25人の訪問者にポストがシェアされました
-        good_share:
-          name: グッドシェア
-          description: 300人の訪問者にポストがシェアされました
-        great_share:
-          name: グレートシェア
-          description: 1000人の訪問者にポストがシェアされました
-        first_like:
-          name: 初めての「いいね！」
-          description: 投稿に「いいね！」した
-        first_flag:
-          name: 最初のフラグ
-          description: 投稿にフラグをつけた
-        promoter:
-          name: プロモーター
-          description: 招待したユーザ
-        campaigner:
-          name: キャンペイナー
-          description: 3人のベーシックユーザー(トラストレベル 1)を招待
-        champion:
-          name: チャンピオン
-          description: 5 メンバー(トラストレベル2)を招待
-        first_share:
-          name: 初めてのシェア
-          description: 投稿をシェアした
-        first_link:
-          name: 最初のリンク
-          description: サイト内投稿のリンクを挿入した
-        first_quote:
-          name: 最初の投稿
-          description: ユーザにタグを付けた
-        read_guidelines:
-          name: ガイドラインを読んだ
-          description: <a href="/guidelines">community guidelines</a>を読みました
-        reader:
-          name: 閲覧者
-          description: 100以上の投稿があるトピック内の投稿をすべて読みました。
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index e65510d08d..e8b805cf06 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -440,7 +440,6 @@ ko:
       muted_users: "알람 끄기"
       muted_users_instructions: "이 회원이 보낸 알림 모두 숨김"
       muted_topics_link: "알림을 끈 토픽 보기"
-      automatically_unpin_topics: "토픽을 끝까지 보면 자동으로 핀이 해제됩니다."
       staff_counters:
         flags_given: "유용한 신고"
         flagged_posts: "신고된 글"
@@ -877,7 +876,6 @@ ko:
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -1465,7 +1463,6 @@ ko:
           title: "알림 꺼짐"
     flagging:
       title: '우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!'
-      private_reminder: '신고는 비밀이기 때문에 <b>오직</b> 운영진들만 볼 수 있습니다'
       action: '글 신고했습니다'
       take_action: "조치하기"
       notify_action: '메시지 보내기'
@@ -1477,7 +1474,6 @@ ko:
       submit_tooltip: "비밀 신고하기"
       take_action_tooltip: "커뮤니티의 신고 수가 채워지기 기다리지 않고, 바로 신고 수를 제재 수준까지 채웁니다."
       cant: "죄송합니다, 지금은 이 글을 신고할 수 없습니다"
-      notify_staff: '운영진에게 알리기'
       formatted_name:
         off_topic: "주제에 벗어났습니다"
         inappropriate: "부적절 컨텐츠입니다"
@@ -2514,10 +2510,7 @@ ko:
     badges:
       earned_n_times:
         other: "이 배지를 %{count}번 받았습니다"
-      more_with_badge: "이 배지를 받은 다른사람들"
       title: 배지
-      allow_title: "can be used as a title"
-      multiple_grant: "can be awarded multiple times"
       badge_count:
         other: "배지 %{count}개"
       more_badges:
@@ -2537,97 +2530,6 @@ ko:
           name: 기타
         posting:
           name: 글 관련 배지
-      badge:
-        editor:
-          name: 에디터
-          description: 첫 글 작성
-        basic_user:
-          name: 초보회원
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">초보회원은</a> 커뮤니티의 기본기능을 사용할 수 있습니다
-        member:
-          name: 부회원
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">부회원은</a> 다른 사람을 커뮤티니에 초대할 수 있습니다
-        regular:
-          name: 정회원
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">정회원은</a> 토픽 제목과 카테고리를 바꾸거나 HTML Link Follow 기능을 사용, 정회원 전용카테고리에 접근할 수 있습니다.
-        leader:
-          name: 리더
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">리더는</a> 모든 글을 수정하거나 토픽 핀고정, 토픽닫기, 토픽아카이빙, 토픽쪼개기, 토픽합치기 등을 할 수 있습니다.
-        welcome:
-          name: 웰컴
-          description: 좋아요 선물받음
-        autobiographer:
-          name: 자서전 작가
-          description: 회원 <a href="/my/preferences">프로필</a> 정보를 작성했습니다
-        anniversary:
-          name: 1주년
-          description: 1년동안 열심히 활동하고 글도 1개이상 썼습니다
-        nice_post:
-          name: Nice Post
-          description: 작성한 글이 좋아요를 10개 받았습니다. 이 배지는 여러번 받을 수 있습니다.
-        good_post:
-          name: Good Post
-          description: 작성한 글이 좋아요를 25개 받았습니다. 이 배지는 여러번 받을 수 있습니다.
-        great_post:
-          name: Great Post
-          description: 작성한 글이 좋아요를 50개 받았습니다. 이 배지는 여러번 받을 수 있습니다.
-        nice_topic:
-          name: Nice Topic
-          description: 10개의 '좋아요'를 받았습니다. 이 배지는 여러번 받을 수 있습니다.
-        good_topic:
-          name: Good Topic
-          description: 25개의 '좋아요'를 받았습니다. 이 배지는 여러번 받을 수 있습니다.
-        great_topic:
-          name: Great Topic
-          description: 50개의 '좋아요'를 받았습니다. 이 배지는 여러번 받을 수 있습니다.
-        nice_share:
-          name: Nice Share
-          description: 방문자 25명이 글을 공유했습니다
-        good_share:
-          name: Good Share
-          description: 방문자 300명의 글을 공유했습니다
-        great_share:
-          name: Great Share
-          description: 방문자 1000명이 글을 공유했습니다
-        first_like:
-          name: 처음 좋아요
-          description: 처음으로 글에 '좋아요'를 했습니다.
-        first_flag:
-          name: 처음 신고해요
-          description: 글을 처음으로 신고하였습니다.
-        promoter:
-          name: 후원자
-          description: 회원을 1명 초대했습니다
-        campaigner:
-          name: 운동가
-          description: 초보회원(1등급회원) 3명을 초대했습니다
-        champion:
-          name: 챔피언
-          description: 초보회원(2등급회원) 5명을 초대했습니다
-        first_share:
-          name: 처음 공유해요
-          description: 처음으로 글을 공유했습니다
-        first_link:
-          name: 처음 링크걸어요
-          description: 다른 토픽으로 가는 링크를 처음으로 추가했습니다
-        first_quote:
-          name: 처음 인용해요
-          description: 회원을 인용했습니다
-        read_guidelines:
-          name: 가이드라인 읽음
-          description: <a href="/guidelines">커뮤니티 가이드라인</a> 을 읽었습니다.
-        reader:
-          name: 독서가
-          description: 100개가 넘는 댓글이 달린 토픽의 댓글을 모두 읽었습니다
-        popular_link:
-          name: 인기 링크
-          description: 게시한 외부링크가 50회 이상 클릭되었습니다
-        hot_link:
-          name: 핫 링크
-          description: 게시한 외부링크가 300회 이상 클릭되었습니다
-        famous_link:
-          name: 완전유명 링크
-          description: 게시한 외부링크가 1000회 이상 클릭되었습니
     google_search: |
       <h3>Google 검색</h3>
       <p>
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 64f5311e8a..58a46f3f82 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -245,7 +245,6 @@ nb_NO:
         one: "Dette emnet har <b>1</b> innlegg som venter på godkjenning"
         other: "Dette emnet har <b>{{count}}</b> innlegg som venter på godkjenning"
       confirm: "Lagre endringer"
-      delete_prompt: "Er du sikker du ønsker å slette <b>%{username}</b>? Dette vil fjerne alle brukerens innnlegg og blokkere epost og ip-addressen."
       approval:
         title: "Innlegg Behøver Godkjenning"
         description: "Vi har mottatt ditt nye innlegg men det krever godkjenning av en moderator før det vises. Venligst vær tålmodig."
@@ -386,9 +385,7 @@ nb_NO:
         perm_default: "Slå på varslinger"
         perm_denied_btn: "Tillatelse avslått"
         disable: "Slå av varslinger"
-        currently_enabled: "(slått på)"
         enable: "Slå på varslinger"
-        currently_disabled: "(slått av)"
         each_browser_note: "Merk: Du må endre denne innstillinger for hver nettleser du bruker."
       dismiss_notifications: "Merk alle som lest"
       dismiss_notifications_tooltip: "Merk alle uleste varslinger som lest"
@@ -645,8 +642,6 @@ nb_NO:
       value_prop: "Når du registrerer deg husker vi hvor langt du har lest, så du starter på riktig sted neste gang du åpner en tråd. Du får også varsler, her og på e-post når det skjer ting i diskusjonene du vil følge. I tillegg kan du like innlegg :heartbeat:"
     summary:
       enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: de mest interessante innleggene i følge nettsamfunnet."
-      description: "Det er <b>{{replyCount}}</b> svar."
-      description_time: "Det er <b>{{replyCount}}</b> svar med en estimert lesetid på <b>{{readingTime}} minutter</b>."
       enable: 'Oppsummer dette emnet'
       disable: 'Vis alle innlegg'
     deleted_filter:
@@ -811,7 +806,6 @@ nb_NO:
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -898,9 +892,6 @@ nb_NO:
         category: "Det er ingen {{category}} emner."
         top: "Det er ingen populære emner."
         search: "Det er ingen søkeresultater"
-        educate:
-          new: '<p>Dine nye emner vises her.</p><p>Som standard anses emner som nye, og vil ha indikatoren <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span> hvis emnet ble opprettet de siste 2 dagene</p><p>Du kan endre dette i dine <a href="%{userPrefsUrl}">innstillinger</a>.</p>'
-          unread: '<p>Dine uleste emner vises her.</p><p>Som standard anses emner som uleste, og vil vise antall uleste <span class="badge new-posts badge-notification">1</span> dersom du:</p><ul><li>Opprettet emnet</li><li>Svarte på emnet</li><li>Leste emnet i mer enn 4 minutter</li></ul><p>Eller dersom du eksplisitt har satt emnet som Sporet eller Fulgt via varslingskontrollene under hvert emne.</p><p>Du kan endre dette i dine <a href="%{userPrefsUrl}">innstillinger</a>.</p>'
       bottom:
         latest: "Det er ikke noen siste emner igjen å lese."
         hot: "Det er ikke noen populære emner igjen å lese."
@@ -1225,18 +1216,6 @@ nb_NO:
           bookmark: "Angre bokmerke"
           like: "Angre liker"
           vote: "Angre stemme"
-        people:
-          off_topic: "{{icons}} rapporterte dette som irrelevant"
-          spam: "{{icons}} rapporterte dette som spam"
-          spam_with_url: "{{icons}} merket <a href='{{postUrl}}'>dette som spam</a>"
-          inappropriate: "{{icons}} rapporterte dette som upassende"
-          notify_moderators: "{{icons}} varslet moderatorene"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>varslet moderatorene</a>"
-          notify_user: "{{icons}} sendte en melding"
-          notify_user_with_url: "{{icons}} sente en <a href='{{postUrl}}'>melding</a>"
-          bookmark: "{{icons}} bokmerket dette"
-          like: "{{icons}} likte dette"
-          vote: "{{icons}} stemte for dette"
         by_you:
           off_topic: "Du rapporterte dette som irrelevant"
           spam: "Du rapporterte dette som spam"
@@ -1383,7 +1362,6 @@ nb_NO:
           title: "Dempet"
     flagging:
       title: 'Takk for at du hjelper å holde forumet ryddig!'
-      private_reminder: 'flagg er private, <b>bare</b> synlige for staben'
       action: 'Rapporter innlegg'
       take_action: "Ta Handling"
       notify_action: 'Melding'
@@ -1395,7 +1373,6 @@ nb_NO:
       submit_tooltip: "Rapporter privat"
       take_action_tooltip: "Oppnå rapporteringsterskel umiddelbart, i stedet for å vente på flere rapporteringer."
       cant: "Beklager, du kan ikke rapportere dette innlegget nå."
-      notify_staff: 'Varsle Personalet'
       formatted_name:
         off_topic: "Det er off-topic "
         inappropriate: "Det er upassende"
@@ -1763,11 +1740,9 @@ nb_NO:
             is_disabled: "Gjenoppretting er deaktivert i nettstedsinnstillingene."
             label: "Gjenooprett"
             title: "Gjenopprett sikkerhetskopien"
-            confirm: "Er du sikker på at du vil gjenopprette denne sikkerhetskopien?"
           rollback:
             label: "Gjenopprett"
             title: "Gjenopprett databasen til en tidligere fungerende tilstand"
-            confirm: "Er du sikker på at du vil gjenopprette databasen til en tidligere fungerende tilstand?"
       export_csv:
         user_archive_confirm: "Er du sikker på at du vil laste ned innleggene dine?"
         success: "Eksportering iverksatt. Du vil bli varslet med en melding når prosessen er fullført."
@@ -1864,9 +1839,6 @@ nb_NO:
           love:
             name: 'liker'
             description: "Fargen til Liker-knappen."
-          wiki:
-            name: 'wiki'
-            description: "Grunnfarge brukt for bakgrunnen i wiki-poster."
       email:
         settings: "Instillinger"
         preview_digest: "Forhåndsvis Oppsummering"
@@ -2360,8 +2332,6 @@ nb_NO:
         mark_watching: '<b>m</b>, <b>w</b> Følg emne'
     badges:
       title: Merker
-      allow_title: "kan bli brukt som tittel"
-      multiple_grant: "kan bli belønnet mange ganger"
       badge_count:
         one: "1 Merke"
         other: "%{count} Merker"
@@ -2384,85 +2354,3 @@ nb_NO:
           name: Annet
         posting:
           name: Posting
-      badge:
-        editor:
-          name: Redaktør
-          description: Første redigering av innlegg
-        basic_user:
-          name: Basic
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Innvilget</a> alle essensielle forumfunksjoner
-        member:
-          name: Medlem
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Innvilget</a> invitasjonsmulighet
-        regular:
-          name: Aktivt Medlem
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Innvilget</a> omkategorisering, endring av navn, fulgte lenker og salong
-        leader:
-          name: Leder
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Innvilget</a> global redigering, fastsetting, lukking, arkivering, splitting og sammenslåing
-        welcome:
-          name: Velkommen
-          description: Fått en liker
-        autobiographer:
-          name: Selvbiograf
-          description: Fylte ut informasjon om <a href="/my/preferences">brukerprofilen</a>
-        anniversary:
-          name: Jubileum
-          description: Aktivt medlem i over ett år, postet minst en gang
-        nice_post:
-          name: Fint innlegg
-          description: Fått 10 liker for et innlegg. Dette merket kan bli tildelt flere ganger
-        good_post:
-          name: Bra innlegg
-          description: Fått 25 liker for et innlegg. Dette merket kan bli tildelt flere ganger
-        great_post:
-          name: Flott Innlegg
-          description: Fått 50 liker for et innlegg. Dette merket kan bli tildelt flere ganger
-        nice_topic:
-          name: Fint emne
-          description: Fått 10 liker for et emne. Dette merket kan bli tildelt flere ganger
-        good_topic:
-          name: Godt emne
-          description: Fått 25 liker for et emne. Dette merket kan bli tildelt flere ganger
-        great_topic:
-          name: Fantastisk emne
-          description: Fått 50 liker for et emne. Dette merket kan bli tildelt flere ganger
-        nice_share:
-          name: Fin deling
-          description: Delt et innlegg med 25 unike besøkende
-        good_share:
-          name: God deling
-          description: Delt et innlegg med 300 unike besøkende
-        great_share:
-          name: Fantastisk Deling
-          description: Delt et innlegg med 1000 unike besøkende
-        first_like:
-          name: Første liker
-          description: Likt et innlegg
-        first_flag:
-          name: Første rapportering
-          description: Rapportert et innlegg
-        promoter:
-          name: Forfrem
-          description: Inviterte en bruker
-        campaigner:
-          name: Campaigner
-          description: Inviterte 3 medlemmer (tillitsnivå 1)
-        champion:
-          name: Mester
-          description: Inviterte 5 medlemmer (tillitsnivå 2)
-        first_share:
-          name: Første deling
-          description: Delt et innlegg
-        first_link:
-          name: Første lenke
-          description: Link til et eksisterende emne
-        first_quote:
-          name: Første sitat
-          description: Sitert en bruker
-        read_guidelines:
-          name: Leste retningslinjene
-          description: Lest <a href="/guidelines">forumets retningslinjer</a>
-        reader:
-          name: Leser
-          description: Leste hvert innlegg i et emne med mer enn 100 innlegg
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 43d207d2c9..4444ec15a0 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -920,7 +920,6 @@ nl:
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='geciteerd' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='beantwoord' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='beantwoord' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='aangepast' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='geliked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='privebericht' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -2631,10 +2630,7 @@ nl:
       earned_n_times:
         one: "Verdiende deze badge 1 keer"
         other: "Verdiende deze badge %{count} keer"
-      more_with_badge: "Andere met deze badge"
       title: Badges
-      allow_title: "kan als titel gebruikt worden"
-      multiple_grant: "kan meerdere keren toegekend worden"
       badge_count:
         one: "1 Badge"
         other: "%{count} Badges"
@@ -2657,97 +2653,6 @@ nl:
           name: Overige
         posting:
           name: Schrijven
-      badge:
-        editor:
-          name: Redacteur
-          description: Eerste berichtwijziging
-        basic_user:
-          name: Basis
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Toegang verleend tot</a> alle essentiële gemeenschaps-functionaliteit.
-        member:
-          name: Lid
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Toegang verleend tot</a> uitnodigingen
-        regular:
-          name: Vaste bezoeker
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Toegang verleend tot</a> hercategoriseren, hernoemen, gevolgde links en lounge
-        leader:
-          name: Leider
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Toegang verleend tot</a> globaal wijzigen, vastpinnen, sluiten, archiveren, splitsen en samenvoegen
-        welcome:
-          name: Welkom
-          description: Like ontvangen.
-        autobiographer:
-          name: Autobiografist
-          description: <a href="/my/preferences">Gebruikersprofiel</a> informatie ingevuld
-        anniversary:
-          name: Verjaardag
-          description: Actief lid voor een jaar, heeft tenminste eenmaal iets gepost
-        nice_post:
-          name: Prima bericht
-          description: 10 likes op een post ontvangen. Deze badge kan meerdere keren worden toegekend.
-        good_post:
-          name: Goed bericht
-          description: 25 likes op een post ontvangen. Deze badge kan meerdere keren worden toegekend.
-        great_post:
-          name: Fantastisch Bericht
-          description: 50 likes op een post ontvangen. Deze badge kan meerdere keren worden toegekend.
-        nice_topic:
-          name: Leuk Topic
-          description: 10 likes ontvangen op een topic. Deze badge kan meerdere keren toegewezen worden.
-        good_topic:
-          name: Goed Topic
-          description: 25 likes ontvangen op een topic. Deze badge kan meerdere keren toegewezen worden.
-        great_topic:
-          name: Geweldig Topic
-          description: 50 likes ontvangen op een topic. Deze badge kan meerdere keren toegewezen worden.
-        nice_share:
-          name: Leuk Gedeeld
-          description: Een bericht met 25 unieke bezoekers gedeeld
-        good_share:
-          name: Goed Gedeeld
-          description: Een bericht met 300 unieke bezoekers gedeeld
-        great_share:
-          name: Geweldig Gedeeld
-          description: Een bericht met 1000 unieke bezoekers gedeeld
-        first_like:
-          name: Eerste like
-          description: Hebt een bericht ge-vind-ik-leukt
-        first_flag:
-          name: Eerste markering
-          description: Een bericht gemarkeerd
-        promoter:
-          name: Promoter
-          description: Heeft een gebruiker uitgenodigd
-        campaigner:
-          name: Campaigner
-          description: Heeft 3 leden (trust level 1) uitgenodigd
-        champion:
-          name: Kampioen
-          description: Heeft 5 leden (trust level 2) uitgenodigd
-        first_share:
-          name: Eerste deel actie
-          description: Een bericht gedeeld
-        first_link:
-          name: Eerste link
-          description: Een interne link toegevoegd aan een ander topic
-        first_quote:
-          name: Eerste citaat
-          description: Een gebruiker geciteerd
-        read_guidelines:
-          name: Heeft de richtlijnen gelezen
-          description: Lees de <a href="/guidelines">community richtlijnen</a>
-        reader:
-          name: Lezer
-          description: Lees elk bericht in een topic met meer dan 100 berichten.
-        popular_link:
-          name: Populaire Link
-          description: Heeft een externe link geplaatst die 50 keer of vaker is aangeklikt.
-        hot_link:
-          name: Zeer Populaire Link
-          description: Heeft een externe link geplaatst die 300 keer of vaker is aangeklikt
-        famous_link:
-          name: Uiterst Populaire Link
-          description: Heeft een externe link geplaatst die 1000 keer of vaker is aangeklikt
     google_search: |
       <h3>Zoek met Google</h3>
       <p>
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index cd19d4c817..60481f8a5d 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -9,7 +9,7 @@ pl_PL:
   js:
     number:
       format:
-        separator: "."
+        separator: ","
         delimiter: ","
       human:
         storage_units:
@@ -119,6 +119,8 @@ pl_PL:
           one: "1 rok później"
           few: "%{count} lata później"
           other: "%{count} lat później"
+      previous_month: 'Poprzedni miesiąc'
+      next_month: 'Następny miesiąc'
     share:
       topic: 'udostępnij odnośnik do tego tematu'
       post: 'wpis #%{postNumber}'
@@ -129,6 +131,8 @@ pl_PL:
       email: 'wyślij ten odnośnik przez email'
     action_codes:
       split_topic: "podziel ten temat %{when}"
+      invited_user: "%{who} został zaproszony %{when}"
+      removed_user: "%{who} został usunięty %{when}"
       autoclosed:
         enabled: 'zamknięcie %{when}'
         disabled: 'otworzenie %{when}'
@@ -149,6 +153,19 @@ pl_PL:
         disabled: 'odlistowanie %{when}'
     topic_admin_menu: "akcje administratora"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
+    s3:
+      regions:
+        us_east_1: "US East (N. Virginia)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        eu_west_1: "EU (Ireland)"
+        eu_central_1: "EU (Frankfurt)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
+        ap_northeast_1: "Asia Pacific (Tokyo)"
+        ap_northeast_2: "Asia Pacific (Seoul)"
+        sa_east_1: "South America (Sao Paulo)"
     edit: 'edytuj tytuł i kategorię tego tematu'
     not_implemented: "Bardzo nam przykro, ale ta funkcja nie została jeszcze zaimplementowana."
     no_value: "Nie"
@@ -182,6 +199,8 @@ pl_PL:
     more: "Więcej"
     less: "Mniej"
     never: "nigdy"
+    every_30_minutes: "co 30 minut"
+    every_hour: "co godzinę"
     daily: "dziennie"
     weekly: "tygodniowo"
     every_two_weeks: "co dwa tygodnie"
@@ -194,6 +213,7 @@ pl_PL:
       other: "{{count}} znaków"
     suggested_topics:
       title: "Sugerowane tematy"
+      pm_title: "sugerowane wiadomości"
     about:
       simple_title: "O stronie"
       title: "O %{title}"
@@ -276,7 +296,7 @@ pl_PL:
         few: "Ten temat posiada <b>{{count}}</b> wpisy oczekujące na akceptację"
         other: "Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację"
       confirm: "Zapisz zmiany"
-      delete_prompt: "Czy na pewno chcesz usunąć <b>%{username}</b>? Zostaną usunięte wszystkie wpisy utworzone z tego konta oraz zostanie zablokowany powiązany e-mail oraz adres IP."
+      delete_prompt: "Czy na pewno chcesz usunąć <b>%{username}</b>? To spowoduje usunięcie wszystkich wiadomości, zablokowanie adresu e-mail i adresu IP tego użytkownika."
       approval:
         title: "Wpis wymaga zatwierdzenia"
         description: "Twój nowy wpis został umieszczony w kolejce i pojawi się po zatwierdzeniu przez moderatora. Prosimy o cierpliwość."
@@ -321,6 +341,10 @@ pl_PL:
         few: "%{count} użytkownicy"
         other: "%{count} użytkowników"
     groups:
+      empty:
+        posts: "Członkowie tej grupy nie opublikowali żadnych postów."
+        members: "W tej grupie nie ma żadnych członków."
+        topics: "Członkowie tej grupy nie opublikowali żadnych postów."
       add: "Dodaj"
       selector_placeholder: "Dodaj członków"
       owner: "właściciel"
@@ -330,7 +354,10 @@ pl_PL:
         few: "grupy"
         other: "grupy"
       members: "Członkowie"
+      topics: "Tematy"
       posts: "Wpisów"
+      mentions: "Wzmianki"
+      messages: "Wiadomości"
       alias_levels:
         title: "Kto może wysyłać wiadomości i używać @aliasu tej grupy?"
         nobody: "Nikt"
@@ -341,6 +368,18 @@ pl_PL:
       trust_levels:
         title: "Domyślny poziom zaufania przyznawany nowych użytkownikom:"
         none: "Brak"
+      notifications:
+        watching:
+          title: "Obserwowanie"
+        tracking:
+          title: "Śledzenie"
+          description: "Dostaniesz powiadomienie, gdy ktoś ci odpowie lub wspomni twoją @nazwę, zobaczysz również liczbę odpowiedzi."
+        regular:
+          title: "Normalny"
+          description: "Dostaniesz powiadomienie, gdy ktoś ci odpowie lub wspomni twoją @nazwę."
+        muted:
+          title: "Wyciszony"
+          description: "Nie otrzymasz powiadomień o nowych tematach w tej grupie."
     user_action_groups:
       '1': "Przyznane polubienia"
       '2': "Otrzymane polubienia"
@@ -359,6 +398,7 @@ pl_PL:
       all_subcategories: "wszystkie"
       no_subcategory: "żadne"
       category: "Kategoria"
+      category_list: "Wyświetl listę kategorii"
       reorder:
         title: "Zmień kolejność kategorii"
         title_long: "Zmień kolejność listy kategorii"
@@ -417,15 +457,14 @@ pl_PL:
       invited_by: "Zaproszono przez"
       trust_level: "Poziom zaufania"
       notifications: "Powiadomienia"
+      statistics: "Statystyki"
       desktop_notifications:
         label: "Powiadomienia systemowe"
         not_supported: "Powiadomienia nie są wspierane przez tę przeglądarkę. Przepraszamy."
         perm_default: "Włącz powiadomienia"
         perm_denied_btn: "Brak uprawnień"
         disable: "Wyłącz powiadomienia"
-        currently_enabled: "(aktualnie włączone)"
         enable: "Włącz powiadomienia"
-        currently_disabled: "(aktualnie wyłączone)"
         each_browser_note: "Uwaga: to ustawienie musisz zmienić w każdej przeglądarce której używasz."
       dismiss_notifications: "Oznacz jako przeczytane"
       dismiss_notifications_tooltip: "Oznacz wszystkie powiadomienia jako przeczytane"
@@ -460,7 +499,6 @@ pl_PL:
       muted_users: "Uciszeni"
       muted_users_instructions: "Wstrzymaj powiadomienia od tych użytkowników."
       muted_topics_link: "Pokaż wyciszone tematy"
-      automatically_unpin_topics: "Automatycznie odpinaj tematy po przeczytaniu ostatniego wpisu."
       staff_counters:
         flags_given: "uczynnych oflagowań"
         flagged_posts: "oflagowane wpisy"
@@ -469,7 +507,15 @@ pl_PL:
         warnings_received: "otrzymanych ostrzeżeń"
       messages:
         all: "Wszystkie"
+        inbox: "Skrzynka odbiorcza"
+        sent: "Wysłane"
+        archive: "Archiwum"
         groups: "Moje grupy"
+        bulk_select: "Zaznacz wiadomości"
+        move_to_inbox: "Przenieś do skrzynki odbiorczej"
+        move_to_archive: "Archiwum"
+        failed_to_move: "Nie udało się przenieść zaznaczonych wiadomości (prawdopodobnie wystąpił problem z Twoim połączeniem)"
+        select_all: "Zaznacz wszystko"
       change_password:
         success: "(email wysłany)"
         in_progress: "(email wysyłany)"
@@ -554,8 +600,16 @@ pl_PL:
         title: "Odznaka karty użytkownika"
       website: "Strona internetowa"
       email_settings: "Email"
+      like_notification_frequency:
+        always: "Zawsze"
+        never: "Nigdy"
+      email_previous_replies:
+        always: "zawsze"
+        never: "nigdy"
       email_digests:
         title: "Gdy nie odwiedzam strony, wysyłaj e-mail z podsumowaniem aktywności:"
+        every_30_minutes: "co 30 minut"
+        every_hour: "co godzinę"
         daily: "codziennie"
         every_three_days: "co trzy dni"
         weekly: "co tydzień"
@@ -628,6 +682,21 @@ pl_PL:
         same_as_email: "Twoje hasło jest takie samo jak twój e-mail."
         ok: "Twoje hasło jest poprawne."
         instructions: "Co najmniej %{count} znaków."
+      summary:
+        title: "Podsumowanie"
+        stats: "Statystyki"
+        topic_count: "Założone tematy"
+        post_count: "Napisane posty"
+        likes_given: "Polubione"
+        likes_received: "Otrzymane polubienia"
+        days_visited: "Dni odwiedzin"
+        posts_read_count: "Przeczytane wpisy"
+        top_replies: "Najlepsze odpowiedzi"
+        top_topics: "Najlepsze tematy"
+        top_badges: "Najlepsze odznaki"
+        more_topics: "Więcej tematów"
+        more_replies: "Więcej odpowiedzi"
+        more_badges: "Więcej odznak"
       associated_accounts: "Powiązane konta"
       ip_address:
         title: "Ostatni adres IP"
@@ -700,8 +769,7 @@ pl_PL:
       value_prop: "Jeśli stworzysz konto, zapamiętamy przeczytane przez Ciebie wpisy i tematy, dzięki czemu zawsze powrócisz do odpowiedniego miejsca.  Otrzymasz też powiadomienia o nowych wpisach. Dodatkowo możliwe będzie polubienie ciekawych wpisów  :heartbeat:"
     summary:
       enabled_description: "Przeglądasz podsumowanie tego tematu: widoczne są jedynie najbardziej wartościowe wpisy zdaniem uczestników. "
-      description: "Istnieją <b>{{replyCount}}</b> odpowiedzi."
-      description_time: "Istnieją <b>{{replyCount}}</b> odpowiedzi z czasem czytania oszacowanym na <b>{{readingTime}} minut</b>."
+      description: "Jest  <b>{{replyCount}}</b> odpowiedzi."
       enable: 'Podsumuj ten temat'
       disable: 'Pokaż wszystkie wpisy'
     deleted_filter:
@@ -871,9 +939,13 @@ pl_PL:
       group_mentioned: "<i title='wywołanie grupy' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='cytat' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='odpowiedź' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='odpowiedź' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      posted: "<i title='posted' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edycja' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='polubienie' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked_many:
+        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} oraz 1 inna osoba</span> {{description}}</p>"
+        few: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}</p>"
+        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}</p>"
       private_message: "<i title='prywatna wiadomość' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_private_message: "<i title='prywatna wiadomość' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_topic: "<i title='zaproszenie do tematu' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -881,6 +953,10 @@ pl_PL:
       moved_post: "<i title='przeniesienie wpisu' class='fa fa-sign-out'></i><p><span>{{username}}</span> przenosi {{description}}</p>"
       linked: "<i title='powiązany wpis' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='otrzymano odznakę' class='fa fa-certificate'></i><p>Otrzymujesz '{{description}}'</p>"
+      group_message_summary:
+        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}} </p>"
+        few: "<i title='messages in group inbox' class='fa fa-group'></i><p> masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}} </p>"
+        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}</p>"
       alt:
         mentioned: "Wywołanie przez"
         quoted: "Cytowanie przez"
@@ -897,6 +973,7 @@ pl_PL:
         granted_badge: "Przyznanie odznaki"
       popup:
         mentioned: '{{username}} wspomina o tobie w "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} wspomniał o Tobie w "{{topic}}" - {{site_title}}'
         quoted: '{{username}} cytuje cie w "{{topic}}" - {{site_title}}'
         replied: '{{username}} odpowiada na twój wpis w "{{topic}}" - {{site_title}}'
         posted: '{{username}} pisze w "{{topic}}" - {{site_title}}'
@@ -978,10 +1055,7 @@ pl_PL:
         top: "Brak najlepszych tematów."
         search: "Brak wyników wyszukiwania."
         educate:
-          new: '<p>Pojawią się tu nowe tematy.</p><p>Domyślnie, tematy są traktowane jako <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nowe</span> jeśli zostały utworzone w ciągu ostatnich 2 dni.</p><p>Możesz to zmienić w <a href="%{userPrefsUrl}">swoich ustawieniach</a>.</p>'
-          unread: '<p>Pojawią się tu tematy oznaczone licznikiem <span class="badge new-posts badge-notification">1</span> nieprzeczytanych wpisów.</p>
-
-            <p>Domyślnie, jako nieprzeczytane rozumiane są tematy:</p><ul><li>twojego autorstwa</li><li>te w których są twoje odpowiedzi </li><li>czytane przez ciebie dłużej niż 4 minuty</li></ul><p>Znajdą się tu też te, którym ręcznie przyznano status Śledzony lub Obserwowany przyciskiem znajdującym się na końcu każdego tematu.</p><p>Możesz zmienić te zachowania w swoich <a href="%{userPrefsUrl}">ustawieniach</a>.</p>'
+          new: '<p>Nowe tematy będą pojawiać się tutaj.</p><p>Domyślnie tematy są określane jako nowe i będą oznaczone jako<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nowe</span> jeśli były stworzone w ciągu ostatnich 2 dni.</p><p>Odwiedź swoje <a href="%{userPrefsUrl}">ustawienia</a> by to zmienić.</p>'
       bottom:
         latest: "Nie ma więcej najnowszych tematów."
         hot: "Nie ma więcej gorących tematów."
@@ -1001,6 +1075,12 @@ pl_PL:
       create: 'Nowy temat'
       create_long: 'Utwórz nowy temat'
       private_message: 'Napisz wiadomość'
+      archive_message:
+        help: 'Przenieś wiadomość do archiwum'
+        title: 'Archiwum'
+      move_to_inbox:
+        title: 'Przenieś do skrzynki odbiorczej'
+        help: 'Przenieś wiadomość z powrotem do skrzynki odbiorczej'
       list: 'Tematy'
       new: 'nowy temat'
       unread: 'nieprzeczytane'
@@ -1056,6 +1136,7 @@ pl_PL:
       auto_close_title: 'Ustawienia automatycznego zamykania'
       auto_close_save: "Zapisz"
       auto_close_remove: "Nie zamykaj automatycznie tego tematu"
+      auto_close_immediate: "Ostatni wpis w tym temacie został zamieszczony %{hours} godzin temu, więc zostanie on natychmiastowo zamknięty."
       progress:
         title: postęp tematu
         go_top: "początek"
@@ -1356,17 +1437,14 @@ pl_PL:
           like: "Cofnij"
           vote: "Cofnij głos"
         people:
-          off_topic: "{{icons}} oznaczyli jako nie-na-temat"
-          spam: "{{icons}} oznaczyli jako spam"
-          spam_with_url: "{{icons}} oznacza <a href='{{postUrl}}'>to jako spam</a>"
-          inappropriate: "{{icons}} oznaczyli jako niewłaściwe"
-          notify_moderators: "{{icons}} powiadomiło moderatorów"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>powiadomiło moderatorów</a>"
-          notify_user: "{{icons}} wysłana wiadomość"
-          notify_user_with_url: "{{icons}} wysłana <a href='{{postUrl}}'>wiadomość</a>"
-          bookmark: "{{icons}} dodało to do zakładek"
-          like: "{{icons}} lubi to"
-          vote: "{{icons}} zagłosowało za tym"
+          off_topic: "Oflagowano jako nie-na-temat"
+          spam: "oznacz jako spam"
+          inappropriate: "Oflagowano jako nieodpowiednie"
+          notify_moderators: "Powiadomiono moderatorów"
+          notify_user: "Wysłano wiadomość"
+          bookmark: "dodaj do zakładek"
+          like: "polubiło to"
+          vote: "zagłosowało"
         by_you:
           off_topic: "Oznaczono jako nie-na-temat"
           spam: "Oflagowano jako spam"
@@ -1535,7 +1613,6 @@ pl_PL:
           description: "Nie otrzymasz powiadomień o nowych tematach w tych kategoriach. Nie pojawią się na liście nieprzeczytanych."
     flagging:
       title: 'Dziękujemy za pomoc w utrzymaniu porządku w naszej społeczności!'
-      private_reminder: 'oflagowania są poufne i widoczne <b>jedynie</b> dla obsługi serwisu'
       action: 'Oflaguj wpis'
       take_action: "Podejmij działanie"
       notify_action: 'Wiadomość'
@@ -1547,7 +1624,6 @@ pl_PL:
       submit_tooltip: "Zapisz prywatną flagę."
       take_action_tooltip: "Nie czekaj, aż wpis zostanie zgłoszony przez innych,  natychmiast oflaguj do działania . "
       cant: "Przepraszamy, nie możesz oflagować teraz tego wpisu."
-      notify_staff: 'Powiadom administrację'
       formatted_name:
         off_topic: "Jest nie-na-temat"
         inappropriate: "Jest nieodpowiednie"
@@ -1936,11 +2012,9 @@ pl_PL:
             is_disabled: "Przywracanie jest zablokowane w ustawieniach."
             label: "Przywróć"
             title: "Przywróć kopię zapasową"
-            confirm: "Czy na pewno chcesz przywrócić tą kopię zapasową?"
           rollback:
             label: "Wycofaj"
             title: "Wycofaj bazę danych do poprzedniego poprawnego stanu"
-            confirm: "Czy na pewno chcesz przywrócić bazę danych do poprzedniego poprawnego stanu?"
       export_csv:
         user_archive_confirm: "Czy na pewno chcesz pobrać swoje wszystkie wpisy?"
         success: "Rozpoczęto eksport: otrzymasz wiadomość, gdy proces zostanie zakończony."
@@ -2043,9 +2117,6 @@ pl_PL:
           love:
             name: 'polubienie'
             description: "Kolor przycisku polub"
-          wiki:
-            name: 'wiki'
-            description: "Kolor tła wpisów typu wiki."
       email:
         settings: "Ustawienia"
         preview_digest: "Pokaż zestawienie aktywności"
@@ -2054,6 +2125,8 @@ pl_PL:
         test_error: "Wystąpił problem podczas wysyłania testowego maila. Sprawdź ustawienia poczty, sprawdź czy Twój serwer nie blokuje połączeń pocztowych i spróbuj ponownie."
         sent: "Wysłane"
         skipped: "Pominięte"
+        received: "Otrzymane"
+        rejected: "Odrzucone"
         sent_at: "Wysłany na"
         time: "Czas"
         user: "Użytkownik"
@@ -2071,6 +2144,23 @@ pl_PL:
         last_seen_user: "Ostatnia "
         reply_key: "Klucz odpowiedzi"
         skipped_reason: "Powód pominięcia"
+        incoming_emails:
+          from_address: "Od"
+          to_addresses: "Do"
+          subject: "Temat"
+          error: "Błąd"
+          modal:
+            error: "Błąd"
+            date: "Data"
+            from: "Od"
+            to: "Do"
+            subject: "Temat"
+            body: "Treść"
+          filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "to@example.com"
+            cc_placeholder: "cc@example.com"
+            error_placeholder: "Błąd"
         logs:
           none: "Nie znaleziono logów."
           filters:
@@ -2133,6 +2223,8 @@ pl_PL:
             change_category_settings: "zmiana ustawień kategorii"
             delete_category: "Usuń kategorię"
             create_category: "Dodaj nową kategorię"
+            block_user: "zablokuj użytkownika"
+            unblock_user: "odblokuj użytkownika"
         screened_emails:
           title: "Ekranowane emaile"
           description: "Kiedy ktoś próbuje założyć nowe konto, jego adres email zostaje sprawdzony i rejestracja zostaje zablokowana, lub inna akcja jest podejmowana."
@@ -2305,6 +2397,7 @@ pl_PL:
         deactivate_failed: "Wystąpił problem przy deaktywacji konta użytkownika."
         unblock_failed: 'Wystąpił problem podczaj odblokowania użytkownika.'
         block_failed: 'Wystąpił problem podczas blokowania użytkownika.'
+        block_accept: 'Tak, zablokuj tego użytkownika'
         deactivate_explanation: "Wymusza ponowne potwierdzenie adresu email tego konta."
         suspended_explanation: "Zawieszony użytkownik nie może się logować."
         block_explanation: "Zablokowany użytkownik nie może tworzyć wpisów ani zaczynać tematów."
@@ -2318,6 +2411,7 @@ pl_PL:
         unlock_trust_level: "Odblokuj poziom zaufania"
         tl3_requirements:
           title: "Wymagania dla osiągnięcia 3. poziomu zaufania"
+          table_title: "W ciągu ostatnich %{time_period} dni:"
           value_heading: "Wartość"
           requirement_heading: "Wymaganie"
           visits: "Odwiedziny"
@@ -2586,9 +2680,11 @@ pl_PL:
         mark_tracking: '<b>m</b>, <b>t</b> śledź temat'
         mark_watching: '<b>m</b>, <b>w</b> śledź wszystko w temacie'
     badges:
+      earned_n_times:
+        one: "Otrzymano tą odznakę 1 raz"
+        few: "Otrzymano tą odznakę %{count} razy"
+        other: "Otrzymano tą odznakę %{count} razy"
       title: Odznaki
-      allow_title: "może być użyta jako tytuł"
-      multiple_grant: "może być przyznana wielokrotnie"
       badge_count:
         one: "1 odznaka"
         few: "%{count} odznaki"
@@ -2614,97 +2710,6 @@ pl_PL:
           name: Inne
         posting:
           name: Wpisy
-      badge:
-        editor:
-          name: Edytor
-          description: Pierwsza edycja
-        basic_user:
-          name: Podstawowy
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Przyznano</a> wszystkie podstawowe funkcje
-        member:
-          name: Zwykły
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Przyznano</a> zaproszenia
-        regular:
-          name: Regularny
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Przyznano</a> zmianę kategorii, tytułu, wyłączenie nofollow linków oraz Salon
-        leader:
-          name: Weteran
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Przyznano</a> możliwość edycji, przypinania, zamykania, archiwizacji, podziału i scalania
-        welcome:
-          name: Powitanie
-          description: Otrzymano polubienie
-        autobiographer:
-          name: Autobiograf
-          description: Wypełnienie <a href="/my/preferences">profilu</a> użytkownika
-        anniversary:
-          name: Rocznica
-          description: Aktywność przez rok, co najmniej jeden wpis
-        nice_post:
-          name: Niezły wpis
-          description: Otrzymano 10 polubień za wpis. Ta odznaka może być przyznawana wielokrotnie
-        good_post:
-          name: Dobry wpis
-          description: Otrzymano 25 polubień za wpis. Ta odznaka może być przyznawana wielokrotnie
-        great_post:
-          name: Wspaniały wpis
-          description: Otrzymano 50 polubień za wpis. Ta odznaka może być przyznawana wielokrotnie
-        nice_topic:
-          name: Niezły temat
-          description: Otrzymano 10 polubień w temacie. Ta odznaka może być przyznawana wielokrotnie.
-        good_topic:
-          name: Dobry temat
-          description: Otrzymano 25 polubień w temacie. Ta odznaka może być przyznawana wielokrotnie.
-        great_topic:
-          name: Świetny temat
-          description: Otrzymano 50 polubień w temacie. Ta odznaka może być przyznawana wielokrotnie.
-        nice_share:
-          name: Niezłe udostępnienie
-          description: Udostępniono wpis 25 unikalnym odwiedzającym.
-        good_share:
-          name: Dobre udostępnienie
-          description: Udostępniono wpis 300 unikalnym odwiedzającym.
-        great_share:
-          name: Świetne udostępnienie
-          description: Udostępniono wpis 1000 unikalnych odwiedzających.
-        first_like:
-          name: Pierwsze polubienie
-          description: Polubiono wpis
-        first_flag:
-          name: Pierwsza flaga
-          description: Zgłoszenie wpisu
-        promoter:
-          name: Promotor
-          description: Zaproszenie użytkownika
-        campaigner:
-          name: Działacz
-          description: Zaproszenie 3 użytkowników (poziom zaufania 1)
-        champion:
-          name: Czempion
-          description: Zaproszenie 5 użytkowników (poziom zaufania 2)
-        first_share:
-          name: Pierwsze udostępnienie
-          description: Udostępniono wpis
-        first_link:
-          name: Pierwszy link
-          description: Dodano wewnętrzny link do innego tematu
-        first_quote:
-          name: Pierwszy cytat
-          description: Zacytowano użytkownika
-        read_guidelines:
-          name: Przeczytany przewodnik
-          description: Przeczytanie <a href="/guidelines">wytycznych społeczności</a>
-        reader:
-          name: Czytelnik
-          description: Przeczytanie każdego wpisu w temacie z ponad 100 wpisami
-        popular_link:
-          name: Popularny link
-          description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 50 kliknięć
-        hot_link:
-          name: Gorący link
-          description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 300 kliknięć
-        famous_link:
-          name: Słynny link
-          description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 1000 kliknięć
     google_search: |
       <h3>Wyszukaj z Google</h3>
       <p>
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 70806d435f..b2a3773560 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -438,9 +438,7 @@ pt:
         perm_denied_btn: "Permissão Negada"
         perm_denied_expl: "Negou a permissão para as notificações. Autorize as notificações através das configurações do seu navegador."
         disable: "Desativar Notificações"
-        currently_enabled: "(atualmente ativo)"
         enable: "Ativar Notificações"
-        currently_disabled: "(atualmente inativo)"
         each_browser_note: "Nota: Tem que alterar esta configuração em todos os navegadores de internet que utiliza."
       dismiss_notifications: "Marcar tudo como lido"
       dismiss_notifications_tooltip: "Marcar como lidas todas as notificações por ler"
@@ -595,6 +593,7 @@ pt:
         every_three_days: "a cada três dias"
         weekly: "semanalmente"
         every_two_weeks: "a cada duas semanas"
+      include_tl0_in_digests: "Incluir mensagens de novos utilizadores nos emails de resumo"
       email_in_reply_to: "Incluir um excerto do mensagem respondida nos emails"
       email_direct: "Enviar-me um email quando alguém me citar, responder às minhas mensagens, mencionar o meu @nomedeutilizador, ou convidar-me para um tópico"
       email_private_messages: "Enviar-me um email quando alguém me envia uma mensagem"
@@ -726,7 +725,6 @@ pt:
     too_few_topics_and_posts_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentTopics} / %{requiredTopics}</strong> tópicos e <strong>%{currentPosts} / %{requiredPosts}</strong> mensagens. Novos visitantes precisam de conversações para ler e responder a."
     too_few_topics_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentTopics} / %{requiredTopics}</strong> tópios. Novos visitantes precisam de algumas conversações para ler e responder a."
     too_few_posts_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentPosts} / %{requiredPosts}</strong> mensagens. Novos visitantes precisam de algumas conversações para ler e responder a."
-    logs_error_rate_exceeded_notice: "%{timestamp}: Taxa atual de <a href='%{url}' target='_blank'>%{rate} erros/%{duration}</a> excedeu o limite configurável para este sítio de %{siteSettingLimit} erros/%{duration}."
     learn_more: "saber mais..."
     year: 'ano'
     year_desc: 'tópicos criados nos últimos 365 dias'
@@ -1360,6 +1358,7 @@ pt:
         about: "esta mensagem é uma wiki"
       archetypes:
         save: 'Guardar as Opções'
+      few_likes_left: "Obrigado por partilhar o amor! Restam-lhe apenas um gostos para hoje."
       controls:
         reply: "começar a compor uma resposta a este tópico"
         like: "gostar deste tópico"
@@ -1567,7 +1566,6 @@ pt:
           description: "Nunca será notificado de nada acerca de novos tópicos nestas categorias, e estes não irão aparecer nos recentes."
     flagging:
       title: 'Obrigado por ajudar a manter a nossa comunidade cívica!'
-      private_reminder: 'as sinalizações são privadas, visíveis <b>apenas</b> para o pessoal'
       action: 'Sinalizar Mensagem'
       take_action: "Acionar"
       notify_action: 'Mensagem'
@@ -2067,9 +2065,6 @@ pt:
           love:
             name: 'amor'
             description: "A cor do botão 'gosto'."
-          wiki:
-            name: 'wiki'
-            description: "Cor base utilizada para o fundo de mensagens wiki"
       email:
         title: "Emails"
         settings: "Configurações"
@@ -2649,10 +2644,7 @@ pt:
       earned_n_times:
         one: "Ganhou este distintivo 1 vez"
         other: "Ganhou este distintivo %{count} vezes"
-      more_with_badge: "Outros com este distintivo"
       title: Distintivos
-      allow_title: "pode ser usado como título"
-      multiple_grant: "pode ser premiado múltiplas vezes"
       badge_count:
         one: "1 Distintivo"
         other: "%{count} Distintivos"
@@ -2675,97 +2667,6 @@ pt:
           name: Outro
         posting:
           name: A publicar
-      badge:
-        editor:
-          name: Editor
-          description: Primeira edição de uma mensagem
-        basic_user:
-          name: Básico
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Atribuídas</a> todas as funções comunitárias essenciais
-        member:
-          name: Membro
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Atribuídos</a> convites
-        regular:
-          name: Habitual
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Atribuída</a> re-categorização, renomeação, seguimento de hiperligações e lounge
-        leader:
-          name: Líder
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Atribuída a</a> edição, destaque, encerramento, arquivo, separação e junção globais
-        welcome:
-          name: Bem-vindo
-          description: Recebeu um gosto
-        autobiographer:
-          name: Autobiógrafo
-          description: 'Preencheu informações no <a href="/my/preferences">perfil</a> de utilizador '
-        anniversary:
-          name: Aniversário
-          description: Membro ativo há um ano, publicou pelo menos uma vez
-        nice_post:
-          name: Boa Mensagem
-          description: Recebeu 10 gostos numa mensagem. Este distintivo pode ser concedido diversas vezes
-        good_post:
-          name: Ótima Mensagem
-          description: 'Recebeu 25 gostos numa mensagem. Este distintivo pode ser concedido diversas vezes '
-        great_post:
-          name: Excelente Mensagem
-          description: Recebeu 50 gostos numa mensagem. Este distintivo pode ser concedido diversas vezes
-        nice_topic:
-          name: Bom Tópico
-          description: Recebeu 10 gostos num tópico. Este distintivo pode ser concedido diversas vezes
-        good_topic:
-          name: Ótimo Tópico
-          description: 'Recebeu 25 gostos num tópico. Este distintivo pode ser concedido diversas vezes '
-        great_topic:
-          name: Excelente Tópico
-          description: Recebeu 50 gostos num tópico. Este distintivo pode ser concedido diversas vezes
-        nice_share:
-          name: Boa Partilha
-          description: Partilhou uma mensagem com 25 visitantes únicos
-        good_share:
-          name: Ótima Partilha
-          description: Partilhou uma mensagem com 300 visitantes únicos
-        great_share:
-          name: Excelente Partilha
-          description: Partilhou uma mensagem com 1000 visitantes únicos
-        first_like:
-          name: Primeiro Gosto
-          description: Gostou de uma mensagem
-        first_flag:
-          name: Primeira Sinalização
-          description: Sinalizou uma mensagem
-        promoter:
-          name: Promotor
-          description: Convidou um utilizador
-        campaigner:
-          name: Partidário
-          description: Convidou 3 utilizadores básicos (nível de confiança 1)
-        champion:
-          name: Campeão
-          description: Convidou 5 membros (nível de confiança 2)
-        first_share:
-          name: Primeira Partilha
-          description: Partilhou uma mensagem
-        first_link:
-          name: Primeira Hiperligação
-          description: Adicionou uma hiperligação interna para outro tópico
-        first_quote:
-          name: Primeira Citação
-          description: Citou um utilizador
-        read_guidelines:
-          name: Ler Diretrizes
-          description: Leu as <a href="/guidelines">diretrizes da comunidade</a>
-        reader:
-          name: Leitor
-          description: Ler todas as mensagens num tópico com mais de 100 mensagens
-        popular_link:
-          name: Hiperligação Popular
-          description: Foi publicada uma hiperligação externa com pelo menos 50 cliques
-        hot_link:
-          name: Hiperligação Quente
-          description: Foi publicada uma hiperligação externa com pelo menos 300 cliques
-        famous_link:
-          name: Hiperligação Famosa
-          description: Foi publicada uma hiperligação externa com pelo menos 1000 cliques
     google_search: |
       <h3>Pesquise com o Google</h3>
       <p>
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 07332f4aec..1528f3f94a 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -169,6 +169,8 @@ pt_BR:
     more: "Mais"
     less: "Menos"
     never: "nunca"
+    every_30_minutes: "a cada 30 minutos"
+    every_hour: "a cada hora"
     daily: "diário"
     weekly: "semanal"
     every_two_weeks: "a cada duas semanas"
@@ -316,7 +318,10 @@ pt_BR:
         one: "grupo"
         other: "grupos"
       members: "Membros"
+      topics: "Tópicos"
       posts: "Mensagens"
+      mentions: "Menções"
+      messages: "Mensagens"
       alias_levels:
         title: "Quem pode enviar mensagem e @mention a este grupo?"
         nobody: "Ninguém"
@@ -556,6 +561,7 @@ pt_BR:
         never: "nunca"
       email_digests:
         title: "Quando eu não visitar aqui, envie um resumo via email do que há de novo:"
+        every_30_minutes: "a cada 30 minutos"
         daily: "diariamente"
         every_three_days: "a cada três dias"
         weekly: "semanalmente"
@@ -879,7 +885,6 @@ pt_BR:
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -981,9 +986,6 @@ pt_BR:
         category: "Não há tópicos na categoria {{category}}."
         top: "Não há tópicos em alta."
         search: "Não foram encontrados resultados."
-        educate:
-          new: '<p>Seus novos tópicos aparecerão aqui.</p><p>Por padrão, tópicos são considerados novos e irão mostrar um indicador <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> se eles foram criados nos últimos 2 dias.</p><p>Você pode mudar isto nas suas <a href="%{userPrefsUrl}">preferências</a>.</p>'
-          unread: '<p>Seus tópicos não lidos aparecerão aqui.</p><p>Por padrão, tópicos são considerados não lidos e irão mostrar contadores <span class="badge new-posts badge-notification">1</span> se você:</p><ul><li>Criou o tópico</li><li>Respondeu para o tópico</li><li>Leu o tópico por mais de 4 minutos</li></ul><p>Ou se você explicitamente marcou o tópico para Acompanhar ou Assistir via o controle de notificação na parte de baixo de cada tópico.</p><p>Você pode mudar isto nas suas <a href="%{userPrefsUrl}">preferências</a>.</p>'
       bottom:
         latest: "Não há mais tópicos recentes."
         hot: "Não mais tópicos quentes."
@@ -1334,17 +1336,9 @@ pt_BR:
           like: "Descurtir"
           vote: "Desfazer voto"
         people:
-          off_topic: "{{icons}} marcado como off-topic"
-          spam: "{{icons}} marcado como spam"
-          spam_with_url: "{{icons}} marcou <a href='{{postUrl}}'>isto como spam</a>"
-          inappropriate: "{{icons}} marcado como inapropriado"
-          notify_moderators: "{{icons}} notificaram os moderadores"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>notificaram os moderadores</a>"
-          notify_user: "{{icons}} enviou uma mensagem particular"
-          notify_user_with_url: "{{icons}} enviou uma <a href='{{postUrl}}'>mensagem particular</a>"
-          bookmark: "{{icons}} favoritaram isto"
-          like: "{{icons}} curtiram isto"
-          vote: "{{icons}} votaram nisto"
+          off_topic: "marcado como off-topic"
+          spam: "marcado como spam"
+          inappropriate: "marcado como inapropriado"
         by_you:
           off_topic: "Você sinalizou isto como off-topic"
           spam: "Você sinalizou isto como spam"
@@ -1496,7 +1490,6 @@ pt_BR:
           description: "Você nunca será notificado sobre novos tópicos nessas categorias, e não aparecerão no Recentes."
     flagging:
       title: 'Obrigado por ajudar a manter a civilidade da nossa comunidade!'
-      private_reminder: 'sinalizações são privadas, <b>apenas</b> ficam visíveis a moderação'
       action: 'Sinalizar resposta'
       take_action: "Tomar Atitude"
       notify_action: 'Mensagem'
@@ -1508,7 +1501,6 @@ pt_BR:
       submit_tooltip: "Enviar uma sinalização privada"
       take_action_tooltip: "Atingir o limiar de denuncias imediatamente, ao invés de esperar para mais denuncias da comunidade"
       cant: "Desculpe, não é possível colocar uma sinalização neste momento."
-      notify_staff: 'Notificar Equipe'
       formatted_name:
         off_topic: "É Off-Tópico"
         inappropriate: "É inapropriado"
@@ -1885,11 +1877,9 @@ pt_BR:
             is_disabled: "Restaurar está desativado nas configurações do site."
             label: "Restaurar"
             title: "Restaurar o backup"
-            confirm: "Tem certeza de que quer restaurar este backup?"
           rollback:
             label: "Reverter"
             title: "Reverter o banco de dados para seu estado anterior"
-            confirm: "Tem certeza de que quer reverter o banco de dados para o estado anterior?"
       export_csv:
         user_archive_confirm: "Tem certeza que você quer baixar os seus tópicos?"
         success: "Exportação iniciada, você será notificado por mensagem particular quando o processo estiver completo."
@@ -1991,9 +1981,6 @@ pt_BR:
           love:
             name: 'curtir'
             description: "A cor do botão curtir."
-          wiki:
-            name: 'wiki'
-            description: "Cor base usada para o fundo em postagens do wiki."
       email:
         settings: "Settings"
         preview_digest: "Preview Digest"
@@ -2525,8 +2512,6 @@ pt_BR:
         mark_watching: '<b>m</b>, <b>w</b> Acompanhar tópico'
     badges:
       title: Emblemas
-      allow_title: "pode  ser usado como um título"
-      multiple_grant: "pode ser recebido várias vezes"
       badge_count:
         one: "1 Emblema"
         other: "%{count} Emblemas"
@@ -2549,97 +2534,6 @@ pt_BR:
           name: Outro
         posting:
           name: Postando
-      badge:
-        editor:
-          name: Editor
-          description: Primeira edição da resposta
-        basic_user:
-          name: Básico
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Concedido</a> todas as funções essenciais da comunidade
-        member:
-          name: Membro
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Concedido</a> envio de convites
-        regular:
-          name: Regular
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Concedido</a> recategorizar, renomear, seguir links e sala de lazer
-        leader:
-          name: Líder
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Concedido</a> edição global, fixar, fechar, arquivar, dividir e mesclar
-        welcome:
-          name: Bem-Vindo
-          description: Recebeu uma curtida
-        autobiographer:
-          name: Autobiógrafo
-          description: Preencher informações do <a href="/my/preferences">perfil</a>
-        anniversary:
-          name: Aniversário
-          description: Membro ativo por um ano, postou ao menos uma vez
-        nice_post:
-          name: Post Legal
-          description: Recebeu 10 curtidas em uma resposta. Esse emblema pode ser concedido várias vezes.
-        good_post:
-          name: Bom Post
-          description: Recebeu 25 curtidas em uma resposta. Esse emblema pode ser concedido várias vezes.
-        great_post:
-          name: Ótimo Post
-          description: Recebeu 50 curtidas em uma resposta. Esse emblema pode ser concedido várias vezes.
-        nice_topic:
-          name: Tópico Interessante
-          description: Recebeu 10 curtidas em um tópico. Esse emblema pode ser concedido várias vezes.
-        good_topic:
-          name: Tópico Bom
-          description: Recebeu 25 curtidas em um tópico. Esse emblema pode ser concedido várias vezes.
-        great_topic:
-          name: Tópico Excelente
-          description: Recebeu 50 curtidas em um tópico. Esse emblema pode ser concedido várias vezes.
-        nice_share:
-          name: Compartilhamento Interessante
-          description: Compartilhou uma postagem com 25 visitas únicas
-        good_share:
-          name: Compartilhamento Bom
-          description: Compartilhou uma postagem com 300 visitas únicas
-        great_share:
-          name: Compartilhamento Excelente
-          description: Compartilhou uma postagem com 1000 visitas únicas
-        first_like:
-          name: Primeiro Like
-          description: Curtiu uma resposta
-        first_flag:
-          name: Primeira Marcação
-          description: Sinalizar uma resposta
-        promoter:
-          name: Promotor
-          description: Convidou um usuário
-        campaigner:
-          name: Veterano
-          description: Convidou 3 usuários básicos (nível de confiança 1)
-        champion:
-          name: Campeão
-          description: Convidou 5 usuários básicos (nível de confiança 2)
-        first_share:
-          name: Primeiro Compartilhamento
-          description: Compartilhar uma resposta
-        first_link:
-          name: Primeiro Link
-          description: Adicionar um link interno em outro tópico
-        first_quote:
-          name: Primeira citação
-          description: Citado um usuário
-        read_guidelines:
-          name: Ler as regras
-          description: Leia as <a href="/guidelines">regras da comunidade</a>
-        reader:
-          name: Leitor
-          description: Leia cada resposta em um tópico com mais de 100 respostas
-        popular_link:
-          name: Link Popular
-          description: Postou um link externo com pelo menos 50 cliques
-        hot_link:
-          name: Link Quente
-          description: Postou um link externo com pelo menos 300 cliques
-        famous_link:
-          name: Link Famoso
-          description: Postou um link externo com pelo menos 1000 cliques
     google_search: |
       <h3>Buscar com o Google</h3>
       <p>
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index aadd4603e9..3987863a9e 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -220,7 +220,7 @@ ro:
         all_time: "Tot timpul"
         last_7_days: "Ultimele 7 zile"
         last_30_days: "Ultimele 30 de zile"
-      like_count: "Like-uri"
+      like_count: "Aprecieri"
       topic_count: "Subiecte"
       post_count: "Postări"
       user_count: "Utilizatori noi"
@@ -292,7 +292,6 @@ ro:
         few: "Această discuție are <b>1</b> postare în așteptare"
         other: "Această discuţie are <b>{{count}}</b> postări în aşteptare."
       confirm: "Salvează Schimbările"
-      delete_prompt: "Sunteţi sigur că vreţi să ştergeţi  <b>%{username}</b>? Această operaţiune va şterge toate postările, va bloca adresa de email şi adresa de IP."
       approval:
         title: "Necesită aprobare"
         description: "Am primit nouă postare dar trebuie să fie aprobată de un moderator înainte că ea să apară pe site. Va rugăm să aveţi răbdare."
@@ -347,6 +346,8 @@ ro:
         other: "grupuri"
       members: "Membri"
       posts: "Postări"
+      mentions: "Mențiuni"
+      messages: "Mesaje"
       alias_levels:
         nobody: "Nimeni"
         only_admins: "Doar Adminii"
@@ -354,8 +355,13 @@ ro:
         members_mods_and_admins: "Doar membri grupului, moderatorii și adminii"
         everyone: "Toată lumea"
       notifications:
+        watching:
+          title: "Urmărit"
+        tracking:
+          title: "Urmărit"
         regular:
           title: "Normal"
+          description: "Veți fi notificat dacă cineva vă menționează @numele sau vă scrie un reply."
     user_action_groups:
       '1': "Aprecieri Date"
       '2': "Aprecieri Primite"
@@ -438,9 +444,7 @@ ro:
         perm_default: "Activeaza notificarile"
         perm_denied_btn: "Nu se permite accesul"
         disable: "Dezactiveaza notificarile"
-        currently_enabled: "(acum activat)"
         enable: "Activeaza Notificarile"
-        currently_disabled: "(acum dezactivate)"
         each_browser_note: "Notati: Setarile vor fi modificate pe orice alt browser."
       dismiss_notifications: "Marchează toate ca citite"
       dismiss_notifications_tooltip: "Marchează cu citit toate notificările necitite"
@@ -698,8 +702,6 @@ ro:
       value_prop: "Cand creati un cont nou, vom retine exact ce ati citit, astfel continuati intotdeauna de unde ati ramas. Deasemenea primiti notificari, aici sau prin email atunci se posteaza ceva nou. Puteti \"aprecia\" postari pentru a impartasi iubire :heartbeat:"
     summary:
       enabled_description: "Vizualizați sumarul discuției: cea mai interesantă postare, așa cum a fost determinată de comunitate. Pentru toate postările, faceți click dedesubt."
-      description: "Există <b>{{replyCount}}</b> de răspunsuri."
-      description_time: "Există <b>{{replyCount}}</b> de răspunsuri cu timp de citit estimat la <b>{{readingTime}} de minute</b>."
       enable: 'Fă sumarul discuției'
       disable: 'Arată toate postările'
     deleted_filter:
@@ -719,15 +721,15 @@ ro:
     trust_level: 'Nivel de încredere'
     search_hint: 'Numele de utilizator sau email'
     create_account:
-      title: "Crează cont"
+      title: "Creează cont"
       failed: "Ceva a decurs greșit, poate că acest email e deja înregistrat, încearcă linkul parolă uitată "
     forgot_password:
       title: "Resetare parolă"
       action: "Mi-am uitat parola"
       invite: "Introduce-ți numele de utilizator sau adresa de email și vă vom trimite un email pentru resetarea parolei."
       reset: "Resetare Parolă"
-      complete_username: "Dacă contul se potrivește numelui de utilizator <b>%{username}</b>, ar trebuii să primiți un email cu instrucțiunile de resetare a parolei, în scurt timp."
-      complete_email: "dacă un cont se potrivește <b>%{email}</b>, ar trebuii să primiți un email cu instrucțiunile de resetare a parolei, în scurt timp."
+      complete_username: "Dacă contul se potrivește numelui de utilizator <b>%{username}</b>, ar trebui să primiți în scurt timp un email cu instrucțiunile de resetare a parolei."
+      complete_email: "Dacă un cont se potrivește cu <b>%{email}</b>, ar trebui să primiți un email în cel mai scurt timp cu instrucțiunile de resetare a parolei."
       complete_username_found: "Am găsit un cont care se potriveşte cu utilizatorul <b>%{username}</b>, veţi primi un email cu instrucţiunile cum să resetati parolă în cel mai scurt timp."
       complete_email_found: "Am găsit un cont care se potriveşte cu adresa <b>%{email}</b>, veţi primi un email cu instrucţiunile cum să resetati parolă în cel mai scurt timp."
       complete_username_not_found: "Nici un cont nu se potriveşte cu utilizatorul <b>%{username}</b>"
@@ -805,7 +807,7 @@ ro:
       reply_here: "Răspunde aici"
       reply: "Răspunde"
       cancel: "Anulează"
-      create_topic: "Crează o Discuţie"
+      create_topic: "Creează o Discuţie"
       create_pm: "Mesaj"
       title: "sau apasă Ctrl+Enter"
       users_placeholder: "adaugă un utilizator"
@@ -865,7 +867,6 @@ ro:
       mentioned: "<i title='a menționat' class='icon'>@</i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='a citat' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='a răspuns' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='a răspuns' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='a editat' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='a apreciat' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='Mesaj privat' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -937,8 +938,6 @@ ro:
         category: "Nu există nicio discuție din categoria {{category}}."
         top: "Nu exită nicio discuție de top."
         search: "Nu sunt rezulate la căutare."
-        educate:
-          new: '<p>Discuţiile noi vor apărea aici.</p><p>Implicit, discuţiile sunt considerate noi şi vor afişa indicatorul <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> dacă au fost create în ultimele 2 zile.</p><p>Puteţi schimba aceasta în <a href="%{userPrefsUrl}">preferinţele</a> dvs.</p>'
       bottom:
         latest: "Nu există nicio ultimă discuție."
         hot: "Nu mai există discuții importante."
@@ -952,8 +951,8 @@ ro:
         search: "Nu mai sunt rezultate."
     topic:
       filter_to: "{{post_count}} de postări în discuție"
-      create: 'Crează discuție'
-      create_long: 'Crează discuție nouă'
+      create: 'Creează discuție'
+      create_long: 'Creează discuție nouă'
       private_message: 'Scrie un mesaj.'
       archive_message:
         title: 'Arhivează'
@@ -1024,35 +1023,44 @@ ro:
         position: "postarea %{current} din %{total}"
       notifications:
         reasons:
-          '3_6': 'Veți primii notificări fiindcă priviți această categorie.'
-          '3_5': 'Veți primii notificări fiindcă ați început să citiți această discuție automat.'
-          '3_2': 'Veți primii notificări fiindcă citiți această discuție.'
-          '3_1': 'Veți primii notificări fiindcă ați creat această discuție.'
-          '3': 'Veți primii notificări fiindcă priviți această discuție.'
-          '2_8': 'Veți primii notificări fiindcă urmariți această categorie.'
-          '2_4': 'Veți primii notificări fiindcă ați postat un răspuns în această discuție.'
-          '2_2': 'Veți primii notificări fiindcă urmariți această discuție.'
-          '2': 'Veți primii notificări fiindcă  citiți <a href="/users/{{username}}/preferences">această discuție</a>.'
+          '3_6': 'Veți primi notificări deoarece priviți această categorie.'
+          '3_5': 'Veți primi notificări deoarece ați început să citiți această discuție automat.'
+          '3_2': 'Veți primi notificări fiindcă citiți această discuție.'
+          '3_1': 'Veți primi notificări fiindcă ați creat această discuție.'
+          '3': 'Veți primi notificări fiindcă priviți această discuție.'
+          '2_8': 'Veți primi notificări fiindcă urmăriți această categorie.'
+          '2_4': 'Veți primi notificări fiindcă ați postat un răspuns în această discuție.'
+          '2_2': 'Veți primi notificări fiindcă urmăriți această discuție.'
+          '2': 'Veți primi notificări fiindcă citiți <a href="/users/{{username}}/preferences">această discuție</a>.'
+          '1_2': 'Veți fi notificat dacă cineva vă menționează @numele sau vă scrie un reply.'
+          '1': 'Veți fi notificat dacă cineva vă menționează @numele sau vă scrie un reply.'
           '0_7': 'Ignorați toate notificările din această categorie.'
           '0_2': 'Ignorați toate notificările din această discuție.'
           '0': 'Ignorați toate notificările din această discuție.'
         watching_pm:
-          title: "Privind"
+          title: "Urmărit Activ"
+          description: "Numărul postărilor noi va fi arătat pentru acest mesaj și veți fi notificat pentru orice reply scris."
         watching:
-          title: "Privind"
+          title: "Urmărit Activ"
+          description: "Numărul postărilor noi va fi arătat pentru acest topic și veți fi notificat pentru orice reply scris."
         tracking_pm:
-          title: "Urmărind"
+          title: "Urmărit"
+          description: "Numărul postărilor noi va fi arătat pentru acest mesaj. Veți fi notificat dacă cineva vă menționează @numele sau vă scrie un reply."
         tracking:
-          title: "Urmărind"
+          title: "Urmărit"
+          description: "Numărul postărilor noi va fi arătat pentru acest topic. Veți fi notificat dacă cineva vă menționează @numele sau vă scrie un reply."
         regular:
           title: "Normal"
+          description: "Veți fi notificat dacă cineva vă menționează @numele sau vă scrie un reply."
         regular_pm:
           title: "Normal"
+          description: "Veți fi notificat dacă cineva vă menționează @numele sau vă scrie un reply."
         muted_pm:
           title: "Silențios"
           description: "Nu veţi fi niciodată notificat despre acest mesaj."
         muted:
           title: "Silențios"
+          description: "Nu veți fi notificat de discuțiile noi din acest topic și nu vor apărea în tabul necitite."
       actions:
         recover: "Rescrie discuție"
         delete: "Șterge Discuție"
@@ -1193,6 +1201,15 @@ ro:
         other: "vedeţi {{count}} răspunsuri ascunse"
       more_links: "{{count}} mai multe..."
       unread: "postarea nu a fost citită"
+      has_likes:
+        one: "O Apreciere"
+        few: "{{count}} Aprecieri"
+        other: "{{count}} de Aprecieri"
+      has_likes_title_only_you: "Ai apreciat acest post"
+      has_likes_title_you:
+        one: "Ați apreciat acest post împreună cu un alt utilizator."
+        few: "Ați apreciat acest post împreună cu alți {{count}} utilizatori."
+        other: "Ați apreciat acest post împreună cu alți {{count}} utilizatori."
       errors:
         create: "Ne pare rău , s-a semnalat o eroare în creerea postării dumneavoastră.Vă rugăm încercati iar."
         edit: "Ne pare rău , s-a semnalat o eroare în editarea postării dumneavoastră . Vă rugăm încercati iar."
@@ -1215,7 +1232,7 @@ ro:
       controls:
         reply: "începe compunerea unui răspuns pentru această postare"
         like: "apreciează acestă postăre"
-        has_liked: "ai retras aprecierea acestei postări "
+        has_liked: "ai apreciat acest răspuns"
         undo_like: "anuleazaă aprecierea"
         edit: "editează această postare"
         edit_anonymous: "Ne pare rău, dar trebuie să fiţi autentificat pentru a edita."
@@ -1259,18 +1276,6 @@ ro:
           bookmark: "Retrage marcare"
           like: "Retrage apreciere"
           vote: "Retrage vot"
-        people:
-          off_topic: "{{icons}} Semnalază asta ca în afara discuției"
-          spam: "{{icons}} Semnalează asta ca spam"
-          spam_with_url: "{{icons}} semnalează <a href='{{postUrl}}'>ca spam</a>"
-          inappropriate: "{{icons}} Semnalează asta ca necorespunzator"
-          notify_moderators: "{{icons}} moderatorii notificați"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'> moderatori notificați</a>"
-          notify_user: "{{icons}} a trimis un mesaj"
-          notify_user_with_url: "{{icons}} a trimis un <a href='{{postUrl}}'>mesaj</a>"
-          bookmark: "{{icons}} marchează asta"
-          like: "{{icons}} apreciat"
-          vote: "{{icons}} votat"
         by_you:
           off_topic: "Ați marcat ca fiind în afara discutiei"
           spam: "Ați marcat ca fiind spam"
@@ -1381,7 +1386,7 @@ ro:
       general: 'General'
       settings: 'Setări'
       delete: 'Șterge categorie'
-      create: 'Crează categorie'
+      create: 'Creează categorie'
       save: 'Salvează categorie'
       slug: 'Slug Categorie'
       slug_placeholder: '(Opțional) cuvinte-punctate pentru url'
@@ -1427,11 +1432,11 @@ ro:
           title: "Urmărire"
         regular:
           title: "Normal"
+          description: "Veți fi notificat dacă cineva vă menționează @numele sau vă scrie un reply."
         muted:
           title: "Silențios"
     flagging:
       title: 'De ce marcați această postare ca fiind privată?'
-      private_reminder: 'steagurile sunt private, vizibile  <b>numai</ b> personalului'
       action: 'Marcare'
       take_action: "Actionează"
       notify_action: 'Mesaj'
@@ -1443,7 +1448,6 @@ ro:
       submit_tooltip: "Acceptă marcarea privată"
       take_action_tooltip: "Accesati permisiunea marcarii imediat, nu mai asteptati alte marcaje comune"
       cant: "Ne pare rău nu puteți marca această postare deocamdată."
-      notify_staff: 'Anunță moderatorii'
       formatted_name:
         off_topic: "În afară discuției"
         inappropriate: "Inadecvat"
@@ -1582,7 +1586,7 @@ ro:
         other_periods: "vezi topul"
     browser_update: 'Din nefericire, <a href="http://www.discourse.org/faq/#browser"> browserul dumneavoastră este prea vechi pentru a funcționa pe acest forum </a>. Va rugăm <a href="http://browsehappy.com"> reânoiți browserul</a>.'
     permission_types:
-      full: "Crează / Răspunde / Vizualizează"
+      full: "Creează / Răspunde / Vizualizează"
       create_post: "Răspunde / Vizualizaează"
       readonly: "Vizualizaează"
   admin_js:
@@ -1812,11 +1816,9 @@ ro:
             is_disabled: "Restabilirea este dezactivată din setările siteului."
             label: "Restaurează"
             title: "Restabilește rezervă"
-            confirm: "Sunteți sigur că doriți restabilirea acestei rezerve?"
           rollback:
             label: "Revenire la situaţia anterioară"
             title: "Restabilește baza de date în stadiul anterior"
-            confirm: "Sunteți sigur că doriți restabilirea bazei de date în stadul precedent?"
       export_csv:
         user_archive_confirm: "Sunteţi sigur că doriţi să descărcaţi mesajele dvs.?"
         success: "Exportul a fost iniţiat. Veţi primi un mesaj de notificare când procesul se va termina."
@@ -1919,9 +1921,6 @@ ro:
           love:
             name: 'Iubire'
             description: "Culoarea butonului de apreciere."
-          wiki:
-            name: 'wiki'
-            description: "Culoarea de bază folosită pentru fundalul postărilor pe wiki."
       email:
         title: "Emails"
         settings: "Opțiuni"
@@ -2023,7 +2022,7 @@ ro:
             anonymize_user: "fă userul anonim"
             change_category_settings: "schimbă setările categoriei"
             delete_category: "șterge categorie"
-            create_category: "crează categorie"
+            create_category: "creează categorie"
             block_user: "blochează utilizator"
             unblock_user: "deblochează utilizator"
             grant_admin: "Acordă titlul de Admin"
@@ -2199,9 +2198,9 @@ ro:
         unblock_failed: 'S-a semnalat o problemă la deblocarea utlizatorului.'
         block_failed: 'S-a semnalat o problemă la blocarea utilizatorului.'
         block_accept: 'Blochează utilizatorul'
-        deactivate_explanation: "Un utilizator dezactivat va trebuii sa-și reactvieze emailul."
+        deactivate_explanation: "Un utilizator dezactivat va trebui să-și revalideze email-ul."
         suspended_explanation: "Un utilizator suspendat nu se poate autentifica"
-        block_explanation: "Un utilizator blocat nu poate posta sau pornii o discuție."
+        block_explanation: "Un utilizator blocat nu poate posta sau porni o discuție."
         trust_level_change_failed: "S-a semnalat o problemă la schimbarea nivelului de încredere al utilizatorului."
         suspend_modal_title: "Suspendă utilizator"
         trust_level_2_users: "utilizatori de nivel de încredere 2 "
@@ -2244,7 +2243,7 @@ ro:
       user_fields:
         title: "Câmpuri utilizator"
         help: "Adăugaţi câmpuri pe care utilizatorii le pot completa."
-        create: "Crează un câmp utilizator"
+        create: "Creează un câmp utilizator"
         untitled: "Fără titlu"
         name: "Nume câmp"
         type: "Tip câmp"
@@ -2352,7 +2351,7 @@ ro:
         trigger_type:
           none: "reinprospatează zilnic"
           post_action: "Când un utilizator reacționează la un mesaj"
-          post_revision: "Când un utlizator crează sau editează un mesaj"
+          post_revision: "Când un utlizator creează sau editează un mesaj"
           trust_level_change: "Când un utilizator schimbă nivelul de încredere"
           user_change: "Când un utilizator este editat sau creat"
         preview:
@@ -2428,7 +2427,7 @@ ro:
         next_prev: '<b>`</b>/<b>~</b> selecția Urmatoare/Precedentă'
       application:
         title: 'Applicația'
-        create: '<b>c</b> Crează discuție nouă'
+        create: '<b>c</b> Creează discuție nouă'
         notifications: '<b>n</b> Deschide notificare'
         hamburger_menu: '<b>=</b> Deschide meniul hamburger'
         user_profile_menu: '<b>p</b> Deschide meniu utilizator'
@@ -2458,10 +2457,7 @@ ro:
         mark_tracking: '<b>m</b>, <b>t</b> Urmăriți discuția'
         mark_watching: '<b>m</b>, <b>w</b> Urmăriți discuția îndeaproape'
     badges:
-      more_with_badge: "Alții cu această insignă"
       title: Insigne
-      allow_title: "poate fi folosit ca titlu"
-      multiple_grant: "pot fi acordate de mai multe ori"
       badge_count:
         one: "1 Insignă"
         few: "%{count} Insigne"
@@ -2487,97 +2483,6 @@ ro:
           name: Altele
         posting:
           name: Postând
-      badge:
-        editor:
-          name: Editor
-          description: Prima postare editată
-        basic_user:
-          name: De baza
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Vi se permite acces</a> la toate funcțiile esențiale ale comunității
-        member:
-          name: Membru
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Permisiuni</a> invitații
-        regular:
-          name: Obișnuit
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Vi se permit</a> recategorisirea, redenumirea, link-urile urmărite și acces lounge
-        leader:
-          name: Lider
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Vi se permit</a> editarea globală, fixarea, arhivarea, despărțirea și combinarea
-        welcome:
-          name: Bine ai venit
-          description: A primit o apreceiere
-        autobiographer:
-          name: Autobiograf
-          description: Informația de <a href="/my/preferences">profil</a> completă a utilizatorului
-        anniversary:
-          name: Aniversare
-          description: Membru activ pentru un an, a scris măcar un mesaj
-        nice_post:
-          name: Mesaj drăguţ
-          description: A primit 10 aprecieri pentru o postare. Această insignă poate fi acordată de multiple ori
-        good_post:
-          name: Mesaj bun
-          description: A primit 25 de aprecieri pentru un mesaj. Această insignă poate fi acordată de mai multe ori
-        great_post:
-          name: Mesaj foarte bun
-          description: A primit 50 de aprecieri pentru un mesaj. Această insignă poate fi acordată de mai multe ori
-        nice_topic:
-          name: Discuţie Drăguţă
-          description: A primit 10 de aprecieri pentru o discuţie. Această insignă poate fi acordată de mai multe ori
-        good_topic:
-          name: Discuţie Bună
-          description: A primit 25 de aprecieri pentru o discuţie. Această insignă poate fi acordată de mai multe ori
-        great_topic:
-          name: Discuţie Foarte Bună
-          description: A primit 50 de aprecieri pentru o discuţie. Această insignă poate fi acordată de mai multe ori
-        nice_share:
-          name: Distribuire drăguță
-          description: A împărţit un mesaj cu 25 utilizatori unici
-        good_share:
-          name: Distribuire bună
-          description: A distribuit un mesaj către 300 utilizatori unici
-        great_share:
-          name: Super distribuire
-          description: A distribuit un mesaj către 1000 utilizatori unici
-        first_like:
-          name: Prima apreciere
-          description: A apreciat un mesaj
-        first_flag:
-          name: Prima reclamație
-          description: A reclamat un mesaj
-        promoter:
-          name: Promotor
-          description: A invitat un utilizator
-        campaigner:
-          name: Combatant
-          description: A invitat 3 membri simpli (nivel de incredere 1)
-        champion:
-          name: Campion
-          description: A invitat 5 membri (nivel de incredere 2)
-        first_share:
-          name: Primul
-          description: A distribuit un mesaj
-        first_link:
-          name: Primul link
-          description: A adăugat o adresă internă catre altă discuție
-        first_quote:
-          name: Primul citat
-          description: A citat un alt utilizator
-        read_guidelines:
-          name: Citește ghidul comunității
-          description: Citește <a href="/guidelines">ghidul comunității</a>
-        reader:
-          name: Cititor
-          description: A citit fiecare mesaj dintr-o discuție cu mai mult de 100 de mesaje
-        popular_link:
-          name: Link popular
-          description: A postat un link extern cu cel puțin 50 de accesări
-        hot_link:
-          name: Link interesant
-          description: A postat un link extern cu cel puțin 300 de accesări
-        famous_link:
-          name: Link foarte popular
-          description: A postat un link extern cu cel puțin 1000 de accesări
     google_search: |
       <h3>Căutați cu Google</h3>
       <p>
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 27a05d5525..4bbee74427 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -320,6 +320,7 @@ ru:
         many: "В этой теме <b>{{count}}</b> сообщений, ожидающих проверки"
         other: "В этой теме <b>{{count}}</b> сообщений, ожидающих проверки"
       confirm: "Сохранить"
+      delete_prompt: "Вы уверены, что хотите удалить <b>%{username}</b>? Это также удалит все его сообщения и заблокирует его email и IP-адрес."
       approval:
         title: "Сообщения для проверки"
         description: "Ваше сообщение отправлено, но требует проверки и утверждения модератором. Пожалуйста, будьте терпеливы."
@@ -376,7 +377,9 @@ ru:
         many: "групп"
         other: "групп"
       members: "Участники"
+      topics: "Темы"
       posts: "Сообщения"
+      messages: "Сообщения"
       alias_levels:
         nobody: "Никто"
         only_admins: "Только администраторы"
@@ -387,6 +390,8 @@ ru:
         title: "Уровень доверия участника при создании:"
         none: "(Нет)"
       notifications:
+        watching:
+          title: "Отслеживание"
         tracking:
           title: "Следить"
     user_action_groups:
@@ -524,6 +529,8 @@ ru:
         groups: "Мои группы"
         bulk_select: "Выберите сообщения"
         move_to_inbox: "Переместить во входящие"
+        move_to_archive: "Архив"
+        failed_to_move: "Невозможно переместить выделенные сообщения (возможно, у вас проблемы с Интернетом)"
         select_all: "Выбрать все"
       change_password:
         success: "(письмо отправлено)"
@@ -609,6 +616,12 @@ ru:
         title: "Иконка карточки пользователя"
       website: "Веб-сайт"
       email_settings: "E-mail"
+      like_notification_frequency:
+        always: "Всегда"
+        never: "Никогда"
+      email_previous_replies:
+        always: "всегда"
+        never: "никогда"
       email_digests:
         title: "В случае моего отсутствия на сайте присылайте мне сводку новостей по почте:"
         every_30_minutes: "каждые 30 минут"
@@ -770,6 +783,8 @@ ru:
       value_prop: "После регистрации мы сможем запоминать, где вы закончили чтение, а когда вы заглянете в ту или иную тему снова, мы откроем ее там, где вы остановились в прошлый раз. Мы также сможем уведомлять вас о новых ответах в любимых темах в вашем личном кабинете или по электронной почте. А самое приятное - после регистрации можно ставить сердечки, тем самым выражая свою симпатию автору. :heartbeat:"
     summary:
       enabled_description: "Вы просматриваете выдержку из темы - только самые интересные сообщения по мнению сообщества."
+      description: "Есть <b>{{replyCount}}</b> ответов."
+      description_time: "<b>{{replyCount}}</b> ответов с предполагаемым временем прочтения около <b>{{readingTime}} минут</b>."
       enable: 'Сводка по теме'
       disable: 'Показать все сообщения'
     deleted_filter:
@@ -835,6 +850,8 @@ ru:
       twitter:
         title: "С помощью Twitter"
         message: "Вход с помощью учетной записи Twitter (убедитесь, что блокировщик всплывающих окон отключен)"
+      instagram:
+        message: "Вход с помощью учетной записи Instagram (убедитесь, что блокировщик всплывающих окон отключен)"
       facebook:
         title: "С помощью Facebook"
         message: "Вход с помощью учетной записи Facebook (всплывающие окна должны быть разрешены)"
@@ -939,7 +956,6 @@ ru:
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -962,6 +978,7 @@ ru:
         granted_badge: "Награда получена от"
       popup:
         mentioned: '{{username}} упомянул вас в "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} упомянул вас в "{{topic}}" - {{site_title}}'
         quoted: '{{username}} процитировал Вас в "{{topic}}" - {{site_title}}'
         replied: '{{username}} ответил вам в "{{topic}}" - {{site_title}}'
         posted: '{{username}} написал в "{{topic}}" - {{site_title}}'
@@ -973,6 +990,7 @@ ru:
       from_my_computer: "From my device"
       from_the_web: "From the web"
       remote_tip: "ссылка на изображение"
+      remote_tip_with_attachments: "ссылка на изображение или файл {{authorized_extensions}}"
       local_tip: "выбрать изображения с вашего устройства"
       local_tip_with_attachments: "выбрать изображения или файлы с вашего устройства {{authorized_extensions}}"
       hint: "(вы так же можете перетащить объект в редактор для его загрузки)"
@@ -1424,6 +1442,10 @@ ru:
           bookmark: "Удалить из закладок"
           like: "Больше не нравится"
           vote: "Отозвать голос"
+        people:
+          notify_user: "отправил сообщение"
+          like: "понравилось это"
+          vote: "проголосовал за это"
         by_you:
           off_topic: "Помечена вами как оффтопик"
           spam: "Помечена вами как спам"
@@ -1757,6 +1779,12 @@ ru:
         title: "Закладки"
         help: "темы, которые вы добавили в закладки"
       category:
+        title: "{{categoryName}}"
+        title_with_count:
+          one: "{{categoryName}} (1)"
+          few: "{{categoryName}} ({{count}})"
+          many: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "последние темы в разделе {{categoryName}}"
       top:
         title: "Обсуждаемые"
@@ -1836,6 +1864,7 @@ ru:
           refresh_report: "Обновить отчет"
           start_date: "Дата от"
           end_date: "Дата до"
+          groups: "Все группы"
       commits:
         latest_changes: "Обновления в репозитории Github"
         by: "от"
@@ -1930,6 +1959,7 @@ ru:
         add: "Добавить"
         add_members: "Добавить участников"
         custom: "Настраиваемые"
+        bulk_select: "(выберите группу)"
         automatic: "Автоматические"
         automatic_membership_email_domains: "Пользователи, которые регистрируются с доменом электронной почты, включенным в этот список, будут автоматически добавлены в эту группу:"
         automatic_membership_retroactive: "Применить тот же домен электронной почты чтобы добавить существующих зарегистрированных пользователей"
@@ -2011,9 +2041,11 @@ ru:
             is_disabled: "Восстановление отключено в настройках сайта."
             label: "Восстановить"
             title: "Восстановить резервную копию"
+            confirm: "Вы уверены, что хотите восстановить этот бэкап?"
           rollback:
             label: "Откатить"
             title: "Откатить базу данных к предыдущему рабочему состоянию"
+            confirm: "Вы уверены, что хотите откатить базу данных до предыдущего рабочего состояния?"
       export_csv:
         user_archive_confirm: "Вы уверены, то хотите скачать все ваши сообщения?"
         success: "Процедура экспорта начата, мы отправим вам сообщение, когда процесс будет завершен."
@@ -2114,12 +2146,15 @@ ru:
             description: "Цвет кнопки «Мне нравится»."
       email:
         settings: "Настройки"
+        templates: "Шаблоны"
         preview_digest: "Просмотр сводки"
         sending_test: "Отправка тестового письма..."
         error: "<b>ОШИБКА</b> - %{server_error}"
         test_error: "При отправке тестового письма произошла ошибка. Пожалуйста, внимательно проверьте ваши почтовые настройки, проверьте, что ваш сервер не блокирует почтовые соединения, и попытайтесь снова."
         sent: "Отправлено"
         skipped: "Пропущенные"
+        received: "Принято"
+        rejected: "Отклонено"
         sent_at: "Отправлено"
         time: "Время"
         user: "Пользователь"
@@ -2136,6 +2171,28 @@ ru:
         last_seen_user: "Последнее посещение:"
         reply_key: "Ключ ответа"
         skipped_reason: "Причина пропуска"
+        incoming_emails:
+          from_address: "От"
+          to_addresses: "Кому"
+          cc_addresses: "Скрытая копия"
+          subject: "Тема"
+          error: "Ошибка"
+          none: "Входящих сообщений нет"
+          modal:
+            title: "Подробности Входящего Email"
+            error: "Ошибка"
+            return_path: "Return-Path"
+            message_id: "Message-Id"
+            in_reply_to: "In-Reply-To"
+            from: "От"
+            to: "Кому"
+            cc: "Скрытая копия"
+            subject: "Тема"
+          filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "to@example.com"
+            cc_placeholder: "cc@example.com"
+            error_placeholder: "Ошибка"
         logs:
           none: "Записи в журнале регистрации не найдены."
           filters:
@@ -2552,6 +2609,11 @@ ru:
             header: "ВНИМАНИЕ!"
             text: "Обнаружены несуществующие примеры выдачи наград. Это может произойти, когда запрос возвращает несуществующие идентификаторы ID пользователей или сообщений. Это может привести к неожиданным проблемам со временем, поэтому внимательно проверьте ваш запрос."
           no_grant_count: "Нет наград для выдачи."
+          grant_count:
+            one: "Будет выдана <b>1</b> награда."
+            few: "<b>%{count}</b> наград будут выданы."
+            many: "<b>%{count}</b> наград будут выданы."
+            other: "<b>%{count}</b> наград будут выданы."
           sample: "Пример:"
           grant:
             with: <span class="username">%{username}</span>
@@ -2567,14 +2629,17 @@ ru:
         delete_confirm: "Вы уверены, что хотите удалить иконку :%{name}:?"
       embedding:
         title: "Встраивание"
+        host: "Разрешённые Хосты"
         edit: "изменить"
         add_host: "Добавить хост"
         settings: "Настройки встраивания"
+        feed_settings: "Настройки Фида"
         embed_post_limit: "Максимальное количество вложенных сообщений"
         embed_username_key_from_feed: "Ключ для извлечения пользователя из ленты"
         embed_truncate: "Обрезать встроенные сообщения."
         embed_whitelist_selector: "Селекторы CSS которые разрешены для использования."
         embed_blacklist_selector: "Селекторы CSS которые запрещены для использования."
+        feed_polling_enabled: "Импорт сообщений через RSS/ATOM"
         save: "Сохранить настройки встраивания"
       permalink:
         title: "Постоянные ссылки"
@@ -2648,8 +2713,6 @@ ru:
         mark_watching: '<b>m</b>, <b>w</b> Наблюдать за темой'
     badges:
       title: Награды
-      allow_title: "Разрешить использовать в качестве титула"
-      multiple_grant: "может быть получено несколько раз"
       badge_count:
         one: "1 награда"
         few: "%{count} награды"
@@ -2678,97 +2741,6 @@ ru:
           name: Прочее
         posting:
           name: Темы и сообщения
-      badge:
-        editor:
-          name: Редактор
-          description: Впервые отредактировал сообщение
-        basic_user:
-          name: Базовый
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Получил доступ</a> ко всем основным функциям сообщества
-        member:
-          name: Участник
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Получил возможность</a> приглашать новых пользователей в сообщество
-        regular:
-          name: Активный
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Получил возможность</a> изменять раздел тем и переименовывать их, а также доступ к Фойе и отслеживаемым ссылкам
-        leader:
-          name: Лидер
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Получил глобальные права </a> редактировать, прилепливать, закрывать, архивировать, разделять и соединять темы
-        welcome:
-          name: Добро пожаловать
-          description: Получил отметку "Мне нравится"
-        autobiographer:
-          name: Автобиограф
-          description: Заполнил информацию в <a href="/my/preferences">профиле пользователя</a>
-        anniversary:
-          name: Годовщина
-          description: Активный пользователь в течении года, создал как минимум одну тему.
-        nice_post:
-          name: Хорошее сообщение
-          description: Получил 10 отметок "Мне нравится" за свое сообщение. Эта награда может быть выдана более одного раза
-        good_post:
-          name: Отличное сообщение
-          description: Получил 25 отметок "Мне нравится" за свое сообщение. Эта награда может быть выдана более одного раза
-        great_post:
-          name: Отменное сообщение
-          description: Получил 50 отметок "Мне нравится" за свое сообщение. Эта награда может быть выдана более одного раза
-        nice_topic:
-          name: Хорошая тема
-          description: Получил 10 отметок "Мне нравится" за свою тему. Эта награда может быть выдана более одного раза
-        good_topic:
-          name: Отличная тема
-          description: Получил 25 отметок "Мне нравится" за свою тему. Эта награда может быть выдана более одного раза
-        great_topic:
-          name: Отменная тема
-          description: Получил 50 отметок "Мне нравится" за свою тему. Эта награда может быть выдана более одного раза
-        nice_share:
-          name: Хороший вклад в популярность
-          description: Поделился ссылкой на сообщение, и ее открыли 25 раз
-        good_share:
-          name: Значительный вклад в популярность
-          description: Поделился ссылкой на сообщение, и ее открыли 300 раз
-        great_share:
-          name: Бесценный вклад в популярность
-          description: Поделился ссылкой на сообщение, и ее открыли 1000 раз
-        first_like:
-          name: Первая симпатия
-          description: Понравилось сообщение
-        first_flag:
-          name: Первая жалоба
-          description: Помог модератору, обратив его внимание на проблемное сообщение
-        promoter:
-          name: Промоутер
-          description: Пригласил нового пользователя
-        campaigner:
-          name: Активист
-          description: Пригласил троих пользователей, достигших 1-го уровня доверия
-        champion:
-          name: Чемпион
-          description: Пригласил пятерых пользователей, достигших 2-го уровня доверия
-        first_share:
-          name: Первый вклад в популярность
-          description: Впервые поделился ссылкой на сообщение
-        first_link:
-          name: Первая ссылка
-          description: Добавил внутреннюю ссылку на другую тему
-        first_quote:
-          name: Первая цитата
-          description: Процитировал другого пользователя
-        read_guidelines:
-          name: Руководство пользователя
-          description: Прочитал <a href="/guidelines">руководство пользователя</a>
-        reader:
-          name: Читатель
-          description: Прочитал каждое сообщение в теме с более чем 100 сообщениями
-        popular_link:
-          name: Популярная ссылка
-          description: Оставил внешнюю ссылку с более чем 50 кликов
-        hot_link:
-          name: Горячая ссылка
-          description: Оставил внешнюю ссылку с более чем 300 кликов
-        famous_link:
-          name: Легендарная ссылка
-          description: Использовал внешнюю ссылку, которую открыли более 1000 раз
     google_search: |
       <h3>Поиск через Google</h3>
       <p>
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 6f84ba1dc0..ed01c9893c 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -946,7 +946,6 @@ sk:
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -2699,10 +2698,7 @@ sk:
         one: "Získal tento odkaz 1 krát"
         few: "Získal tento odkaz %{count} krát"
         other: "Získal tento odkaz %{count} krát"
-      more_with_badge: "Iný s týmto odznakom"
       title: Odznaky
-      allow_title: "môže byť použitý ako názov"
-      multiple_grant: "Môže byť ocenené viacnásobne"
       badge_count:
         one: "1 Odznak"
         few: "%{count} Odznaky"
@@ -2728,97 +2724,6 @@ sk:
           name: Ostatné
         posting:
           name: Prispievam
-      badge:
-        editor:
-          name: Editor
-          description: Úprava prvého príspevku
-        basic_user:
-          name: Základné
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Povolené</a> všetky základné funkcie komunity
-        member:
-          name: Člen
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Povolené</a> pozývanie
-        regular:
-          name: Bežný
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Povolené</a> zmeny kategóriií, premenovávanie, odkazy a lóža
-        leader:
-          name: Vodca
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Pridelené</a> globálna editácia, pripnutia, uzatváranie, archivovanie, rozdeľovanie a spájanie
-        welcome:
-          name: Vitajte
-          description: Prijal "Páči sa"
-        autobiographer:
-          name: Autobiograf
-          description: Vyplnený užívateľský <a href="/my/preferences">profil</a>
-        anniversary:
-          name: Výročie
-          description: Aktívny člen, napísal aspoň jeden príspevok za rok
-        nice_post:
-          name: Pekný príspevok
-          description: Príspevok získal 10 "Páči sa". Tento odznak môže byť pridelený viac krát
-        good_post:
-          name: Dobrý príspevok
-          description: Príspevok získal 25 "Páči sa". Tento odznak môže byť pridelený viac krát
-        great_post:
-          name: Vynikajúci príspevok
-          description: Príspevok získal 50 "Páči sa". Tento odznak môže byť pridelený viac krát
-        nice_topic:
-          name: Pekná téma
-          description: Téma získala 10 "Páči sa". Tento odznak môže byť pridelený viac krát
-        good_topic:
-          name: Dobrá téma
-          description: Téma získala 25 "Páči sa". Tento odznak môže byť pridelený viac krát
-        great_topic:
-          name: Vynikajúca téma
-          description: Téma získala 50 "Páči sa". Tento odznak môže byť pridelený viac krát
-        nice_share:
-          name: Pekné zdieľanie
-          description: Zdieľaný príspevok s 25 jedinečnými návštevami
-        good_share:
-          name: Dobré zdieľanie
-          description: Zdieľaný príspevok s 300 jedinečnými návštevami
-        great_share:
-          name: Výborné zdieľanie
-          description: Zdieľaný príspevok s 1000 jedinečnými návštevami
-        first_like:
-          name: Prvé "Páči sa mi"
-          description: Príspevok, ktorý sa páčil
-        first_flag:
-          name: Prvé označenie
-          description: Označený príspevok
-        promoter:
-          name: Propagátor
-          description: pozval užívateľa
-        campaigner:
-          name: Bojovník
-          description: Pozval 3 základných užívateľov (stupeň dôvery 1)
-        champion:
-          name: Šampión
-          description: Pozval 5 členov (stupeň dôvery 2)
-        first_share:
-          name: Prvé zdieľanie
-          description: Zdieľal príspevok
-        first_link:
-          name: Prvý odkaz
-          description: Pridaný vnútorný odkaz na ďalšiu tému
-        first_quote:
-          name: Prvý citát
-          description: Citoval užívateľa
-        read_guidelines:
-          name: 'Prečítať pravidlá '
-          description: Prečítať <a href="/guidelines">pravidlá komunity</a>
-        reader:
-          name: Čitateľ
-          description: Prečítať každý príspevok v téme, ktorá má viac ako 100 príspevkov
-        popular_link:
-          name: Populárny odkaz
-          description: Príspevok s externým odkazom s najmenej 50 kliknutiami
-        hot_link:
-          name: Horúci odkaz
-          description: Príspevok s externým odkazom s najmenej 300 kliknutiami
-        famous_link:
-          name: Skvelý odkaz
-          description: Príspevok s externým odkazom s najmenej 1000 kliknutiami
     google_search: |
       <h3>Vyhľadávať pomocou Google</h3>
       <p>
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 85c7110c0f..2f97296d43 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -100,6 +100,8 @@ sq:
         x_years:
           one: "1 year later"
           other: "%{count} years later"
+      previous_month: 'Muaji i Kaluar'
+      next_month: 'Muaji Tjetër'
     share:
       topic: 'shpërnda një lidhje tek kjo temë'
       post: 'postim #%{postNumber}'
@@ -109,12 +111,27 @@ sq:
       google+: 'shpërndaje këtë lidhje në Google+'
       email: 'dërgo këtë lidhje me email'
     action_codes:
+      split_topic: "ndaje këtë teme %{when}"
+      invited_user: "ftuar %{who} %{when}"
+      removed_user: "hequr %{who} %{when}"
       autoclosed:
         enabled: 'mbyllur %{when}'
         disabled: 'hapur %{when}'
       closed:
         enabled: 'mbyllur %{when}'
         disabled: 'hapur %{when}'
+      archived:
+        enabled: 'arkivuar %{when}'
+        disabled: 'ç''arkivuar %{when}'
+      pinned:
+        enabled: 'mbërthyer %{when}'
+        disabled: 'ç''mbërthyer %{when}'
+      pinned_globally:
+        enabled: 'mbërthyer globalisht %{when}'
+        disabled: 'ç''mbërthyer %{when}'
+      visible:
+        enabled: 'listuar %{when}'
+        disabled: 'ç''listuar %{when}'
     topic_admin_menu: "topic admin actions"
     emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent."
     s3:
@@ -158,6 +175,8 @@ sq:
     more: "Më shumë"
     less: "Më pak"
     never: "asnjëher"
+    every_30_minutes: "çdo 30 minuta"
+    every_hour: "çdo orë"
     daily: "ditore"
     weekly: "javore"
     every_two_weeks: "çdo dy javë"
@@ -169,6 +188,7 @@ sq:
       other: "{{count}} karakterë"
     suggested_topics:
       title: "Temat e Sugjeruara"
+      pm_title: "Mesazhet e Sygjeruara"
     about:
       simple_title: "Rreth"
       title: "Rreth %{title}"
@@ -216,6 +236,7 @@ sq:
     saved: "U ruajt!"
     upload: "Ngarko"
     uploading: "Duke nga ngarkuar..."
+    uploading_filename: "Duke Ngarkuar {{filename}}..."
     uploaded: "U ngarkua!"
     enable: "Aktivizo"
     disable: "Disaktivizo"
@@ -223,6 +244,7 @@ sq:
     revert: "Rikthe"
     failed: "Dështojë"
     switch_to_anon: "Mënyrë Anonime"
+    switch_from_anon: "Dalja e Anonimit"
     banner:
       close: "Hiq këtë reklamë."
       edit: "Edit this banner >>"
@@ -245,7 +267,7 @@ sq:
         one: "This topic has <b>1</b> post awaiting approval"
         other: "This topic has <b>{{count}}</b> posts awaiting approval"
       confirm: "Ruaj ndryshimet"
-      delete_prompt: "Are you sure you want to delete <b>%{username}</b>? This will remove all of their posts and block their email and ip address."
+      delete_prompt: "A jeni te sigurtë që doni të fshini <b>%{username}</b>? Ky veprim do të fshijë çdo shkrim të tyre dhe do bllokojë e-mailin dhe IP e tyre."
       approval:
         title: "Post Needs Approval"
         description: "We've received your new post but it needs to be approved by a moderator before it will appear. Please be patient."
@@ -288,20 +310,47 @@ sq:
         one: "1 user"
         other: "%{count} users"
     groups:
+      empty:
+        posts: "Nuk ka postim nga anëtarët e këtij grupi."
+        members: "Nuk ka asnjë anëtar në këtë grup."
+        mentions: "Nuk ka përmendje në këtë grup."
+        messages: "Nuk ka mesazhe për këtë grup."
+        topics: "Nuk ka asnjë temë nga anëtarët e këtij grupi."
       add: "Shto"
       selector_placeholder: "Shto anëtarë"
+      owner: "pronar"
       visible: "Grupi është i dukshëm për të gjithë përdoruesit"
       title:
         one: "grupë"
         other: "grupet"
       members: "Anëtarë"
+      topics: "Tema"
       posts: "Postime"
+      mentions: "Përmendje"
+      messages: "Nesazhe"
       alias_levels:
+        title: "Kush mund ti bëjë mesazh dhe @permendje këtij grupi?"
         nobody: "Asnjëri"
         only_admins: "Vetëm adminët"
         mods_and_admins: "Vetëm moderatorët dhe Adminët"
         members_mods_and_admins: "Vetëm anëtarët e grupit, moderatorët dhe administratorët"
         everyone: "Të gjithë"
+      trust_levels:
+        title: "Niveli i besimit automatikisht shtohet për anëtarët e grupit:"
+        none: "Asnje"
+      notifications:
+        watching:
+          title: "Duke Parë"
+          description: "Ju do të njoftoheni në çdo postim të ri, dhe numburi i ri i përgjigjeve do të tregohet."
+        tracking:
+          title: "Ndjekje"
+          description: "Ju do të njoftoheni në qoftë se dikush ju pëmend me @emri ose ju përgjigjet, gjithashtu numbri i përgjigjeve do të tregohet."
+        regular:
+          title: "Normale"
+          description: "Ju do të njoftoheni në qoftë se dikush ju përmend me @emrin ose ju përgjigjet."
+        muted:
+          title: "Heshtur"
+          description: "Ju asnjëherë nuk do të njoftoheni për cdo gjë qe mund të ndodhë në këtë teme të këtij grupi."
     user_action_groups:
       '1': "Pëlqime të Dhëna"
       '2': "Pëlqime të marra"
@@ -320,8 +369,15 @@ sq:
       all_subcategories: "të gjitha"
       no_subcategory: "asnjë"
       category: "Kategori"
+      category_list: "Trego listen e kateogorive"
       reorder:
+        title: "Rendit Kategoritë"
+        title_long: "Ri-organizo listën e kategorive"
+        fix_order: "Rregullo Pozicionet"
+        fix_order_tooltip: "Jo të gjitha kategoritë kanë një numbë pozicioni unik, kjo mund të shkaktojë rezultate të pa vlefshme."
+        save: "Ruaje Renditjen"
         apply_all: "Apliko"
+        position: "Pozicioni"
       posts: "Postime"
       topics: "Tema"
       latest: "Të fundit"
@@ -370,15 +426,14 @@ sq:
       invited_by: "Të ftuar nga unë"
       trust_level: "Niveli Besimit"
       notifications: "Njoftimet"
+      statistics: "Statistikat"
       desktop_notifications:
         label: "Desktop Notifications"
         not_supported: "Notifications are not supported on this browser. Sorry."
         perm_default: "Turn On Notifications"
         perm_denied_btn: "Permission Denied"
         disable: "Disable Notifications"
-        currently_enabled: "(currently enabled)"
         enable: "Enable Notifications"
-        currently_disabled: "(currently disabled)"
         each_browser_note: "Note: You have to change this setting on every browser you use."
       dismiss_notifications: "Shënoj të gjitha si të lexuara"
       dismiss_notifications_tooltip: "Shëno njoftimet e palexuara si të lexuara"
@@ -500,6 +555,7 @@ sq:
       email_settings: "Email"
       email_digests:
         title: "When I don't visit here, send an email digest of what's new:"
+        every_30_minutes: "çdo 30 minuta"
         daily: "ditore"
         every_three_days: "çdo 3 ditë"
         weekly: "javore"
@@ -553,6 +609,8 @@ sq:
         same_as_email: "Your password is the same as your email."
         ok: "Fjalëkalimi është i pranueshëm."
         instructions: "Të paktën %{count} karaktere."
+      summary:
+        stats: "Statistikat"
       associated_accounts: "Logins"
       ip_address:
         title: "Adresa IP e Fundit"
@@ -615,8 +673,6 @@ sq:
       hide_forever: "jo faleminderit"
     summary:
       enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community."
-      description: "Janë <b>{{replyCount}}</b> përgjigje."
-      description_time: "There are <b>{{replyCount}}</b> replies with an estimated read time of <b>{{readingTime}} minutes</b>."
       enable: 'Përmbidhë këtë Diskutim'
       disable: 'Shfaq të gjithë Postimet'
     deleted_filter:
@@ -777,7 +833,6 @@ sq:
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -851,9 +906,6 @@ sq:
         category: "Nuk ka {{category}} tema."
         top: "Nuk ka tema të populluara."
         search: "There are no search results."
-        educate:
-          new: '<p>Your new topics appear here.</p><p>By default, topics are considered new and will show a <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> indicator if they were created in the last 2 days.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>'
-          unread: '<p>Your unread topics appear here.</p><p>By default, topics are considered unread and will show unread counts <span class="badge new-posts badge-notification">1</span> if you:</p><ul><li>Created the topic</li><li>Replied to the topic</li><li>Read the topic for more than 4 minutes</li></ul><p>Or if you have explicitly set the topic to Tracked or Watched via the notification control at the bottom of each topic.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>'
       bottom:
         latest: "Nuk ka më tema së fundmi."
         hot: "Nuk ka më tema të populluara."
@@ -1180,18 +1232,6 @@ sq:
           bookmark: "Undo bookmark"
           like: "Anulo pëlqimin"
           vote: "Rikthe votën"
-        people:
-          off_topic: "{{icons}} flagged this as off-topic"
-          spam: "{{icons}} flagged this as spam"
-          spam_with_url: "{{icons}} flagged <a href='{{postUrl}}'>this as spam</a>"
-          inappropriate: "{{icons}} flagged this as inappropriate"
-          notify_moderators: "{{icons}} notified moderators"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>notified moderators</a>"
-          notify_user: "{{icons}} sent a message"
-          notify_user_with_url: "{{icons}} sent a <a href='{{postUrl}}'>message</a>"
-          bookmark: "{{icons}} bookmarked this"
-          like: "{{icons}} liked this"
-          vote: "{{icons}} voted for this"
         by_you:
           off_topic: "You flagged this as off-topic"
           spam: "You flagged this as spam"
@@ -1337,7 +1377,6 @@ sq:
           title: "Muted"
     flagging:
       title: 'Faleminderit për ndihmën që i jepni këtij komuniteti!'
-      private_reminder: 'flags are private, <b>only</b> visible to staff'
       action: 'Flag Post'
       take_action: "Take Action"
       notify_action: 'Mesazh'
@@ -1696,11 +1735,9 @@ sq:
             is_disabled: "Restore is disabled in the site settings."
             label: "Rikthe"
             title: "Restore the backup"
-            confirm: "Are your sure you want to restore this backup?"
           rollback:
             label: "Rollback"
             title: "Rollback the database to previous working state"
-            confirm: "Are your sure you want to rollback the database to the previous working state?"
       export_csv:
         user_archive_confirm: "Are you sure you want to download your posts?"
         success: "Export initiated, you will be notified via message when the process is complete."
@@ -1794,9 +1831,6 @@ sq:
           love:
             name: 'love'
             description: "The like button's color."
-          wiki:
-            name: 'wiki'
-            description: "Base color used for the background of wiki posts."
       email:
         settings: "Rregullimet"
         preview_digest: "Preview Digest"
@@ -2285,8 +2319,6 @@ sq:
         mark_watching: '<b>m</b>, <b>w</b> Watch topic'
     badges:
       title: Badges
-      allow_title: "can be used as a title"
-      multiple_grant: "can be awarded multiple times"
       badge_count:
         one: "1 Badge"
         other: "%{count} Badges"
@@ -2309,85 +2341,3 @@ sq:
           name: Other
         posting:
           name: Posting
-      badge:
-        editor:
-          name: Editor
-          description: First post edit
-        basic_user:
-          name: Basic
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Granted</a> all essential community functions
-        member:
-          name: Member
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Granted</a> invitations
-        regular:
-          name: Regular
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Granted</a> recategorize, rename, followed links and lounge
-        leader:
-          name: Leader
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Granted</a> global edit, pin, close, archive, split and merge
-        welcome:
-          name: Welcome
-          description: Received a like
-        autobiographer:
-          name: Autobiographer
-          description: Filled user <a href="/my/preferences">profile</a> information
-        anniversary:
-          name: Përvjetori
-          description: Active member for a year, posted at least once
-        nice_post:
-          name: Nice Post
-          description: Received 10 likes on a post. This badge can be granted multiple times
-        good_post:
-          name: Good Post
-          description: Received 25 likes on a post. This badge can be granted multiple times
-        great_post:
-          name: Great Post
-          description: Received 50 likes on a post. This badge can be granted multiple times
-        nice_topic:
-          name: Nice Topic
-          description: Received 10 likes on a topic. This badge can be granted multiple times
-        good_topic:
-          name: Good Topic
-          description: Received 25 likes on a topic. This badge can be granted multiple times
-        great_topic:
-          name: Great Topic
-          description: Received 50 likes on a topic. This badge can be granted multiple times
-        nice_share:
-          name: Nice Share
-          description: Shared a post with 25 unique visitors
-        good_share:
-          name: Good Share
-          description: Shared a post with 300 unique visitors
-        great_share:
-          name: Great Share
-          description: Shared a post with 1000 unique visitors
-        first_like:
-          name: Pëlqimi i Parë
-          description: Liked a post
-        first_flag:
-          name: First Flag
-          description: Flagged a post
-        promoter:
-          name: Promoter
-          description: Invited a user
-        campaigner:
-          name: Campaigner
-          description: Invited 3 basic users (trust level 1)
-        champion:
-          name: Champion
-          description: Invited 5 members (trust level 2)
-        first_share:
-          name: First Share
-          description: Shared a post
-        first_link:
-          name: First Link
-          description: Added an internal link to another topic
-        first_quote:
-          name: Citimi i Parë
-          description: Quoted a user
-        read_guidelines:
-          name: Read Guidelines
-          description: Read the <a href="/guidelines">community guidelines</a>
-        reader:
-          name: Lexues
-          description: Read every post in a topic with more than 100 posts
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 3917f6b597..f91320f698 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -243,7 +243,6 @@ sv:
         one: "Detta ämne har <b>1</b> ämne som inväntar godkännande"
         other: "Detta ämne har <b>{{count}}</b> inlägg som inväntar godkännande"
       confirm: "Spara ändringar"
-      delete_prompt: "Är du säker på att du vill ta bort <b>%{username}</b>? Detta kommer ta bort all deras poster och blockera deras epostadresser samt IP-adresser."
       approval:
         title: "Inlägget behöver godkännande"
         description: "Vi har mottagit ditt nya inlägg men det behöver bli godkänt av en moderator innan det kan visas. Ha tålamod."
@@ -633,8 +632,6 @@ sv:
       hide_forever: "Nej tack"
     summary:
       enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta."
-      description: "Det finns <b>{{replyCount}}</b> svar."
-      description_time: "Det finns <b>{{replyCount}}</b> svar med en uppskattad lästid på <b>{{readingTime}} minuter</b>."
       enable: 'Sammanfatta detta ämne'
       disable: 'Visa alla inlägg'
     deleted_filter:
@@ -794,7 +791,6 @@ sv:
       mentioned: "<i title='omnämnd' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -875,9 +871,6 @@ sv:
         category: "Det finns inga ämnen i {{category}}."
         top: "Det finns inga toppämnen."
         search: "Inga sökresultat hittades."
-        educate:
-          new: '<p>Dina nya ämnen hamnar här.</p><p>Som standard är ämnen sedda som nya och kommer att visa en <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span> indikator om de skapats de senaste 2 dagarna.</p><p>Du kan ändra detta i dina <a href="%{userPrefsUrl}">inställningar</a>.</p>'
-          unread: '<p>Dina olästa ämnen hamnar här</p><p>Som standard är ämnen sedda som olästa och kommer att visa antal olästa <span class="badge new-posts badge-notification">1</span> om du:</p><ul><li>Skapade ämnet</li><li>Svarade på ämnet</li><li>Läst ämnet längre än 4 minuter</li></ul><p>Eller om du explicit har satt ämnet till Följd eller Sedd via notifieringspanelen längst ned i varje ämne.</p><p>Du kan ändra detta i dina <a href="%{userPrefsUrl}">inställningar</a>.</p>'
       bottom:
         latest: "Det finns inga fler senaste ämnen."
         hot: "Det finns inga fler heta ämnen."
@@ -1197,18 +1190,6 @@ sv:
           bookmark: "Ångra bokmärkning"
           like: "Ångra gillning"
           vote: "Ångra röstning"
-        people:
-          off_topic: "{{icons}} flaggade det här som off-topic"
-          spam: "{{icons}} flaggade det här som spam"
-          spam_with_url: "{{icons}} flaggade <a href='{{postUrl}}'>detta som skräp</a>"
-          inappropriate: "{{icons}} flaggade det här som olämpligt"
-          notify_moderators: "{{icons}} notifierade moderatorer"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>notifierade moderatorer</a>"
-          notify_user: "{{icons}} skickade ett meddelande"
-          notify_user_with_url: "{{icons}} skickade ett <a href='{{postUrl}}'>meddelande</a>"
-          bookmark: "{{icons}} bokmärkte detta"
-          like: "{{icons}} gillade detta"
-          vote: "{{icons}} röstade för detta"
         by_you:
           off_topic: "Du flaggade detta som off-topic"
           spam: "Du flaggade detta som spam"
@@ -1352,7 +1333,6 @@ sv:
           title: "Tystad"
     flagging:
       title: 'Tack för att du hjälper till att hålla vår gemenskap civiliserad!'
-      private_reminder: 'flaggor är privata, <b>endast</b> synliga för funktionärer'
       action: 'Flagga Inlägg'
       take_action: "Åtgärda"
       notify_action: 'Meddelande'
@@ -1700,11 +1680,9 @@ sv:
             is_disabled: "Återställ är inaktiverat i sidans inställningar."
             label: "Återställ"
             title: "återställ säkerhetskopian"
-            confirm: "Är du säker på att du vill återställa denna säkerhetskopia?"
           rollback:
             label: "Tillbakarullning"
             title: "Gör rollback på databasen till ett tidigare fungerande tillstånd."
-            confirm: "Är du säker på att du vill göra rollback på databasen till det tidigare fungerande tillståndet?"
       export_csv:
         user_archive_confirm: "Är du säker på att du vill ladda ner dina inlägg?"
         success: "Export påbörjad, du får en notis via meddelande när processen är genomförd."
@@ -1798,9 +1776,6 @@ sv:
           love:
             name: 'älska'
             description: "Gillaknappens färg."
-          wiki:
-            name: 'wiki'
-            description: "Huvudfärg som används som bakgrund till wikiinlägg."
       email:
         settings: "Inställningar"
         preview_digest: "Sammandrag"
@@ -2269,8 +2244,6 @@ sv:
         mark_watching: '<b>m</b>, <b>w</b> Bevaka ämne'
     badges:
       title: Utmärkelser
-      allow_title: "kan användas som titel"
-      multiple_grant: "kan tilldelas flera gånger"
       badge_count:
         one: "1 Utmärkelse"
         other: "%{count} Utmärkelser"
@@ -2293,75 +2266,3 @@ sv:
           name: Övrigt
         posting:
           name: Inlägg
-      badge:
-        basic_user:
-          name: Grundläggande
-        member:
-          name: Medlem
-        regular:
-          name: Vanligt
-        leader:
-          name: Ledare
-        welcome:
-          name: Välkommen
-          description: Fick en gilla
-        autobiographer:
-          name: Självbiograf
-          description: Fyllde ut sin <a href="/my/preferences">profilinformation</a>
-        anniversary:
-          name: Årsdag
-          description: Aktiv medlem ett år, har skrivit minst en gång
-        nice_post:
-          name: Bra inlägg
-          description: Fick 10 gilla på ett inlägg. Denna utmärkelse kan utfärdas flera gånger.
-        good_post:
-          name: Jättebra inlägg
-          description: Fick 25 gilla på ett inlägg. Denna utmärkelse kan utfärdas flera gånger.
-        great_post:
-          name: Fantastiskt inlägg
-          description: Fick 50 gilla på ett inlägg. Denna utmärkelse kan utfärdas flera gånger.
-        nice_topic:
-          name: Bra ämne
-          description: Fick 10 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger.
-        good_topic:
-          name: Jättebra ämne
-          description: Fick 25 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger.
-        great_topic:
-          name: Fantastiskt ämne
-          description: Fick 50 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger.
-        nice_share:
-          name: Bra delning
-          description: Delade ett inlägg med 25 unika besökare
-        good_share:
-          name: Jättebra delning
-          description: Delade ett inlägg med 300 unika besökare
-        great_share:
-          name: Fantastisk delning
-          description: Delade ett inlägg med 1000 unika besökare
-        first_like:
-          name: Första gillning
-          description: Gillade ett inlägg
-        first_flag:
-          name: Första flaggning
-          description: Flaggade ett inlägg
-        promoter:
-          description: Bjöd in en användare
-        first_share:
-          name: Första delning
-          description: Delade ett inlägg
-        first_link:
-          name: Första länk
-          description: Länkade internt till ett annat ämne
-        first_quote:
-          name: Första citation
-          description: Citerade en användare
-        read_guidelines:
-          name: Läst riktlinjer
-          description: Läste <a href="/guidelines">forumets riktlinjer</a>
-        reader:
-          name: Läsare
-          description: Läs varje inlägg i en diskussion med över 100 inlägg
-        popular_link:
-          name: Populär länk
-        hot_link:
-          name: Het länk
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index a9a8ab6c39..6710bcdefb 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -489,8 +489,6 @@ te:
     last_post: చివరి టపా
     summary:
       enabled_description: "మీరు ఈ విషయపు సారాంశము చదువుతున్నారు. ఆసక్తికర టపాలు కమ్యునిటీ ఎంచుకుంటుంది. "
-      description: "అక్కడ మొత్తం <b>{{replyCount}}</b> జవాబులు ఉన్నాయి"
-      description_time: "అక్కడ మొత్తం <b>{{replyCount}}</b> జవాబులు ఉన్నాయి. వీటిని చదవడానికి సుమారుగా <b>{{readingTime}} నిమిషాలు</b> పడ్తాయి."
       enable: 'ఈ విషయాన్ని సంగ్రహించు'
       disable: 'అన్ని టపాలూ చూపు'
     deleted_filter:
@@ -631,7 +629,6 @@ te:
       total_flagged: "మొత్తం కేతనించిన టపాలు"
       quoted: "<i title='కోట్ చేసారు' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='జవాబిచ్చారు' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='జవాబిచ్చారు' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title=' సవరించారు' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='ఇష్టపడ్డారు' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='ప్రైవేటు సందేశం' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -686,9 +683,6 @@ te:
         bookmarks: "మీకింకా ఎట్టి పేజీక విషయాలూ లేవు."
         category: "ఎట్టి {{category}}  విషయాలూ లేవు"
         top: "ఎట్టి అగ్ర విషయాలూ లేవు."
-        educate:
-          new: '<p>మీ కొత్త విషయాలు ఇక్కడ వస్తాయి.</p><p>అప్రమేయంగా 2 రోజులలోపు సృష్టించిన అన్ని విషయాలూ కొత్తగా భావించబడతాయి మరియు  <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">కొత్త</span> ఇండికేటరు తో చూపబడతాయి.</p><p>మీరు దీన్ని మీ <a href="%{userPrefsUrl}">అభీష్టాలులో</a> మార్చుకోవచ్చు.</p>'
-          unread: '<p>మీరు చదవని విషయాలు ఇక్కడ కనబడుతాయి.</p><p>అప్రమేయంగా, విషయాలు చదవని వాటిగా పరిశీలించబడతాయి మరియు చదవని వాటి సంఖ్య మీకు చూపబడతాయి <span class="badge new-posts badge-notification">1</span> మీరు:</p><ul><li>విషయం సృష్టించినట్లయితే</li><li>విషయానికి సమాధానం ఇచ్చినట్లయితే</li><li>విషయం 4 నిమిషాల కంటే ఎక్కువ చదివినట్లయితే</li></ul><p>లేదా మీరు స్పష్టముగా విషయం అమర్చినట్లయితే ప్రతి విషయానికి క్రింది భాగంలో నియంత్రణ ప్రకటన ద్వారా గమనించబడుతుంది లేదా కనిపెడుతూ ఉంటుంది  .</p><p>మీరు ఇది మార్చగలరు <a href="%{userPrefsUrl}"> మీ preferences లో</a>.</p>'
       bottom:
         latest: "ఇంకా కొత్త విషయాలు లేవు."
         hot: "ఇంకా వేడివేడి విషయాలు లేవు."
@@ -946,16 +940,6 @@ te:
           bookmark: "పేజీక రద్దు"
           like: "ఇష్టం రద్దు"
           vote: "ఓటు రద్దు"
-        people:
-          off_topic: "{{icons}} దీన్ని విషయాంతరంగా కేతనించాయి"
-          spam: "{{icons}} దీన్ని స్పాముగా కేతనించాయి"
-          spam_with_url: "{{ప్రతీకలు}} స్పామ్ లా <a href='{{postUrl}}'>కేతనించు</a>"
-          inappropriate: "{{icons}} దీన్ని అసమంజసంగా కేతనించాయి"
-          notify_moderators: "{{icons}} దీన్ని నిర్వాహకుల దృష్టికి తెచ్చాయి"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>నిర్వాహకుల దృష్టికి తెచ్చారు</a>"
-          bookmark: "{{icons}} పేజీక ఉంచారు"
-          like: "{{icons}} ఇష్టపడ్డారు"
-          vote: "{{icons}}  దీనికి ఓటు వేసారు"
         by_you:
           off_topic: "మీరు దీన్ని విషయాంతరంగా కేతనించారు"
           spam: "మీరు దీన్ని స్పాముగా కేతనించారు"
@@ -1088,7 +1072,6 @@ te:
           title: "నిశ్శబ్దం"
     flagging:
       title: 'మా కమ్యునిటీని నాగరికంగా ఉంచుటలో సహాయానికి ధన్యవాదములు'
-      private_reminder: 'కేతనాలు ప్రైవేటు. <b>కేవలం</b> సిబ్బందికి మాత్రమే కనిపిస్తాయి'
       action: 'టపాను కేతనించు'
       take_action: "చర్య తీసుకో"
       delete_spammer: "స్పామరును తొలగించు"
@@ -1385,10 +1368,8 @@ te:
           restore:
             is_disabled: "సైటు అమరికల్లో రీస్టోరు అచేతనమైంది. "
             title: "బ్యాకప్ ను రీస్టోరు చేయి"
-            confirm: "మీరు నిజంగానే ఈ బ్యాకప్ ను రీస్టోరు చేయాలనుకుంటున్నారా?"
           rollback:
             title: "డాటాబేసును గత పనిచేసే స్థితికి రోల్ బ్యాక్ చేయి"
-            confirm: "మీరు నిజంగానే డాటాబేసును గత పనిచేసే స్థితికి రోల్ బ్యాక్ చేయాలనుకుంటున్నారా?"
       export_csv:
         user_archive_confirm: "మీరు నిజంగా మీ టపాల దిగుమతి కోరుకుంటున్నారా ?"
         failed: "ఎగుమతి విఫలమైంది. దయచేసి లాగులు చూడంది. "
@@ -1477,9 +1458,6 @@ te:
           love:
             name: 'ప్రేమ'
             description: "ఇష్ఠ బటను రంగు."
-          wiki:
-            name: 'వికీ'
-            description: "వికీ టపాలు వెనుతలంకు ప్రాథమిక రంగు"
       email:
         settings: "అమరికలు"
         preview_digest: "డైజెస్టు మునుజూపు"
@@ -1912,8 +1890,6 @@ te:
         mark_watching: '<b>m</b>, <b>w</b> చూసిన విషయం'
     badges:
       title: బ్యాడ్జీలు
-      allow_title: "శీర్షికగా కూడా వాడవచ్చు"
-      multiple_grant: "పలుమార్లు బహూకరించవచ్చు"
       more_badges:
         one: "+%{count} కంటే"
         other: "+%{count} ఇంకా"
@@ -1933,74 +1909,3 @@ te:
           name: ఇతర
         posting:
           name: రాస్తున్నారు
-      badge:
-        editor:
-          name: ఎడిటరు
-          description: తొలి టపా సవరణ
-        basic_user:
-          name: ప్రాథమిక
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">మంజూరు చేసిన</a> అన్ని ఆవశ్యక సామాజిక చర్యలు
-        member:
-          name: సభ్యుడు
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">మంజూరు చేసిన </a> ఆహ్వానాలు
-        regular:
-          name: రెగ్యులరు
-        leader:
-          name: లీడరు
-        welcome:
-          name: సుస్వాగతం
-          description: ఒక ఇష్టాన్ని అందుకున్నారు
-        autobiographer:
-          name: ఆత్మకధావాది
-          description: వినియోగదారు నింపిన <a href="/my/preferences">ఫ్రొపైల్ </a> సమాచారం
-        anniversary:
-          name: వార్షికోత్సవం
-          description: ఒక సంవత్సరం నుండి చురుకైన సభ్యుడు, కనీసం ఒకసారి టపా చేశాడు
-        nice_post:
-          name: మంచి టపా
-          description: ఒక టపా 10 ఇష్టాలు స్వీకరిస్తే , ఈ చిహ్నం అనేక సార్లు మంజూరు అవుతుంది
-        good_post:
-          name: చాలా మంచి టపా
-          description: ఒక టపా 25 ఇష్టాలు స్వీకరిస్తే , ఈ చిహ్నం అనేక సార్లు మంజూరు అవుతుంది
-        great_post:
-          name: బహుమంచి టపా
-          description: ఒక టపా 50 ఇష్టాలు స్వీకరిస్తే , ఈ చిహ్నం అనేక సార్లు మంజూరు అవుతుంది
-        nice_topic:
-          name: మంచి విషయం
-          description: ఒక విషయం 10 ఇష్టాలు స్వీకరిస్తే , ఈ చిహ్నం అనేక సార్లు మంజూరు అవుతుంది
-        good_topic:
-          name: చాలా మంచి విషయం
-          description: ఒక విషయం 25 ఇష్టాలు స్వీకరిస్తే , ఈ చిహ్నం అనేక సార్లు మంజూరు అవుతుంది
-        great_topic:
-          name: బహుమంచి విషయం
-          description: ఒక విషయం 50 ఇష్టాలు స్వీకరిస్తే , ఈ చిహ్నం అనేక సార్లు మంజూరు అవుతుంది
-        nice_share:
-          name: మంచి పంపకం
-          description: ఒక టపాను 25మంది సభ్యులతో పంచుకున్నారు
-        good_share:
-          name: చాలామంచి పంపకం
-          description: ఒక టపాను 300మంది సభ్యులతో పంచుకున్నారు
-        great_share:
-          name: బహుమంచి పంపకం
-          description: ఒక టపాను 1000 మంది సభ్యులతో పంచుకున్నారు
-        first_like:
-          name: తొలి ఇష్టం
-          description: టపాను ఇష్టపడ్డారు
-        first_flag:
-          name: తొలి కేతనం
-          description: ఒక టపాను కేతనించారు
-        first_share:
-          name: తొలి పంపకం
-          description: ఒక టపాను పంచారు
-        first_link:
-          name: తొలి లంకె
-          description: వేరొక విషయానికి అంతర్గతంగా లంకె కలిపారు
-        first_quote:
-          name: తొలి కోట్
-          description: ఒక సభ్యుడిని కోట్ చేసారు
-        read_guidelines:
-          name: మార్గదర్శకాలు చదువు
-          description: <a href="/guidelines">కమ్యునిటీ మార్గదర్శకాలు</a> చదవండి
-        reader:
-          name: చదువరి
-          description: 100 టపాల కన్నా ఎక్కువ ఉన్న అంశంలో ప్రతి టపా చదవండి
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 140fafe2ff..a78af7fba7 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -81,6 +81,8 @@ tr_TR:
           other: "%{count} ay sonra"
         x_years:
           other: "%{count} yıl sonra"
+      previous_month: 'Önceki Ay'
+      next_month: 'Sonraki Ay'
     share:
       topic: 'bu konunun bağlantısını paylaşın'
       post: '#%{postNumber} nolu gönderiyi paylaşın'
@@ -91,6 +93,8 @@ tr_TR:
       email: 'bu bağlantıyı e-posta ile gönderin'
     action_codes:
       split_topic: "bu konuyu ayır %{when}"
+      invited_user: "%{when} %{who} davet edildi"
+      removed_user: "%{when} %{who} silindi"
       autoclosed:
         enabled: '%{when} kapatıldı'
         disabled: '%{when} açıldı'
@@ -111,6 +115,19 @@ tr_TR:
         disabled: '%{when} listelenmedi'
     topic_admin_menu: "konuyla alakalı yönetici işlemleri"
     emails_are_disabled: "Tüm giden e-postalar yönetici tarafından evrensel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
+    s3:
+      regions:
+        us_east_1: "US East (N. Virginia)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        eu_west_1: "EU (Ireland)"
+        eu_central_1: "EU (Frankfurt)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
+        ap_northeast_1: "Asia Pacific (Tokyo)"
+        ap_northeast_2: "Asia Pacific (Seoul)"
+        sa_east_1: "South America (Sao Paulo)"
     edit: 'bu konunun başlığını ve kategorisini düzenleyin'
     not_implemented: "Bu özellik henüz geliştirilmedi, üzgünüz!"
     no_value: "Hayır"
@@ -142,6 +159,8 @@ tr_TR:
     more: "Daha fazla"
     less: "Daha az"
     never: "asla"
+    every_30_minutes: "30 dakikada bir"
+    every_hour: "her saat"
     daily: "günlük"
     weekly: "haftalık"
     every_two_weeks: "her iki haftada bir"
@@ -152,6 +171,7 @@ tr_TR:
       other: "{{count}} karakter"
     suggested_topics:
       title: "Önerilen Konular"
+      pm_title: "Önerilen Mesajlar"
     about:
       simple_title: "Hakkında"
       title: "%{title} Hakkında"
@@ -226,7 +246,7 @@ tr_TR:
       has_pending_posts:
         other: "Bu konuda <b>{{count}}</b> sayıda onay bekleyen gönderi var"
       confirm: "Düzenlemeleri Kaydet"
-      delete_prompt: "<b>%{username}</b> kullanıcısını silmek istediğinize emin misiniz? Bu işlem kullanıcının tüm gönderilerini silecek, e-posta ve ip adresini engelleyecek."
+      delete_prompt: "<b>%{username}</b> kullanıcısını silmek istediğinize emin misiniz? Bunu yaparsanız tüm gönderileri silinecek, eposta adresi ve IP adresi bloklanacak."
       approval:
         title: "Gönderi Onay Gerektirir"
         description: "Gönderinizi aldık fakat gösterilmeden önce bir moderatör tarafından onaylanması gerekiyor. Lütfen sabırlı olun."
@@ -280,7 +300,10 @@ tr_TR:
       title:
         other: "gruplar"
       members: "Üyeler"
+      topics: "Konular"
       posts: "Gönderiler"
+      mentions: "Atıflar"
+      messages: "Mesajlar"
       alias_levels:
         title: "Kimler bu gruba mesaj gönderebilir ve gruptan @bahsedebilir?"
         nobody: " Hiç Kimse"
@@ -381,9 +404,7 @@ tr_TR:
         perm_default: "Bildirimleri Etkinleştirin"
         perm_denied_btn: "Erişim İzni Reddedildi"
         disable: "Bildirimleri Devre Dışı Bırakın"
-        currently_enabled: "(şu anda etkin)"
         enable: "Bildirimleri Etkinleştirin"
-        currently_disabled: "(şu anda devre dışı)"
         each_browser_note: "Not: Bu ayarı kullandığınız her tarayıcıda değiştirmelisiniz."
       dismiss_notifications: "Hepsini okunmuş olarak işaretle"
       dismiss_notifications_tooltip: "Tüm okunmamış bildirileri okunmuş olarak işaretle"
@@ -418,7 +439,6 @@ tr_TR:
       muted_users: "Susturuldu"
       muted_users_instructions: "Bu kullanıcılardan gelen tüm bildirileri kapa."
       muted_topics_link: "Sessize alınmış konuları göster"
-      automatically_unpin_topics: "Sayfa sonuna erişildiğinde tutturulmuş konuları otomatik olarak sayfadan ayır."
       staff_counters:
         flags_given: "yararlı bayraklar"
         flagged_posts: "bayraklanan gönderiler"
@@ -433,6 +453,7 @@ tr_TR:
         groups: "Gruplarım"
         bulk_select: "Mesajları seçin"
         move_to_inbox: "Gelen kutusuna taşı"
+        move_to_archive: " Arşiv"
         failed_to_move: "Seçilen mesajları taşımak başarısız oldu (muhtemelen ağınız çöktü)"
         select_all: "Tümünü seç"
       change_password:
@@ -517,8 +538,18 @@ tr_TR:
         title: "Kullanıcı Kartı Rozeti"
       website: "Web Sayfası"
       email_settings: "E-posta"
+      like_notification_frequency:
+        title: "Beğenildiğinde bildir"
+        always: "Her zaman"
+        never: "Asla"
+      email_previous_replies:
+        unless_emailed: "daha önce gönderilmediyse"
+        always: "her zaman"
+        never: "asla"
       email_digests:
         title: "Burayı ziyaret etmediğim zamanlarda bana yeni şeylerin özetini içeren bir email yolla:"
+        every_30_minutes: "30 dakikada bir"
+        every_hour: "saatte bir"
         daily: "günlük"
         every_three_days: "her üç günde bir"
         weekly: "haftalık"
@@ -589,6 +620,21 @@ tr_TR:
         same_as_email: "Şifreniz e-posta adresinizle aynı."
         ok: "Parolanız uygun gözüküyor."
         instructions: "En az %{count} karakter."
+      summary:
+        title: "Özet"
+        stats: "İstatistikler"
+        topic_count: "Oluşturduğu Konular"
+        post_count: "Oluşturduğu Gönderiler"
+        likes_given: "Beğenileri"
+        likes_received: "Beğenilenleri"
+        days_visited: "Ziyaret Ettiği Günler"
+        posts_read_count: "Okuduğu Gönderi Sayısı"
+        top_replies: "Başlıca Yanıtları"
+        top_topics: "Başlıca Konuları"
+        top_badges: "Başlıca Rozetleri"
+        more_topics: "Diğer Konuları"
+        more_replies: "Diğer Yanıtları"
+        more_badges: "Diğer Rozetleri"
       associated_accounts: "Girişler"
       ip_address:
         title: "Son IP Adresi"
@@ -631,7 +677,9 @@ tr_TR:
     logout: "Çıkış yapıldı."
     refresh: "Yenile"
     read_only_mode:
+      enabled: "Bu site salt okunur modda. Lütfen gezinmeye devam edin, ancak yanıt yazma, beğenme ve diğer aksiyonlar şu an için devre dışı durumda."
       login_disabled: "Site salt-okunur modda iken oturum açma devre dışı bırakılır ."
+      logout_disabled: "Site salt okunur modda iken oturum kapatma işlemi yapılamaz."
     too_few_topics_and_posts_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentTopics} / %{requiredTopics}</strong> konu ve <strong>%{currentPosts} / %{requiredPosts}</strong> gönderi var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç tartışmaya ihtiyaç duyarlar."
     too_few_topics_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentTopics} / %{requiredTopics}</strong> konu var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç tartışmaya ihtiyaç duyarlar."
     too_few_posts_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentPosts} / %{requiredPosts}</strong> gönderi var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç tartışmaya ihtiyaç duyarlar."
@@ -659,8 +707,8 @@ tr_TR:
       value_prop: "Bir hesap oluşturduğunuzda, tam olarak neyi okuyor olduğunuzu hatırlarız, böylece her zaman okumayı bırakmış olduğunuz yere geri gelirsiniz.  Ayrıca burada, yeni gönderiler yağıldığında email yoluyla bildirim alırsınız. Ve sevgiyi paylaşmak için gönderileri beğenebilirsiniz. :heartbeat:"
     summary:
       enabled_description: "Bu konunun özetini görüntülemektesiniz: topluluğun en çok ilgisini çeken gönderiler"
-      description: "<b>{{replyCount}}</b> sayıda cevap var."
-      description_time: "Tahmini okunma süresi <b>{{readingTime}} dakika</b> olan <b>{{replyCount}}</b> sayıda cevap var."
+      description: "<b>{{replyCount}}</b> adet yanıt var."
+      description_time: "Tahmini okuma süresi <b>{{readingTime}} dakika</b> olan <b>{{replyCount}}</b> yanıt var."
       enable: 'Bu Konuyu Özetle.'
       disable: 'Tüm Gönderileri Göster'
     deleted_filter:
@@ -726,6 +774,9 @@ tr_TR:
       twitter:
         title: "Twitter ile"
         message: "Twitter ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+      instagram:
+        title: "Instagram ile"
+        message: "Instagram ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
       facebook:
         title: "Facebook ile"
         message: "Facebook ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
@@ -744,6 +795,7 @@ tr_TR:
       ctrl: 'Ctrl'
       alt: 'Alt'
     composer:
+      emoji: "Emoji :)"
       more_emoji: "dahası..."
       options: "Seçenekler"
       whisper: "fısıltı"
@@ -830,9 +882,12 @@ tr_TR:
       group_mentioned: "<i title='bahsetti' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='alıntıladı' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='cevapladı' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='cevapladı' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      posted: "<i title='yazdı' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='düzenledi' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked_2: "<i title='beğendi' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
+      liked_many:
+        other: "<i title='beğendi' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} ve diğer {{count}} kişi</span> {{description}}</p>"
       private_message: "<i title='özel mesaj' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_private_message: "<i title='özel mesaj' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_topic: "<i title='konuya davet edildi' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -840,6 +895,8 @@ tr_TR:
       moved_post: "<i title='gönderiyi taşıdı' class='fa fa-sign-out'></i><p><span>{{username}}</span> taşıdı {{description}}</p>"
       linked: "<i title='gönderiye bağlantı verdi' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p><strong>{{description}}</strong> rozeti kazandınız!</p>"
+      group_message_summary:
+        other: "<i title='grup gelen kutusundaki mesajlar' class='fa fa-group'></i><p> {{group_name}} isimli grubunuzun gelen kutusunda {{count}} adet mesaj var</p>"
       alt:
         mentioned: "Bahsedildi, şu kişi tarafından"
         quoted: "Alıntılandı, şu kişi tarafından"
@@ -854,6 +911,7 @@ tr_TR:
         moved_post: "Gönderiniz taşındı, şu kişi tarafından"
         linked: "Gönderinize bağlantı"
         granted_badge: "Rozet alındı"
+        group_message_summary: "Grup gelen kutusundaki mesajlar"
       popup:
         mentioned: '{{username}}, "{{topic}}" başlıklı konuda sizden bahsetti - {{site_title}}'
         group_mentioned: '{{username}} sizden bahsetti "{{topic}}" - {{site_title}}'
@@ -933,9 +991,6 @@ tr_TR:
         category: "{{category}} konusu yok."
         top: "Popüler bir konu yok."
         search: "Arama sonuçları yok."
-        educate:
-          new: '<p>Yeni konularınız burada belirir.</p><p>Varsayılan ayarlarda, son 2 gün içerisinde açılan konular yeni sayılır ve <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">yeni</span> işaretiyle gösterilir.</p><p>Dilerseniz bu seçeneği <a href="%{userPrefsUrl}">ayarlar</a> sayfanızdan düzenleyebilirsiniz.</p>'
-          unread: '<p> Okunmamış konularınız burada belirecek. </p><p> Varsayılan ayarlarda, şu durumlarda konular okunmamış sayılır ve okunmamışların sayısı <span class="badge new-posts badge-notification">1</span> gösterilir: </p><ul><li>Konuyu oluşturduysanız</li><li>Konuyu cevapladıysanız</li><li>Konuyu 4 dakikadan uzun bir süre okuduysanız</li></ul><p> Ya da, konunun altında bulunan bildirim kontrol bölümünden, konuyu Takip Edildi veya Gözlendi diye işaretlediyseniz.</p><p>Bu ayarları <a href="%{userPrefsUrl}">ayarlar</a> sayfasından değiştirebilirsiniz.</p>'
       bottom:
         latest: "Daha fazla son konu yok."
         hot: "Daha fazla sıcak bir konu yok."
@@ -1230,6 +1285,8 @@ tr_TR:
         yes_value: "Evet, vazgeç"
       via_email: "bu gönderi e-posta ile iletildi"
       whisper: "bu gönderi yöneticiler için özel bir fısıltıdır"
+      wiki:
+        about: "bu gönderi bir wiki"
       archetypes:
         save: 'Seçenekleri kaydet'
       controls:
@@ -1277,17 +1334,14 @@ tr_TR:
           like: "Beğenini geri al"
           vote: "Oyunu geri al"
         people:
-          off_topic: "{{icons}} konu dışı olarak bayrakladı"
-          spam: "{{icons}} spam olarak bayrakladı"
-          spam_with_url: "{{icons}} bu linki <a href='{{postUrl}}'>spam olarak bayrakladı</a>"
-          inappropriate: "{{icons}} uygunsuz olarak bayrakladı"
-          notify_moderators: "{{icons}} bildirim gönderilen moderatörler"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>bildirim gönderilen moderatörler</a>"
-          notify_user: "{{icons}} mesaj yolladı"
-          notify_user_with_url: "{{icons}} <a href='{{postUrl}}'>mesaj</a> yolladı"
-          bookmark: "{{icons}} bunu işaretledi"
-          like: "{{icons}} bunu beğendi"
-          vote: "{{icons}} bunun için oyladı"
+          off_topic: "konu dışı olarak bayrakladı"
+          spam: "spam olarak bayrakladı"
+          inappropriate: "uygunsuz olarak bayrakladı"
+          notify_moderators: "moderatörler bilgilendirdi"
+          notify_user: "mesaj gönderdi"
+          bookmark: "işaretledi"
+          like: "beğendi"
+          vote: "oyladı"
         by_you:
           off_topic: "Bunu konu dışı olarak bayrakladınız"
           spam: "Bunu spam olarak bayrakladınız"
@@ -1422,7 +1476,6 @@ tr_TR:
           description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve en son gönderilerde belirmeyecekler. "
     flagging:
       title: 'Topluluğumuzun medeni kalmasına yardımcı olduğunuz için teşekkürler!'
-      private_reminder: 'bayraklar özeldir, <b>sadece</b> görevlilere gözükür'
       action: 'Gönderiyi Bayrakla'
       take_action: "Harekete Geç"
       notify_action: 'Mesaj'
@@ -1434,7 +1487,7 @@ tr_TR:
       submit_tooltip: "Özel bayrağı gönder"
       take_action_tooltip: "Topluluğunuzdan daha fazla bayrak beklemek yerine bunu siz hızlıca yaparak eşiğe erişebilirsiniz"
       cant: "Üzgünüz, şu an bu gönderiyi bayraklayamazsınız."
-      notify_staff: 'Yöneticilere İlet'
+      notify_staff: 'Yetkililere özel olarak bildir'
       formatted_name:
         off_topic: "Konu Dışı"
         inappropriate: "Uygunsuz"
@@ -1633,6 +1686,7 @@ tr_TR:
           refresh_report: "Raporu Yenile"
           start_date: "Başlangıç tarihi"
           end_date: "Bitiş Tarihi"
+          groups: "Tüm gruplar"
       commits:
         latest_changes: "En son değişiklikler: lütfen sık güncelleyin!"
         by: "tarafından"
@@ -1799,11 +1853,11 @@ tr_TR:
             is_disabled: "Geri getirme site ayarlarında devredışı bırakılmış."
             label: "Geri Yükle"
             title: "Yedeği geri getir"
-            confirm: "Yedeği geri getirmek istediğinize emin misiniz?"
+            confirm: "Bu yedekten geri dönmek istediğinize emin misiniz?"
           rollback:
             label: "Geri al"
             title: "Veritabanını calışan son haline geri al."
-            confirm: "Veri tabanını  çalışan bir önceki versyonuna geri almak istediğinizden emin misiniz?"
+            confirm: "Veritabanını çalışan son haline döndürmek istediğinize emin misiniz?"
       export_csv:
         user_archive_confirm: "Gönderilerinizi indirmek istediğinize emin misiniz ?"
         success: "Dışarı aktarma başlatıldı, işlem tamamlandığında mesajla bilgilendirileceksiniz."
@@ -1906,17 +1960,18 @@ tr_TR:
           love:
             name: 'sevgi'
             description: "Beğen butonunun rengi."
-          wiki:
-            name: 'wiki'
-            description: "wiki gönderilerinin arka plan rengi."
       email:
+        title: "E-postalar"
         settings: "Ayarlar"
+        templates: "Şablonlar"
         preview_digest: "Özeti Önizle"
         sending_test: "Test e-postası gönderiliyor..."
         error: "<b>HATA</b> - %{server_error}"
         test_error: "Test e-postasının gönderilmesinde sorun yaşandı. Lütfen e-posta ayarlarınızı tekrar kontrol edin, yer sağlayıcınızın e-posta bağlantılarını bloke etmediğinden emin olun, ve tekrar deneyin."
         sent: "Gönderildi"
         skipped: "Atlandı"
+        received: "Alındı"
+        rejected: "Reddedildi"
         sent_at: "Gönderildiği Zaman"
         time: "Zaman"
         user: "Kullanıcı"
@@ -1934,6 +1989,32 @@ tr_TR:
         last_seen_user: "Son Görülen Kullanıcı:"
         reply_key: "Cevapla Tuşu"
         skipped_reason: "Nedeni Atla"
+        incoming_emails:
+          from_address: "Gönderen"
+          to_addresses: "Kime"
+          cc_addresses: "Cc"
+          subject: "Konu"
+          error: "Hata"
+          none: "Gelen e-posta yok."
+          modal:
+            title: "Gelen E-posta Detayları"
+            error: "Hata"
+            message_id: "Mesaj IDsi"
+            in_reply_to: "Cevaben"
+            references: "Referanslar"
+            date: "Tarih"
+            from: "Gönderen"
+            to: "Kime"
+            cc: "Cc"
+            subject: "Konu"
+            body: "İçerik"
+            rejection_message: "Ret E-postası"
+          filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "to@example.com"
+            cc_placeholder: "cc@example.com"
+            subject_placeholder: "Konu..."
+            error_placeholder: "Hata"
         logs:
           none: "Hiç bir kayıt bulunamadı."
           filters:
@@ -1983,6 +2064,7 @@ tr_TR:
             change_site_setting: "websitesi ayarlarını değiştir"
             change_site_customization: "websitesinin özelleştirmesini değiştir"
             delete_site_customization: "websitesinin özelleştirmesini sil"
+            change_site_text: "site metnini değiştir"
             suspend_user: "kullanıcıyı uzaklaştır"
             unsuspend_user: "kullanıcıyı uzaklaştırma"
             grant_badge: "rozet ver"
@@ -1996,6 +2078,13 @@ tr_TR:
             change_category_settings: "kategori ayarlarını değiştir"
             delete_category: "kategoriyi sil"
             create_category: "kategori oluştur"
+            block_user: "kullanıcıyı blokla"
+            unblock_user: "kullanıcı engelini kaldır"
+            grant_admin: "yönetici yetkisi ver"
+            revoke_admin: "yönetici yetkisini kaldır"
+            grant_moderation: "moderasyon yetkisi ver"
+            revoke_moderation: "moderasyon yetkisini kaldır"
+            backup_operation: "yedek operasyonu"
         screened_emails:
           title: "Taranmış E-postalar"
           description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek veya başka bir aksiyon alınacak."
@@ -2154,6 +2243,8 @@ tr_TR:
         deactivate_failed: "Kullanıcı deaktive edilirken bir sorun yaşandı."
         unblock_failed: 'Kullanıcının engeli kaldırılırken bir sorun yaşandı.'
         block_failed: 'Kullanıcı engellenirken bir sorun yaşandı.'
+        block_confirm: 'Bu kullanıcıyı bloklamak istediğinize emin misiniz? Bunu yaparsanız yeni başlık ya da gönderi oluşturamayacak.'
+        block_accept: 'Evet, bu kullanıcıyı blokla'
         deactivate_explanation: "Deaktive edilmiş bir kullanıcı e-postasını tekrar doğrulamalı."
         suspended_explanation: "Uzaklaştırılmış kullanıcılar sistemde oturum açamaz."
         block_explanation: "Engellenmiş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz."
@@ -2434,9 +2525,9 @@ tr_TR:
         mark_tracking: '<b>m</b>, <b>t</b> Konuyu takip et'
         mark_watching: '<b>m</b>, <b>w</b> Konuyu gözle'
     badges:
+      earned_n_times:
+        other: "Bu rozet %{count} defa kazanılmış"
       title: Rozetler
-      allow_title: "ünvan olarak kullanılabilir"
-      multiple_grant: "birden fazla kez verilebilir"
       badge_count:
         other: "%{count} Rozet"
       more_badges:
@@ -2456,97 +2547,6 @@ tr_TR:
           name: Diğer
         posting:
           name: Gönderiler
-      badge:
-        editor:
-          name: Editör
-          description: İlk gönderi düzenleme
-        basic_user:
-          name: Acemi
-          description: Tüm temel topluluk işlevleri için <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">hak verildi</a>
-        member:
-          name: Üye
-          description: Davetiye gönderebilme <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">hakkı verildi</a>
-        regular:
-          name: Müdavim
-          description: Konuların isimlerini ve kategorilerini değiştirebilme, follow'lu bağlantı paylaşabilme ve lobiye girebilme <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">hakları verildi</a>
-        leader:
-          name: Lider
-          description: 'Tüm gönderileri düzenleyebilme, konuları başa tutturabilme, kapatabilme, arşivleyebilme, bölebilme ve birleştirebilme <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">hakları verildi</a> '
-        welcome:
-          name: Hoş geldiniz
-          description: Bir beğeni aldı
-        autobiographer:
-          name: Otobiyografi Yazarı
-          description: Kullanıcı <a href="/my/preferences">profil</a> bilgilerini doldurmuş
-        anniversary:
-          name: Yıldönümü
-          description: Bir yıldır aktif kullanıcı, en az bir kere gönderi oluşturmuş.
-        nice_post:
-          name: Güzel Gönderi
-          description: Bir gönderiden 10 beğeni alındı. Bu rozet birden fazla defa verilebilir.
-        good_post:
-          name: İyi Gönderi
-          description: Bir gönderiden 25 beğeni alındı. Bu rozet birden fazla defa verilebilir.
-        great_post:
-          name: Harika Gönderi
-          description: Bir gönderiden 50 beğeni alındı. Bu rozet birden fazla defa verilebilir.
-        nice_topic:
-          name: Güzel Konu
-          description: Bir konuda 10 beğeni almış. Bu rozet birden çok kez kazanılabilir.
-        good_topic:
-          name: İyi Konu
-          description: Bir konuda 25 beğeni almış. Bu rozet birden çok kez kazanılabilir.
-        great_topic:
-          name: Harika Konu
-          description: Bir konuda 50 beğeni almış. Bu rozet birden çok kez kazanılabilir.
-        nice_share:
-          name: Güzel Paylaşım
-          description: 25 tekil kullanıcı ile bir gönderiyi paylaşmış
-        good_share:
-          name: İyi Paylaşım
-          description: 300 tekil kullanıcı ile bir gönderiyi paylaşmış
-        great_share:
-          name: Harika Paylaşım
-          description: 1000 tekil kullanıcı ile bir gönderiyi paylaşmış
-        first_like:
-          name: İlk beğeni
-          description: Bir gönderi beğendi
-        first_flag:
-          name: İlk Bayrak
-          description: Bir gönderiyi bayrakladı
-        promoter:
-          name: Destekçi
-          description: Kullanıcı davet etti
-        campaigner:
-          name: Katılanlar
-          description: 3 normal kullanıcı davet etti (Güven seviyesi 1)
-        champion:
-          name: Şampiyon
-          description: 5 kullanıcı davet etti (Güven seviyesi 2)
-        first_share:
-          name: İlk paylaşım
-          description: Bir gönderi paylaştı
-        first_link:
-          name: İlk bağlantı
-          description: Başka bir konuya iç bağlantı eklendi
-        first_quote:
-          name: İlk alıntı
-          description: Bir kullanıcıyı alıntıladı
-        read_guidelines:
-          name: Yönergeler okundu
-          description: <a href="/guidelines">Topluluk yönergelerini</a> oku
-        reader:
-          name: Okuyucu
-          description: 100'den fazla gönderiye sahip bir konudaki tüm gönderileri oku
-        popular_link:
-          name: Gözde Bağlantı
-          description: En az 50 kere tıklanmış harici bir bağlantı gönderildi
-        hot_link:
-          name: Sıcak Bağlantı
-          description: En az 300 kere tıklanmış harici bir bağlantı gönderildi
-        famous_link:
-          name: Ünlü Bağlantı
-          description: En az 1000 kere tıklanmış harici bir bağlantı gönderildi
     google_search: |
       <h3>Google'la Ara</h3>
       <p>
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 33c0a3b7bc..70a90f241c 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -275,9 +275,7 @@ uk:
         perm_default: "Ввімкнути сповіщення"
         perm_denied_btn: "Немає доступу"
         disable: "Вимкнути сповіщення"
-        currently_enabled: "(зараз увімкнено)"
         enable: "Увімкнути сповіщення"
-        currently_disabled: "(зараз вимкнено)"
       dismiss_notifications: "Позначити все як прочитане"
       dismiss_notifications_tooltip: "Позначити всі сповіщення як прочитані"
       disable_jump_reply: "Не перескакувати до мого допису коли я відповім"
@@ -460,7 +458,6 @@ uk:
     unmute: Unmute
     last_post: Останній допис
     summary:
-      description: "Тут <b>{{count}}</b> відповідей."
       enable: 'Підсумувати цю тему'
       disable: 'Показати всі дописи'
     deleted_filter:
@@ -801,12 +798,6 @@ uk:
           bookmark: "Скасувати закладку"
           like: "Скасувати вподобання"
           vote: "Відкликати голос"
-        people:
-          notify_moderators: "Звернули увагу модераторів: {{icons}}"
-          notify_moderators_with_url: "<a href='{{postUrl}}'>Звернули увагу модераторів</a>: {{icons}}"
-          bookmark: "Лишили тут закладку: {{icons}}"
-          like: "Вподобали це: {{icons}}"
-          vote: "Проголосували за це: {{icons}}"
         by_you:
           off_topic: "Ви поскаржилися на це як на недотичне до теми"
           spam: "Ви поскаржилися на це як на спам"
@@ -1080,10 +1071,8 @@ uk:
           restore:
             is_disabled: "Restore is disabled in the site settings."
             title: "Restore the backup"
-            confirm: "Are your sure you want to restore this backup?"
           rollback:
             title: "Rollback the database to previous working state"
-            confirm: "Are your sure you want to rollback the database to the previous working state?"
       customize:
         title: "Customize"
         long_title: "Site Customizations"
@@ -1415,28 +1404,3 @@ uk:
           name: Спільнота
         other:
           name: Інше
-      badge:
-        editor:
-          name: Редактор
-        basic_user:
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Надані</a> всі основні функції спільноти
-        welcome:
-          name: Ласкаво просимо
-        autobiographer:
-          name: Автобіографіст
-        anniversary:
-          name: Річниця
-        nice_topic:
-          name: Непогана тема
-        good_topic:
-          name: Хороша тема
-        great_topic:
-          name: Чудова тема
-        first_link:
-          name: Перше посилання
-        first_quote:
-          name: Перша цитата
-        read_guidelines:
-          name: Читати інструкції
-        reader:
-          name: Читач
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index b3451cc2dd..4c4dcadbb1 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -244,7 +244,6 @@ vi:
       has_pending_posts:
         other: "Chủ đề này có <b>{{count}}</b> bài viết cần phê chuẩn"
       confirm: "Lưu thay đổi"
-      delete_prompt: "Bạn có chắc muốn xóa <b>%{username}</b>? Tất cả các bài viết của họ sẽ bị xóa, email và ip sẽ bị chặn."
       approval:
         title: "Bài viết cần phê duyệt"
         description: "Chúng tôi đã nhận được bài viết mới của bạn, nhưng nó cần phải được phê duyệt bởi admin trước khi được hiện. Xin hãy kiên nhẫn."
@@ -403,9 +402,7 @@ vi:
         perm_denied_btn: "Không có quyền"
         perm_denied_expl: "Bạn đã từ chối nhận thông báo, để nhận lại bạn cần thiết lập trình duyệt."
         disable: "Khóa Notification"
-        currently_enabled: "(đang cho phép)"
         enable: "Cho phép Notification"
-        currently_disabled: "(hiện tại không cho phép)"
         each_browser_note: "Lưu ý: Bạn phải thay đổi trong cấu hình mỗi trình duyệt bạn sử dụng."
       dismiss_notifications: "Đánh dấu đã đọc cho tất cả"
       dismiss_notifications_tooltip: "Đánh dấu đã đọc cho tất cả các thông báo chưa đọc"
@@ -440,7 +437,6 @@ vi:
       muted_users: "Im lặng"
       muted_users_instructions: "Ngăn chặn tất cả các thông báo từ những thành viên."
       muted_topics_link: "Hiển thị chủ đề Im Lặng"
-      automatically_unpin_topics: "Tự động theo dõi tiêu đề bạn vào "
       staff_counters:
         flags_given: "cờ hữu ích"
         flagged_posts: "bài viết gắn cờ"
@@ -698,8 +694,6 @@ vi:
       value_prop: "Khi bạn tạo tài khoản, website nhớ chính xác những gì bạn đã đọc, vì vậy bạn sẽ luôn trở lại đúng nơi đã rời đi. Bạn cũng có thể nhận thông báo ở đây hoặc qua email mỗi khi có bài viết mới. Bạn cũng có thể like bài viết để chia sẻ cảm xúc của mình. :heartbeat:"
     summary:
       enabled_description: "Bạn đang xem một bản tóm tắt của chủ đề này: các bài viết thú vị nhất được xác định bởi cộng đồng."
-      description: "Có  <b>{{replyCount}}</b> trả lời"
-      description_time: "Đây là <b>{{replyCount}}</b> trả lời tương ứng với thời gian đọc <b>{{readingTime}} phút</b>."
       enable: 'Tóm tắt lại chủ đề'
       disable: 'HIển thị tất cả các bài viết'
     deleted_filter:
@@ -870,7 +864,6 @@ vi:
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -976,9 +969,6 @@ vi:
         category: "Không có chủ đề nào trong {{category}} ."
         top: "Không có chủ đề top."
         search: "Không có kết quả tìm kiếm."
-        educate:
-          new: '<p>Chủ đề mới của bạn nằm ở đây.</p><p>Mặc định, chủ đề được coi là mới và sẽ hiện một chỉ báo <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> nếu chúng được tạo trong 2 ngày vừa qua.</p><p>Bạn có thể thay đổi cái này trong <a href="%{userPrefsUrl}">preferences</a>.</p>'
-          unread: '<p>Những chủ đề chưa đọc của bạn nằm ở đây.</p><p>Mặc định, chủ đề được coi là chưa đọc và sẽ hiện số lượng chưa đọc <span class="badge new-posts badge-notification">1</span> nếu bạn:</p><ul><li>Đã tạo chủ đề</li><li>Đã phản hồi chủ đề</li><li>Đọc chủ đề lâu hơn 4 phút</li></ul><p>Hoặc nếu bạn đặt chủ đề là Đã theo dấu hoặc Đã xem qua điều khiển thông bao tại cuối mỗi chủ đề.</p><p>Bạn có thể thay đổi điều này trong <a href="%{userPrefsUrl}">preferences</a>.</p>'
       bottom:
         latest: "Không còn thêm chủ đề nào nữa."
         hot: "Không còn của đề nổi bật nào nữa."
@@ -1321,18 +1311,6 @@ vi:
           bookmark: "Hủy đánh dấu"
           like: "Hủy like"
           vote: "Hủy bình chọn"
-        people:
-          off_topic: "{{icons}} đánh dấu nói sai chủ đề"
-          spam: "{{icons}} đánh dấu nó là rác"
-          spam_with_url: "{{icons}} gắn cờ <a href='{{postUrl}}'>cái này là rác</a>"
-          inappropriate: "{{icons}} gắn cờ là không phù hợp"
-          notify_moderators: "{{icons}} thông báo cho điều hành viên"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>đã thông báo quản trị viên</a>"
-          notify_user: "{{icons}} gửi một tin nhắn"
-          notify_user_with_url: "{{icons}} gửi một <a href='{{postUrl}}'>tin nhắn</a>"
-          bookmark: "{{icons}} đã đánh dấu"
-          like: "{{icons}} thích cái này"
-          vote: "{{icons}} bình chọn cho cái này"
         by_you:
           off_topic: "Bạn đã đánh dấu cái nfay là chủ đề đóng"
           spam: "Bạn đã đánh dấu cái này là rác"
@@ -1464,7 +1442,6 @@ vi:
           description: "Bạn sẽ không nhận được thông báo về bất cứ chủ đề mới nào trong các chuyên mục này, và chúng sẽ không hiển thị là mới nhất."
     flagging:
       title: 'Cám ơn bạn đã giúp phát triển cộng đồng!'
-      private_reminder: 'đánh dấu là riêng tư, <b>chỉ</b> hiển thị với quản trị viên'
       action: 'Đánh dấu Bài viết'
       take_action: "Thực hiện"
       notify_action: 'Tin nhắn'
@@ -1476,7 +1453,6 @@ vi:
       submit_tooltip: "Đánh dấu riêng tư"
       take_action_tooltip: "Tiếp cận ngưỡng đánh dấu ngay lập tức, thay vì đợi cộng đồng"
       cant: "Xin lỗi, bạn không thể đánh dấu bài viết lúc này."
-      notify_staff: 'Thông báo quản trị viên'
       formatted_name:
         off_topic: "Nó là sai chủ đề"
         inappropriate: "Không phù hợp"
@@ -1842,11 +1818,9 @@ vi:
             is_disabled: "Khôi phục đã bị cấm sử dụng trong cấu hình trang."
             label: "Khôi phục"
             title: "Khôi phục lại sao lưu này"
-            confirm: "Bạn muốn khôi phục bản sao lưu này?"
           rollback:
             label: "Rollback"
             title: "Đưa csdl về trạng thái làm việc trước"
-            confirm: "Bạn có chắc chắn muốn đưa csdl về trạng thái làm việc trước?"
       export_csv:
         user_archive_confirm: "Bạn có chắc chắn muốn download các bài viết của mình?"
         success: "Export đang được khởi tạo, bạn sẽ nhận được tin nhắn thông báo khi quá trình hoàn tất."
@@ -1949,9 +1923,6 @@ vi:
           love:
             name: 'đáng yêu'
             description: "Màu của nút like"
-          wiki:
-            name: 'wiki'
-            description: "Màu cơ bản sử dụng cho nền của các bài viết wiki."
       email:
         title: "Emails"
         settings: "Cấu hình"
@@ -2506,10 +2477,7 @@ vi:
     badges:
       earned_n_times:
         other: "Đạt được huy hiệu này %{count} lần"
-      more_with_badge: "Others with this badge"
       title: Huy hiệu
-      allow_title: "có thể sử dụng như là tiêu đề"
-      multiple_grant: "có thể trao tặng nhiều lần"
       badge_count:
         other: "%{count} Huy hiệu"
       more_badges:
@@ -2529,97 +2497,6 @@ vi:
           name: Khác
         posting:
           name: Đang đăng bài
-      badge:
-        editor:
-          name: Biên tập
-          description: Chỉnh sửa bàn viết lần đầu
-        basic_user:
-          name: Cơ bản
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Các cấp</a> chức năng cần thiết của cộng đồng
-        member:
-          name: Thành viên
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Các cấp</a> lời mời
-        regular:
-          name: Thường xuyên
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Các cấp</a> phân hạng, đổi tên và theo đuôi liên kết
-        leader:
-          name: Lãnh đạo
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Các cấp</a> sửa tổng thể, ghim, đóng, lưu trữ, tách và hợp nhất
-        welcome:
-          name: Chào mừng
-          description: Đã nhận 1 lượt thích
-        autobiographer:
-          name: Tự truyện
-          description: Filled user <a href="/my/preferences">profile</a> information
-        anniversary:
-          name: Ngày kỷ niệm
-          description: Thành viên hoạt động trong năm, đăng bài ít nhất một lần
-        nice_post:
-          name: Bài viết hay
-          description: Được 10 like cho một bài viết, huy hiệu này có thể được cấp nhiều lần
-        good_post:
-          name: Bài viết tốt
-          description: Được 25 like cho một bài viết, huy hiệu này có thể được cấp nhiều lần
-        great_post:
-          name: Bài viết tuyệt vời
-          description: Được 50 like cho một bài viết, huy hiệu này có thể được cấp nhiều lần
-        nice_topic:
-          name: Bài viết hay
-          description: Được 10 like cho một chủ đề, huy hiệu này có thể được cấp nhiều lần
-        good_topic:
-          name: Chủ đề tốt
-          description: Được 25 like cho một chủ đề, huy hiệu này có thể được cấp nhiều lần
-        great_topic:
-          name: Chủ đề hay
-          description: Được 50 like cho một chủ đề, huy hiệu này có thể được cấp nhiều lần
-        nice_share:
-          name: Nice Share
-          description: Đã chia sẻ bài viết với 25 lượt người truy cập
-        good_share:
-          name: Good Share
-          description: Đã chia sẻ bài viết với 300 lượt người truy cập
-        great_share:
-          name: Great Share
-          description: Đã chia sẻ bài viết với 1000 lượt người truy cập
-        first_like:
-          name: Lượt thích đầu tiên
-          description: Đã thích một bài đăng
-        first_flag:
-          name: Đánh dấu đầu tiên
-          description: Đánh dấu bài viết
-        promoter:
-          name: Promoter
-          description: Đã mời một thành viên
-        campaigner:
-          name: Campaigner
-          description: Mời 3 thành viên (Độ tin cậy 1)
-        champion:
-          name: Champion
-          description: Mời 5 thành viên (Độ tin cậy 2)
-        first_share:
-          name: Chia sẽ đầu tiên
-          description: Chia sẽ bài viết
-        first_link:
-          name: Liên kết đầu tiên
-          description: Thêm một liên kết từ chủ để khác
-        first_quote:
-          name: Trích dẫn đầu tiên
-          description: Trích dẫn thành viên
-        read_guidelines:
-          name: Xem hướng dẫn
-          description: Xem <a href="/guidelines">nguyên tắc cộng đồng</a>
-        reader:
-          name: Người xem
-          description: Đọc tất cả bài viết trong các chủ để có hơn 100 bài
-        popular_link:
-          name: Liên kết phổ biến
-          description: Đăng một liên kết ngoài với ít nhất 50 click
-        hot_link:
-          name: Liên kết hấp dẫn
-          description: Đăng một liên kết ngoài với ít nhất 300 click
-        famous_link:
-          name: Liên kết phổ biến
-          description: Đăng một liên kết ngoài với ít nhất 1000 click
     google_search: |
       <h3>Tìm kiếm với Google</h3>
       <p>
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 63aa7317e7..1b3cdfae8b 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -445,9 +445,9 @@ zh_CN:
       muted_topics_link: "显示已忽略的主题"
       automatically_unpin_topics: "当我完整阅读了主题时自动解除置顶。"
       staff_counters:
-        flags_given: "有效标记"
-        flagged_posts: "被报告的帖子"
-        deleted_posts: "删除的帖子"
+        flags_given: "有用的标记"
+        flagged_posts: "被标记的帖子"
+        deleted_posts: "已删除的帖子"
         suspensions: "禁用的"
         warnings_received: "警告"
       messages:
@@ -518,7 +518,7 @@ zh_CN:
         title: "用户名"
         instructions: "唯一，没有空格，简短"
         short_instructions: "其他人可以用 @{{username}} 来提及你"
-        available: "你的用户名可用"
+        available: "你可以用这个用户名"
         global_match: "电子邮箱与注册用户名相匹配"
         global_mismatch: "已被注册。试试 {{suggestion}} ？"
         not_available: "不可用。试试 {{suggestion}} ？"
@@ -562,6 +562,7 @@ zh_CN:
         every_three_days: "每三天"
         weekly: "每周"
         every_two_weeks: "每两周"
+      include_tl0_in_digests: "在摘要邮件中包含新用户的帖子"
       email_in_reply_to: "在邮件中包含回复的摘要文本"
       email_direct: "当有人引用我、回复我的帖子，@提及你或邀请你至主题时发送一封邮件给我"
       email_private_messages: "当有人给发消息给我时发送一封邮件给我"
@@ -682,17 +683,21 @@ zh_CN:
         again: "再试一次"
         fixed: "载入页面"
     close: "关闭"
-    assets_changed_confirm: "此网页刚刚更新. 刷新查看新版本?"
+    assets_changed_confirm: "网站刚刚更新了。刷新使用新版本？"
     logout: "你已登出。"
     refresh: "刷新"
     read_only_mode:
-      enabled: "这个站点正处于只读模式。请继续浏览，但是回复、赞和其他操作暂时被禁用。"
+      enabled: "站点正处于只读模式。你可以继续浏览，但是回复、赞和其他操作暂时被禁用。"
       login_disabled: "只读模式下不允许登录。"
       logout_disabled: "站点在只读模式下无法登出。"
     too_few_topics_and_posts_notice: "让我们<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论！</a>目前有 <strong>%{currentTopics} / %{requiredTopics}</strong> 个主题和 <strong>%{currentPosts} / %{requiredPosts}</strong> 个帖子。新访客需要能够阅读和回复一些讨论。"
     too_few_topics_notice: "让我们<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论！</a>目前有 <strong>%{currentTopics} / %{requiredTopics}</strong> 个主题。新访客需要能够阅读和回复一些讨论。"
     too_few_posts_notice: "让我们<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论！</a>目前有 <strong>%{currentPosts} / %{requiredPosts}</strong> 个帖子。新访客需要能够阅读和回复一些讨论。"
-    logs_error_rate_exceeded_notice: "%{timestamp}：目前的错误率 <a href='%{url}' target='_blank'>%{rate}/%{duration}</a>已经超出了站点设置中设置的 %{siteSettingLimit}/%{duration}。"
+    logs_error_rate_notice:
+      reached: "%{timestamp}：目前的错误率 <a href='%{url}' target='_blank'>%{rate}</a> 已经达到了站点设置中的 %{siteSettingRate}。"
+      exceeded: "%{timestamp}：目前的错误率 <a href='%{url}' target='_blank'>%{rate}</a> 已经超出了站点设置中的 %{siteSettingRate}。"
+      rate:
+        other: "%{count} 错误/%{duration}"
     learn_more: "了解更多..."
     year: '年'
     year_desc: '365 天以前创建的主题'
@@ -723,7 +728,7 @@ zh_CN:
       disable: '显示所有帖子'
     deleted_filter:
       enabled_description: "这个主题包含已删除的帖子，他们已经被隐藏。"
-      disabled_description: "主题中被删除的帖子已显示。"
+      disabled_description: "显示了主题中已删除的帖子。"
       enable: "隐藏已删除的帖子"
       disable: "显示已删除的帖子"
     private_message_info:
@@ -887,7 +892,7 @@ zh_CN:
       title: "使用@名字提及到你，回复你的帖子和主题，消息等等的通知消息"
       none: "现在无法载入通知"
       more: "浏览以前的通知"
-      total_flagged: "被报告帖子的总数"
+      total_flagged: "被标记帖子的总数"
       mentioned: "<i title='被提及' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='引用' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -1002,8 +1007,8 @@ zh_CN:
         top: "没有最佳主题。"
         search: "没有搜索结果。"
         educate:
-          new: '<p>这里显示了对于你的近期主题。</p><p>默认情况下，下述主题将被认为是近期发表的，如果他们在这 2 天内才创建，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>标志。<p>访问你的<a href="%{userPrefsUrl}">用户设置</a>修改。</p>'
-          unread: '<p>这里显示了你的未读主题。</p><p>默认情况下，下述主题将被认为是未读的，并且会在旁边显示未读的数量<span class="badge new-posts badge-notification">1</span>。如果你：</p><ul><li>创建了该主题</li><li>回复了该主题</li><li>阅读该主题超过 4 分钟</li></ul><p>或者你在主题底部的通知控制中选择了追踪或监视。</p><p>访问你的<a href="%{userPrefsUrl}">用户设置</a>修改</p>'
+          new: '<p>这里显示了对于你的近期主题。</p><p>默认情况下，下述主题将被放在近期中。如果他们是这 2 天内创建的，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>标志。<p>访问你的<a href="%{userPrefsUrl}">用户设置</a>修改。</p>'
+          unread: '<p>这里显示了你的未读主题。</p><p>默认情况下，下述主题会被放在未读中。并且会在旁边显示未读的数量<span class="badge new-posts badge-notification">1</span>。如果你：</p><ul><li>创建了该主题</li><li>回复了该主题</li><li>阅读该主题超过 4 分钟</li></ul><p>或者你在主题底部的通知控制中选择了追踪或监视。</p><p>访问你的<a href="%{userPrefsUrl}">用户设置</a>修改未读设置。</p>'
       bottom:
         latest: "没有更多主题可看了。"
         hot: "没有更多热门主题可看了。"
@@ -1154,9 +1159,9 @@ zh_CN:
         title: '分享'
         help: '分享一个到本帖的链接'
       flag_topic:
-        title: '报告'
-        help: '私下报告本帖以引起注意或者发送一条匿名通知'
-        success_message: '你已成功报告本帖。'
+        title: '标记'
+        help: '私下标记本帖以引起注意或者发送一条匿名通知'
+        success_message: '你已经成功标记该主题。'
       feature_topic:
         title: "聚焦该主题"
         pin: "将该主题置于{{categoryLink}}分类最上方至"
@@ -1265,7 +1270,7 @@ zh_CN:
       show_full: "显示所有帖子"
       show_hidden: '查看隐蔽内容'
       deleted_by_author:
-        other: "（帖子被作者撤销，如无标记，将在 %{count} 小时后被自动删除）"
+        other: "（帖子被作者撤销，如过没有标记，将在 %{count} 小时后被自动删除）"
       expand_collapse: "展开/折叠"
       gap:
         other: "查看 {{count}} 个隐藏回复"
@@ -1302,6 +1307,7 @@ zh_CN:
         about: "这个帖子是维基"
       archetypes:
         save: '保存选项'
+      few_likes_left: "感谢你的赞！你今天只能再多赞几次了。"
       controls:
         reply: "开始给本帖撰写回复"
         like: "点个赞"
@@ -1309,7 +1315,7 @@ zh_CN:
         undo_like: "撤销赞"
         edit: "编辑本帖"
         edit_anonymous: "抱歉，但是你需要登录后才能编辑该贴。"
-        flag: "私下报告本帖以提醒管理人员关注或发送私信通知"
+        flag: "私下标记本帖以提醒管理人员关注或发送私信通知"
         delete: "删除本帖"
         undelete: "恢复本帖"
         share: "分享一个到本帖的链接"
@@ -1322,27 +1328,27 @@ zh_CN:
         admin: "帖子管理"
         wiki: "使其成为维基帖子"
         unwiki: "使其成为普通帖子"
-        convert_to_moderator: "添加管理人员颜色标记"
-        revert_to_regular: "移除管理人员颜色标记"
+        convert_to_moderator: "添加管理人员颜色标识"
+        revert_to_regular: "移除管理人员颜色标识"
         rebake: "重建 HTML"
         unhide: "显示"
         change_owner: "更改所有权"
       actions:
-        flag: '报告'
+        flag: '标记'
         defer_flags:
-          other: "推迟的标记"
+          other: "推迟处理标记"
         it_too:
-          off_topic: "同时报告"
-          spam: "同时报告"
-          inappropriate: "同时报告"
-          custom_flag: "同时报告"
+          off_topic: "一起标记"
+          spam: "一起标记"
+          inappropriate: "一起标记"
+          custom_flag: "一起标记"
           bookmark: "同时添加书签"
           like: "赞"
           vote: "同时投票支持"
         undo:
-          off_topic: "撤销报告"
-          spam: "撤销报告"
-          inappropriate: "撤销报告"
+          off_topic: "撤回标记"
+          spam: "撤回报告"
+          inappropriate: "撤回报告"
           bookmark: "撤销书签"
           like: "撤销赞"
           vote: "撤销投票"
@@ -1356,23 +1362,23 @@ zh_CN:
           like: "赞了它"
           vote: "已给本帖投票"
         by_you:
-          off_topic: "你报告它偏离主题"
-          spam: "你报告它为垃圾信息"
-          inappropriate: "你报告它为不当内容"
-          notify_moderators: "你向版主报告了它"
+          off_topic: "你标记其偏离了主题"
+          spam: "你标记其为垃圾信息"
+          inappropriate: "你标记其为不当内容"
+          notify_moderators: "你标记了本帖要求管理人员处理"
           notify_user: "你已经发了一个消息给该用户"
           bookmark: "你对该帖做了书签"
           like: "你赞了它"
           vote: "你对该帖投票支持"
         by_you_and_others:
           off_topic:
-            other: "你和其他 {{count}} 人报告它偏离主题"
+            other: "你和其他 {{count}} 人标记其偏离主题"
           spam:
-            other: "你和其他 {{count}} 人报告它为垃圾信息"
+            other: "你和其他 {{count}} 人标记其为垃圾信息"
           inappropriate:
-            other: "你和其他 {{count}} 人报告它为不当内容"
+            other: "你和其他 {{count}} 人标记其为不当内容"
           notify_moderators:
-            other: "你和其他 {{count}} 人报告它需要审核"
+            other: "你和其他 {{count}} 人标记了本帖要求管理人员处理"
           notify_user:
             other: "你和 {{count}} 个其他用户发了一个消息给该用户"
           bookmark:
@@ -1383,13 +1389,13 @@ zh_CN:
             other: "你和其他 {{count}} 人支持这个帖子"
         by_others:
           off_topic:
-            other: "{{count}} 人报告它偏离主题"
+            other: "{{count}} 人标记其偏离主题"
           spam:
-            other: "{{count}} 人报告它为垃圾信息"
+            other: "{{count}} 人标记其为垃圾信息"
           inappropriate:
-            other: "{{count}} 人报告它为不当内容"
+            other: "{{count}} 人标记其为不当内容"
           notify_moderators:
-            other: "{{count}} 人报告它需要修改"
+            other: "{{count}} 人标记本帖要求管理人员处理"
           notify_user:
             other: "{{count}} 人给这个用户发送了消息"
           bookmark:
@@ -1489,8 +1495,8 @@ zh_CN:
           title: "免打扰"
           description: "你不会收到这些分类中的任何新主题通知，并且他们将不会出现在最新列表中。"
     flagging:
-      title: '感谢帮助社群远离邪恶！'
-      action: '报告帖子'
+      title: '感谢你帮助我们建设文明社群！'
+      action: '标记帖子'
       take_action: "立即执行"
       notify_action: '消息'
       delete_spammer: "删除垃圾发布者"
@@ -1500,7 +1506,7 @@ zh_CN:
       hidden_email_address: "（隐藏）"
       submit_tooltip: "提交私有标记"
       take_action_tooltip: "立即采取标记到达限制值时的措施，而不是等待更多的社群标记"
-      cant: "抱歉，当前你不能报告本帖。"
+      cant: "抱歉，现在你不能标记本帖。"
       notify_staff: '私下通知管理人员'
       formatted_name:
         off_topic: "偏题"
@@ -1513,8 +1519,8 @@ zh_CN:
         more: "还差 {{n}} 个..."
         left: "还剩下 {{n}}"
     flagging_topic:
-      title: "感谢帮助社群远离邪恶！"
-      action: "报告帖子"
+      title: "感谢你帮助我们建设文明社群！"
+      action: "标记帖子"
       notify_action: "消息"
     topic_map:
       title: "主题概要"
@@ -1705,48 +1711,48 @@ zh_CN:
         latest_changes: "最近的更新：请经常升级！"
         by: "来自"
       flags:
-        title: "报告"
-        old: "旧的"
+        title: "标记"
+        old: "历史"
         active: "待处理"
-        agree: "已批准"
+        agree: "确认标记"
         agree_title: "确认这个标记有效且正确"
-        agree_flag_modal_title: "批准并..."
-        agree_flag_hide_post: "批准（隐藏并发送私信）"
+        agree_flag_modal_title: "确认标记并执行..."
+        agree_flag_hide_post: "确认标记（隐藏帖子并发送私信）"
         agree_flag_hide_post_title: "隐藏帖子并自动发送消息要求用户修改"
         agree_flag_restore_post: "同意 (还原帖子)"
         agree_flag_restore_post_title: "还原这篇帖子"
-        agree_flag: "批准这个标记"
-        agree_flag_title: "批准这个标记并且保持帖子不变"
-        defer_flag: "推迟"
+        agree_flag: "确认标记"
+        agree_flag_title: "确认标记，不对帖子进行操作"
+        defer_flag: "推迟处理"
         defer_flag_title: "移除标记；这次不处理。"
         delete: "删除"
         delete_title: "删除标记指向的帖子。"
-        delete_post_defer_flag: "删除帖子并推迟标记"
+        delete_post_defer_flag: "删除帖子并推迟处理标记"
         delete_post_defer_flag_title: "删除此帖；如果这是这个主题内的第一篇帖子则删除主题"
-        delete_post_agree_flag: "删除帖子并批准此标记"
+        delete_post_agree_flag: "删除帖子并确认标记"
         delete_post_agree_flag_title: "删除此帖；如果这是这个主题内的第一篇帖子则删除主题"
         delete_flag_modal_title: "删除并..."
         delete_spammer: "删除垃圾发布者"
         delete_spammer_title: "移除该用户及其的所有帖子和主题。"
-        disagree_flag_unhide_post: "不批准（不隐藏帖子）"
-        disagree_flag_unhide_post_title: "清除此帖的任何报告，并使其重新可见"
-        disagree_flag: "不批准"
-        disagree_flag_title: "拒绝这个报告，无效或不正确"
+        disagree_flag_unhide_post: "否决（显示帖子）"
+        disagree_flag_unhide_post_title: "删除此帖的所有标记并使其重新可见"
+        disagree_flag: "否决"
+        disagree_flag_title: "否却该标记（该标记无效或不正确）"
         clear_topic_flags: "完成"
-        clear_topic_flags_title: "这个主题已被调查且提案已被解决。单击<strong>完成</strong>以删除报告。"
+        clear_topic_flags_title: "主题的问题已经已被调查且提案已被解决。单击<strong>完成</strong>以删除报告。"
         more: "（更多回复...）"
         dispositions:
-          agreed: "已批准"
-          disagreed: "未批准"
-          deferred: "推迟"
-        flagged_by: "报告者为"
+          agreed: "已确认"
+          disagreed: "被否决"
+          deferred: "已推迟"
+        flagged_by: "标记者"
         resolved_by: "已解决，被"
         took_action: "立即执行"
         system: "系统"
         error: "出错了"
         reply_message: "回复"
-        no_results: "没有报告"
-        topic_flagged: "这个<strong>主题</strong>已被报告。"
+        no_results: "当前没有标记。"
+        topic_flagged: "<strong>主题</strong>已经被标记。"
         visit_topic: "浏览主题才能操作"
         was_edited: "帖子在第一次标记后被编辑"
         previous_flags_count: "这篇帖子已经被标示了 {{count}} 次。"
@@ -2197,7 +2203,7 @@ zh_CN:
         moderator: "版主？"
         admin: "管理员？"
         blocked: "已封?"
-        staged: "部分权限？"
+        staged: "暂存？"
         show_admin_profile: "管理员"
         edit_title: "编辑头衔"
         save_title: "保存头衔"
@@ -2223,8 +2229,8 @@ zh_CN:
         posts_read_count: 已阅帖子数量
         post_count: 创建的帖子数量
         topics_entered: 已查看的主题数量
-        flags_given_count: 所做报告数量
-        flags_received_count: 收到报告数量
+        flags_given_count: 提交标记数量
+        flags_received_count: 被他人标记数量
         warnings_received_count: 收到警告
         flags_given_received_count: '给出的标记 / 收到的标记'
         approve: '批准'
@@ -2264,7 +2270,7 @@ zh_CN:
         deactivate_explanation: "已停用的用户必须重新验证他们的电子邮件。"
         suspended_explanation: "一个被封禁的用户不能登录。"
         block_explanation: "被封禁的用户不能发表主题或者评论。"
-        stage_explanation: "部分访问权限的用户只能通过邮件在特定主题内发表帖子。"
+        stage_explanation: "暂存用户只能通过邮件在特定主题内发表帖子。"
         trust_level_change_failed: "改变用户等级时出现了一个问题。"
         suspend_modal_title: "被禁用户"
         trust_level_2_users: "二级信任等级用户"
@@ -2276,7 +2282,7 @@ zh_CN:
         tl3_requirements:
           title: "信任等级 3 的要求"
           table_title: "在最近%{time_period}天："
-          value_heading: "价值"
+          value_heading: "当前"
           requirement_heading: "要求"
           visits: "访问"
           days: "天数"
@@ -2285,17 +2291,17 @@ zh_CN:
           topics_viewed_all_time: "已阅的主题 (全部)"
           posts_read: "已读帖子"
           posts_read_all_time: "已读的帖子 (全部)"
-          flagged_posts: "被报告的帖子"
-          flagged_by_users: "标记的用户"
+          flagged_posts: "被标记的帖子"
+          flagged_by_users: "标记其的用户"
           likes_given: "给出的赞"
           likes_received: "收到的赞"
           likes_received_days: "收到的赞：独立天数"
           likes_received_users: "收到的赞：每用户"
-          qualifies: "符合等级3的信用度"
-          does_not_qualify: "未符合等级3的信用度"
+          qualifies: "符合信任等级3要求"
+          does_not_qualify: "不符合信任等级3要求"
           will_be_promoted: "将在近期被提升。"
           will_be_demoted: "将在近期被降级。"
-          on_grace_period: "目前在升级优惠阶段，将不会被降级。"
+          on_grace_period: "目前在升级宽限期，不会被降级。"
           locked_will_not_be_promoted: "信任等级被锁定。将不再被提升。"
           locked_will_not_be_demoted: "信任等级被锁定。将不再被降级。"
         sso:
@@ -2384,6 +2390,7 @@ zh_CN:
         badge: 徽章
         display_name: 显示名称
         description: 描述
+        long_description: 详情
         badge_type: 徽章分类
         badge_grouping: 群组
         badge_groupings:
@@ -2533,7 +2540,7 @@ zh_CN:
         reply_post: '<b>r</b> 回复帖子'
         quote_post: '<b>q</b> 引用帖子'
         like: '<b>l</b> 赞帖子'
-        flag: '<b>!</b> 报告帖子'
+        flag: '<b>!</b> 标记帖子'
         bookmark: '<b>b</b> 给帖子添加书签'
         edit: '<b>e</b> 编辑帖子'
         delete: '<b>d</b> 删除帖子'
@@ -2544,7 +2551,8 @@ zh_CN:
     badges:
       earned_n_times:
         other: "授予徽章 %{count} 次"
-      more_with_badge: "其他有这些徽章的人"
+      granted_on: "授予于 %{date}"
+      others_count: "其他有该徽章的人（%{count}）"
       title: 徽章
       allow_title: "能用作头衔"
       multiple_grant: "能被授予多次"
@@ -2567,97 +2575,6 @@ zh_CN:
           name: 其它
         posting:
           name: 发帖
-      badge:
-        editor:
-          name: 编辑
-          description: 首个帖子编辑
-        basic_user:
-          name: 基础
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">授予</a>所有常用社群功能
-        member:
-          name: 成员
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">已授予</a>邀请权限
-        regular:
-          name: 活跃用户
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">已授予</a>重分类、重命名、跟踪链接和贵宾室
-        leader:
-          name: 资深
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">已授予</a> 全局编辑、固定、关闭、存档、分割和合并
-        welcome:
-          name: 欢迎
-          description: 得到一个赞
-        autobiographer:
-          name: 自传作者
-          description: 已填写用户<a href="/my/preferences">资料</a>信息
-        anniversary:
-          name: 年度纪念日
-          description: 一年活跃用户，至少发了一个帖子
-        nice_post:
-          name: 不错的帖子
-          description: 一个帖子收到 10 个赞。这个徽章可以被授予多次
-        good_post:
-          name: 实用的帖子
-          description: 一个帖子收到 25 个赞。这个徽章可以被授予多次
-        great_post:
-          name: 非常棒的帖子
-          description: 一个帖子收到 50 个赞。这个徽章可以被授予多次
-        nice_topic:
-          name: 好的主题
-          description: 一个帖子收到 10 个赞。这个徽章可以被授予多次
-        good_topic:
-          name: 不错的主题
-          description: 一个帖子收到 25 个赞。这个徽章可以被授予多次
-        great_topic:
-          name: 很棒的主题
-          description: 一个帖子收到 50 个赞。这个徽章可以被授予多次
-        nice_share:
-          name: 分享得很好
-          description: 分享了一个有 25 个独立访问者的帖子
-        good_share:
-          name: 分享得不错
-          description: 分享了一个有 300 个独立访问者的帖子
-        great_share:
-          name: 分享得很好
-          description: 分享了一个有 1000 个独立访问者的帖子
-        first_like:
-          name: 首个赞
-          description: 已赞了一个帖子
-        first_flag:
-          name: 首个标记
-          description: 标记帖子
-        promoter:
-          name: 推广
-          description: 已邀请了 1 个用户
-        campaigner:
-          name: 资深推广
-          description: 邀请3个基础用户（信任等级1）
-        champion:
-          name: 元老推广
-          description: 邀请5个会员（信任等级2）
-        first_share:
-          name: 首次分享
-          description: 已分享了一个帖子
-        first_link:
-          name: 首个链接
-          description: 已经添加了一个内部链接至另一个主题
-        first_quote:
-          name: 第一次引用
-          description: 引用了一个用户
-        read_guidelines:
-          name: 阅读指引
-          description: 阅读<a href="/guidelines">社群指引</a>
-        reader:
-          name: 读者
-          description: 阅读一个超过 100 个帖子的主题中的每一个帖子
-        popular_link:
-          name: 流行链接
-          description: 发布了超过 50 次点击的外部链接
-        hot_link:
-          name: 热门链接
-          description: 发布了超过 300 次点击的外部链接
-        famous_link:
-          name: 著名链接
-          description: 发布了超过 1000 次点击的外部链接
     google_search: |
       <h3>用 Google 搜索</h3>
       <p>
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 3100d87adb..03b74dc0de 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -81,6 +81,8 @@ zh_TW:
           other: "%{count} 個月後"
         x_years:
           other: "%{count} 年後"
+      previous_month: '上個月'
+      next_month: '下個月'
     share:
       topic: '在此話題內分享連結'
       post: '文章 #%{postNumber}'
@@ -223,7 +225,6 @@ zh_TW:
       has_pending_posts:
         other: "本主題仍有 <b>{{count}}</b>篇貼文等待審核"
       confirm: "儲存變更"
-      delete_prompt: "您確定要刪除 <b>%{username}</b> 這個帳號嗎？這會同時將該帳號的所有貼文一併刪除，並封鎖他的電子郵件與 IP。"
       approval:
         title: "貼文需等待審核"
         description: "貼文已經送出，但必須等待管理者審核過後才會出現在板上，請耐心等候。"
@@ -271,7 +272,9 @@ zh_TW:
       title:
         other: "群組"
       members: "成員"
+      topics: "主題"
       posts: "文章"
+      messages: "訊息"
       alias_levels:
         title: "誰可以在這個群組發送訊息和使用@提到"
         nobody: "沒有"
@@ -282,6 +285,11 @@ zh_TW:
       trust_levels:
         title: "當這些成員加入時自動提升信任等級:"
         none: "無"
+      notifications:
+        watching:
+          title: "關注"
+        regular:
+          title: "一般"
     user_action_groups:
       '1': "已按讚"
       '2': "已收到的讚"
@@ -359,9 +367,7 @@ zh_TW:
         perm_default: "啟用桌面通知"
         perm_denied_btn: "權限被拒絕"
         disable: "停用通知"
-        currently_enabled: "(當前已啟用)"
         enable: "啟用通知"
-        currently_disabled: "(當前已關閉)"
       dismiss_notifications: "全部標記為已讀"
       dismiss_notifications_tooltip: "標記所有未讀通知為已讀"
       disable_jump_reply: "不要在回覆之後直接跳到我的文章"
@@ -399,7 +405,9 @@ zh_TW:
         warnings_received: "警告"
       messages:
         all: "全部"
+        archive: "封存"
         groups: "我的群組"
+        move_to_archive: "封存"
       change_password:
         success: "( 寄出的郵件 )"
         in_progress: "( 正在傳送郵件 )"
@@ -601,8 +609,6 @@ zh_TW:
       sign_up: "註冊"
     summary:
       enabled_description: "你正在檢視此討論話題的摘要：在這個社群裡最熱門的文章。"
-      description: "共有 <b>{{replyCount}}</b> 個回覆。"
-      description_time: "共有 <b>{{replyCount}}</b> 個回覆，大約需要 <b>{{readingTime}} 分鐘</b>閱讀。"
       enable: '以摘要檢視此討論話題'
       disable: '顯示所有文章'
     deleted_filter:
@@ -764,7 +770,6 @@ zh_TW:
       mentioned: "<i title='被提到' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -828,9 +833,6 @@ zh_TW:
         bookmarks: "您目前沒有加入書籤的討論話題。"
         category: "沒有 {{category}} 的討論話題。"
         top: "沒有精選討論話題。"
-        educate:
-          new: '<p>你的新討論話題會出現在這裡。</p><p>預設上，2 天內新增的討論話題會被當成新的，並會出現 <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">新</span> 此一標籤。</p><p>你可以在<a href="%{userPrefsUrl}">偏好設定</a>中修改設定。</p>'
-          unread: '<p>你的未讀討論話題會出現在這裡。</p><p>預設上，以下話題會被標示成未讀話題，並且未讀文章數量 <span class="badge new-posts badge-notification">1</span> 會顯示：</p><ul><li>建立新的討論話題</li><li>回覆討論話題</li><li>閱讀討論話題超過 4 分鐘</li></ul><p>或若透過討論話題下面的通知設定追蹤或觀察。</p><p>你可以在<a href="%{userPrefsUrl}">偏好設定</a>中修改設定。</p>'
       bottom:
         latest: "已經沒有其它最近的討論話題了。"
         hot: "已經沒有其它熱門的討論話題了。"
@@ -846,6 +848,8 @@ zh_TW:
       create: '新討論話題'
       create_long: '建立新討論話題'
       private_message: '發送訊息'
+      archive_message:
+        title: '封存'
       list: '討論話題'
       new: '新討論話題'
       unread: '未讀'
@@ -894,6 +898,7 @@ zh_TW:
         go_top: "頂部"
         go_bottom: "底部"
         go: "前往"
+        jump_bottom: "跳至最後一則帖子"
         jump_bottom_with_number: "跳至第 %{post_number} 篇文章"
         total: 所有文章
         current: 目前的文章
@@ -1049,6 +1054,7 @@ zh_TW:
         other: "{{count}} 個讚"
       has_likes_title:
         other: "{{count}} 個使用者對此文章讚好"
+      has_likes_title_only_you: "你已按讚"
       errors:
         create: "抱歉，建立你的文章時發生錯誤，請再試一次。"
         edit: "抱歉，編輯你的文章時發生錯誤，請再試一次。"
@@ -1113,17 +1119,11 @@ zh_TW:
           like: "撤回讚"
           vote: "撤回投票"
         people:
-          off_topic: "{{icons}} 標示為偏離主題"
-          spam: "{{icons}} 標示為垃圾文章"
-          spam_with_url: "{{icons}} 投訴 <a href='{{postUrl}}'>此為 spam</a>"
-          inappropriate: "{{icons}} 標示為不適內容"
-          notify_moderators: "{{icons}} 已通知板主"
-          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>已通知板主</a>"
-          notify_user: "{{icons}} 已送出訊息"
-          notify_user_with_url: "{{icons}} 已送出 <a href='{{postUrl}}'>訊息</a>"
-          bookmark: "{{icons}} 已加上書籤"
-          like: "{{icons}} 已按讚"
-          vote: "{{icons}} 已投票支持"
+          off_topic: "投訴為離題內容"
+          spam: "投訴為垃圾內容"
+          inappropriate: "投訴為不當內容"
+          notify_moderators: "已通知的版主"
+          notify_user: "已送出一則訊息"
         by_you:
           off_topic: "你已投訴此文章偏離討論話題"
           spam: "你已投訴此文章為垃圾"
@@ -1247,11 +1247,12 @@ zh_TW:
           title: "關注"
         tracking:
           title: "追蹤"
+        regular:
+          title: "一般"
         muted:
           title: "靜音"
     flagging:
       title: '感謝幫助社群遠離邪惡！'
-      private_reminder: '標記是不公開的，<b>只有</b> 工作人員才可看到'
       action: '投訴文章'
       take_action: "執行動作"
       notify_action: '訊息'
@@ -1610,11 +1611,9 @@ zh_TW:
             is_disabled: "此站設定已關閉復原"
             label: "還原"
             title: "復原備份"
-            confirm: "你確定要復原備份嗎?"
           rollback:
             label: "回溯"
             title: "回溯資料庫到以前的工作階段"
-            confirm: "你確定要回溯資料庫到以前的工作階段?"
       export_csv:
         user_archive_confirm: "你確定要下載你的文章嗎?"
         success: "開始匯出，處理完畢後將以私人訊息通知你。"
@@ -1717,10 +1716,8 @@ zh_TW:
           love:
             name: '愛'
             description: "按讚按鈕的顏色"
-          wiki:
-            name: '共筆'
-            description: "共筆文章的背景顏色"
       email:
+        title: "電子郵件"
         settings: "設定"
         preview_digest: "預覽文摘"
         sending_test: "傳送測試郵件"
@@ -1744,6 +1741,12 @@ zh_TW:
         last_seen_user: "最近出現的用戶:"
         reply_key: "回覆金鑰"
         skipped_reason: "跳過原因"
+        incoming_emails:
+          error: "錯誤"
+          modal:
+            error: "錯誤"
+          filters:
+            error_placeholder: "錯誤"
         logs:
           none: "找不到記錄。"
           filters:
@@ -1805,6 +1808,12 @@ zh_TW:
             change_category_settings: "變更分類設定"
             delete_category: "刪除分類"
             create_category: "建立分類"
+            block_user: "封鎖用戶"
+            unblock_user: "解除封鎖"
+            grant_admin: "授予管理員權限"
+            revoke_admin: "撤銷管理員權限"
+            grant_moderation: "授予板主權限"
+            revoke_moderation: "撤銷板主權限"
         screened_emails:
           title: "過濾的電子郵件地址"
           description: "以下的電子郵件地址將無法用來建立新用戶。"
@@ -2221,8 +2230,6 @@ zh_TW:
         mark_watching: '<b>m</b>, <b>w</b> 關注討論話題'
     badges:
       title: 徽章
-      allow_title: "允許使用它作為稱號"
-      multiple_grant: "可以多次授予"
       badge_count:
         other: "%{count} 徽章"
       more_badges:
@@ -2242,93 +2249,3 @@ zh_TW:
           name: 其他
         posting:
           name: 文章
-      badge:
-        editor:
-          name: 編輯
-          description: 首篇文章編輯
-        basic_user:
-          name: 初級
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">取得</a>所有基本社群功能
-        member:
-          name: 成員
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">取得</a>邀請功能
-        regular:
-          name: 常客
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">取得</a>重新分類、重新命名、連結跟隨（無 nofollow 屬性）、貴賓室功能
-        leader:
-          name: 領袖
-          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">取得</a>全域編輯、置頂、關閉、封存、分割、合併討論話題功能
-        welcome:
-          name: 歡迎
-          description: 收到一個讚
-        autobiographer:
-          name: 自我介紹
-          description: 填寫用戶<a href="/my/preferences">個人</a> 資料
-        anniversary:
-          name: 周年紀念日
-          description: 一年中的活躍使用者，至少發表一次
-        nice_post:
-          name: 好文章
-          description: 一篇文章收到 10 個讚。此徽章可多次獲得。
-        good_post:
-          name: 棒文章
-          description: 一篇文章收到 25 個讚。此徽章可多次獲得。
-        great_post:
-          name: 神文章
-          description: 一篇文章收到 50 個讚。此徽章可多次獲得。
-        nice_topic:
-          name: 好話題
-          description: 一篇討論話題獲得 10 個讚。本徽章可以多次取得。
-        good_topic:
-          name: 棒話題
-          description: 一篇討論話題獲得 25 個讚。本徽章可以多次取得。
-        great_topic:
-          name: 神話題
-          description: 一篇討論話題獲得 50 個讚。本徽章可以多次取得。
-        nice_share:
-          name: 好分享
-          description: 分享一篇文章給 25 位不同的訪客
-        good_share:
-          name: 棒分享
-          description: 分享一篇文章給 300 位不同的訪客
-        great_share:
-          name: 神分享
-          description: 分享一篇文章給 1000 位不同的訪客
-        first_like:
-          name: 首次讚好
-          description: 給此貼文按讚
-        first_flag:
-          name: 首次標記
-          description: 標記文章
-        promoter:
-          name: 推手
-          description: 已邀請一位用戶
-        campaigner:
-          name: 說客
-        champion:
-          name: 鬥士
-          description: 已邀請 5 位成員 ( 信任等級 2 )
-        first_share:
-          name: 首個分享
-          description: 分享文章
-        first_link:
-          name: 首次連結
-          description: 其他討論話題含內部連結
-        first_quote:
-          name: 首先引用
-          description: 標記使用者
-        read_guidelines:
-          name: 觀看守則
-          description: 觀看<a href="/guidelines">社群守則</a>
-        reader:
-          name: 讀者
-          description: 觀看每個超過100篇文章的討論話題
-        popular_link:
-          name: 熱門連結
-          description: 張貼的外部連結有最少 50 次的點擊
-        hot_link:
-          name: 熱門連結
-          description: 張貼的外部連結有最少 300 次的點擊
-        famous_link:
-          name: 出色連結
-          description: 張貼的外部連結有最少 1000 次的點擊
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 9869b3d646..272e9cab77 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -30,9 +30,14 @@ ar:
   emails:
     incoming:
       default_subject: "رسالة ورادة من %{email}"
+      show_trimmed_content: "اظهر محتوى أقل"
       errors:
+        empty_email_error: "يحدث عندما يكون البريد المستلم فارغ"
+        no_message_id_error: "يحدث عندما لا يحتوي البريد على  'Message-Id' في العنوان"
+        no_body_detected_error: "يحدث عندما لا نستطيع اقتباس المحتوى و لا يوجد مرفق ."
         inactive_user_error: "يحدث عندما يكون المرسل غير نشط "
         blocked_user_error: "يحدث عندما يكون المرسل محظور"
+        bad_destination_address: "يحدع عندما لا يكون اي من عنوان البريد االكتروني في حقول  To/Cc/Bcc تتطابق مع كون البريد القادم"
         strangers_not_allowed_error: "يحدث عندما يحاول المستخدم انشاء موضوع جديد في قسم هو ليس عضواً فيه"
         insufficient_trust_level_error: "يحدث عندما يحاول مستخدم انشاء موضوع جديد في قسم و تكون درجه ثقه المستخدم اقل من القسم المطلوب "
         reply_user_not_matching_error: "يحدث عندما ياتي الرد من عنوان بريد ألكتروني مختلف من الذي أرسل اليه ألاشعار "
@@ -212,6 +217,7 @@ ar:
     top: "أفضل المواضيع"
     posts: "اخر المشاركات "
   too_late_to_edit: "أُنشئ المنشور منذ فترة طويلة جدا، لذا تعديله أو حذفه لم يعد ممكنا."
+  revert_version_same: "ألاصدار الحالي يتطابق مع نفس ألاصدار الذي تحاول استرجاعه ."
   excerpt_image: "صورة"
   queue:
     delete_reason: "حذف عبر طابور مشاركة معتدل"
@@ -220,7 +226,9 @@ ar:
       can_not_modify_automatic: "لا يمكنك تعديل مجموعة تلقائية"
       member_already_exist: " '%{username}' هو عضو في هذه المجموعة بالفعل."
       invalid_domain: "'%{domain}' ليس نطاقا صالحا."
-      invalid_incoming_email: "'%{incoming_email}' ليس بريدا إلكترونيا صالحا."
+      invalid_incoming_email: "'%{email_in}' ليس عنوان بريد الكتروني صالح ."
+      email_already_used_in_group: "'%{email}' مستخدم من قبل المجموعه '%{group_name}'. "
+      email_already_used_in_category: "'%{email}' مستخدم من قبل القسم '%{category_name}'."
     default_names:
       everyone: "الجميع"
       admins: "المسؤولين"
@@ -359,8 +367,9 @@ ar:
       uncategorized_parent: "غير مصنف لا يمكن أن يكون فئة الأم"
       self_parent: "الفئة الفرعية لا يمكن ان تكون كالفئة الرئيسية."
       depth: "لا يمكنك تضمين فئة فرعية تحت فئة فرعية اخرى"
-      email_in_already_exist: "البريد الإلكتروني الوارد '%{email_in}' مستخدم حاليا للفئة '%{category_name}'."
-      invalid_email_in: "'%{email_in}' ليس بريداً صالحاَ"
+      invalid_email_in: "'%{email_in}' ليس عنوان بريد الكتروني صالح ."
+      email_already_used_in_group: "'%{email}' مستخدم من قبل المجموعه '%{group_name}'. "
+      email_already_used_in_category: "'%{email}' مستخدم من قبل القسم '%{category_name}'."
     cannot_delete:
       uncategorized: "لايمكن حذف الغير مصنف"
       has_subcategories: "لايمكن حذف هذه الفئة لأنها تحتوي على فئات فرعية "
@@ -593,6 +602,10 @@ ar:
     confirmed: "حُدّث بريدك الإلكتروني."
     please_continue: "تابع إلى %{site_name}"
     error: "حدث خطأ في تغيير عنوان بريدك الإلكتروني. لربما يكون العنوان مستخدما بالفعل."
+    already_done: "نأسف عنوان التاكيد هدا لم يعد صالحا بعد الان. ربما تم تغيير بريدك بالفعل؟"
+    authorizing_old:
+      title: "شكرا لك لتاكيدك عنوان بريدك الحالي."
+      description: "نحن الان نقوم بمراسله عنوانك الجديد للتأكيد."
   activation:
     action: "انقر هنا لتنشيط حسابك."
     already_done: "آسفون، لم يعد رابط تأكيد الحساب صالحا. لربما يكون الحساب نشطا بالفعل."
@@ -989,6 +1002,7 @@ ar:
     enable_twitter_logins: "تفعيل مصادقة تويتر , يطلب : twitter_consumer_key و twitter_consumer_secret"
     twitter_consumer_key: "مفتاح المستهلك للمصادقة تويتر، مسجلة في http://dev.twitter.com"
     twitter_consumer_secret: "مفتاح المستهلك للمصادقة تويتر، مسجلة في http://dev.twitter.com"
+    enable_instagram_logins: "تفعيل تسجيل الدخول عن طريق الانستغرام , يتطلب instagram_consumer_key و instagram_consumer_secret"
     instagram_consumer_key: "مفتاح الاستخدام لتوثيق الانستغرام "
     instagram_consumer_secret: "استخدم توثيق انستغرام السري "
     enable_facebook_logins: "تمكين مصادقة الفيسبوك، يتطلب facebook_app_id وfacebook_app_secret"
@@ -1003,6 +1017,7 @@ ar:
     backup_frequency: "كمية النسخ الإحتياطية المتكررة التي أنشأناها، في اليوم."
     enable_s3_backups: "تحميل النسخ الاحتياطي لS3 عند اكتماله. هام: يتطلب اعتماد S3 صالحة دخلت في إعدادات الملفات."
     s3_backup_bucket: "الرفع عن بعد لإجراء نسخ إحتياطية. تحذير : تأكد من أنه رفع خاص."
+    s3_disable_cleanup: "عطل النسخ الاحتياطيه المحذوفه من S3 عندما يتم حذفها محلياً"
     backup_time_of_day: "الوقت الذي يجب ان تأخد النسخ الاحتياطية فيه."
     backup_with_uploads: "إضافة التحميلات ل النسخ الإحتياطية. إلغاء هذة الخاصية سوف تؤدي إلى أخذ نسخ إحتياطية من قاعدة البيانات فقط."
     active_user_rate_limit_secs: "كيف في كثير من الأحيان نقوم بتحديث حقل 'last_seen_at، في ثوان"
@@ -1051,16 +1066,9 @@ ar:
     tl2_requires_likes_received: "كمية الإعجابات التي يجب على العضو إرسالها قبل ترقيته لمستوى الثقة 2."
     tl2_requires_likes_given: "كمية الإعجابات التي يجب على العضو جمعها قبل ترقيته لمستوى الثقة 2."
     tl2_requires_topic_reply_count: "كمية مواضيع العضو التي يجب الرد عليها قبل الترقية لمستوى الثقة 2."
-    tl3_time_period: "الفترة الزمنية لمتطلبات مستور الثقة 3."
-    tl3_requires_topics_replied_to: "أقل عدد من المواضيع التي يجب على المستخدم الرد عليها في آخر 100 يوم للتأهل لمستوى الثقة 3. (0 أو أكثر)"
-    tl3_requires_topics_viewed: "نسبة الموضوعات التي تم إنشاؤها في آخر 100 يوم، تجعل المستخدم مؤهلًا لعرضه للترقية إلى مستوى الثقة الثالث3 . (من 0 الى 100)"
-    tl3_requires_posts_read: "النسبه المئويه للمنشورات التي تم انشاءها في اخر 100 يوم ,التي يحتاج المستخدم لمعينتها تؤهله للترقيه للمستوي الثقه 3. (0 الي 100)"
     tl3_requires_topics_viewed_all_time: "أقل عدد من المواضيع التي يجب  على المستخدم مشاهدتها  للتأهل لمستوى الثقة 3."
     tl3_requires_posts_read_all_time: "أقل عدد من المشاركات يجب على المستحدم قرائتها للتأهل لمستوى الثقة 3 ."
-    tl3_requires_max_flagged: "يجب علي المستخدم عدم الحصول علي اكثر من x مشاركات مؤشره من x  مستخدمين مختلفين في اخر 100 يوم لليترقى للمستوي 3 من الثقه , عندما x  تساوي قيمه (صفر او اكثر)"
     tl3_promotion_min_duration: "أقل عدد من الأيام التي تكون الترقية إلى مستوى الثقة 3 قد أنتهت قبل عودة المستخدم لمستوى الثقة 2."
-    tl3_requires_likes_given: "أقل عدد من الإعجابات التي يجب أن تُمنح في آخر 100 يوم للتأهل لمستوى الثقة 3."
-    tl3_requires_likes_received: "أقل عدد من الإعجابات التي يجب أن تُتلقى في آخر 100 يوم للتأهل لمستوى الثقة 3."
     tl3_links_no_follow: "لا تحذف rel=nofollow من روابط المشاركة بواسطة أعضاء مستوى الثقة 3."
     min_trust_to_create_topic: "أدنى مستوى ثقة مطلوب لإنشاء موضوع جديد."
     min_trust_to_edit_wiki_post: "الحد الأدنى لمستوى الثقة المطلوب لتعديل مشاركة معلمة كويكي."
@@ -1174,7 +1182,6 @@ ar:
     disable_avatar_education_message: "عطل الرسالة التعليمية لتغيير الصورة الرمزية."
     daily_performance_report: "تحليل سجلات NGINX يومي ونشر موضوع \"قاقم فقط\" مع التفاصيل"
     suppress_uncategorized_badge: "لا تظهر الوسام  للمواضيع غير المصنفة في قائمة الموضوع."
-    permalink_normalizations: "يتم تطبيق التعابير القياسية قبل مطابقة صور الروابط الثابتة، على سبيل المثال: /(\\/topic.*)\\?.*/\\1 سوف تقطع الاستعلامات من الموضوع. التنسيق هو : التعبير القياسي+النص المستخدم \\ إلخ.. للوصول للقطع"
     global_notice: "اعرض تنبيه, شعار عام طارئ ملاحظه لكل الزوار, غير الفراغ لاخفاء(HTML مسموح)"
     disable_edit_notifications: "لتعطيل تحرير الاشعارات بواسطة العضو النظام عندما يكون نشطاً 'download_remote_images_to_local'."
     automatically_unpin_topics: "تلقائياً قم بنزع الدبوس عندا يصل المستخدم إلي نهاية الصفحه"
@@ -1214,8 +1221,10 @@ ar:
     default_email_private_messages: "أرسل بريد إلكتروني عندما يراسل شخص ما العضو إفتراضيا."
     default_email_direct: "ارسل بريد الكتروني عندما يقوم احدهم بالرد/الاقتباس الي/ذكر او دعوه مستخدم افتراضيا"
     default_email_mailing_list_mode: "ارسل بريد إلكتروني لكل مشاركة جديدة افتراضيا."
+    disable_mailing_list_mode: "عدم السماح للمستخدمين بتفعيل خيار  المراسله الجماعيه"
     default_email_always: "أرسل إشعار بريد إلكتروني حتى عندما يكون العضو متاح إفتراضيا."
     default_email_previous_replies: "ارفق الردود السابقه في رسائل البريد افتراضياً"
+    default_email_in_reply_to: "ارفق مقتبسات الرد على المنشور في رسائل البريد افتراضياً"
     default_other_new_topic_duration_minutes: "الشروط العالمية الافتراضية لموضوع يعتبر جديد."
     default_other_auto_track_topics_after_msecs: "الوقت العالمي الافتراضي قبل الموضوع متعقب آليا."
     default_other_external_links_in_new_tab: "أفتح الروابط الخارجية في تبويب جديد إفتراضيا."
@@ -1262,11 +1271,6 @@ ar:
       category: 'فئات'
       topic: 'نتائج '
       user: 'مستخدمين '
-  sso:
-    not_found: "لا تستطيع البحث او انشاء حساب جديد , راجع ادارة الموقع "
-    account_not_approved: "الحساب بإنتظار الموافقة , ستتلقى إشعار بالبريد الكتروني بعد الموافقة "
-    unknown_error: "حدث خطأ أثناء تحديث المعلومات، راجع إدارة الموقع"
-    timeout_expired: "انتهى وقت الجلسة , يرجى تسجيل الدخول مرة اخرى "
   original_poster: "المشاركات الأصلية "
   most_posts: "معظم المشاركات"
   most_recent_poster: "معظم المشاركات الاخيرة "
@@ -1608,11 +1612,6 @@ ar:
         للمعلومات الاضافيه.الرجاء مراجعه [قوانين مجتمعنا] (%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "الحساب مُعطل"
-      text_body_template: |
-        مرحبا,
-
-        هذه رسالة تلقائية من %{site_name}  أن أحيطكم علما بأن تم حظر الحساب الخاص بك عن طريق الطاقم
-        لمزيد من الإرشادات، يرجى الرجوع إلى موقعنا على [community guidelines](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "العضو الجديد %{username} تم حجبه بسبب تبليغات عليه في المجتمع"
     spam_post_blocked:
@@ -1650,48 +1649,8 @@ ar:
     posted_by: "مشاركة بواسطة %{username} على %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} دعاك لرسالة '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} دعوتك إلى رسالة
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        يرجى زيارة هذا الرابط لعرض الرسالة: %{base_url}%{url}
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} دعاك للرسالة '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} دعاك لرسالة
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        في
-
-        > %{site_title} -- %{site_description}
-
-        يرجى زيارة هذا الرابط لعرض الرسالة: %{base_url}%{url}
-    user_invited_to_topic:
-      text_body_template: |2
-
-        %{username} دعوتك للنقاش
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        الرجاء زيارة هذا الرابط لعرض الرسالة: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
@@ -1816,11 +1775,6 @@ ar:
 
         انقر على الرابط التالي لاختيار كلمة مرور لحسابك الجديد:
         %{base_url}/users/password-reset/%{email_token}
-    authorize_email:
-      subject_template: "[%{site_name}] تأكيد البريد الإلكتروني الجديد "
-      text_body_template: |
-        قم بتاكيد عنوان بريدك الالكتروني لـ  %{site_name}  عن طريق الضغط علي الرابط التالي:
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "قد وافقت على %{site_name}!"
       text_body_template: |
@@ -2046,59 +2000,6 @@ ar:
   privacy_topic:
     title: "سياسة الخصوصية"
     body: "<a name=\"collect\"></a>\n\n## [ما هي البيانات التي نقوم بجمعها؟](#جمع)\n\nنحن نجمع معلومات عنك عندما تسجل في موقعنا، وعندما تشارك في المنتدى عن طريق القراءة أو الكتابة، ونقوم بتقييم ما تم مشاركته هنا .\n\n\nيمكنك زيارة موقعنا بدون تسجيل، ولكن عند التسجيل في موقعنا، سيطلب منك ادخال اسمك وعنوان بريدك الالكتروني، وسيتم التحقق من بريدك الالكتروني بإرسال رسالة الى بريدك الالكتروني تحتوي على رابط خاص، عند الضغط على هذا الرابط، نحن سنعرف أنك مالك البريد الالكتروني المتحكم فيه.\n\nعندما تقوم بالتسجيل في موقعنا والنشر، سنقوم بتسجيل عنوان IP الذي نشرت منه، أيضا قد تحتفظ سجلات الخادم عناوين IP جميع الطلبات من الخادم.\n\n<a name=\"use\"></a>\n\n## [في ماذا نستخدم المعلومات الخاصة بك؟](#استخدام)\n\nيمكننا استخدام المعلومات التي نجمعها عنك بإحدى الطرق التالية:\n\n*  لتخصيص تجربتك و mdahs؛ المعلومات الخاصة بك تساعدنا على الاستجابة بشكل أفضل لاحتياجاتك الفردية.\n* لتحسين موقعنا و mdash ؛ نسعى باستمرار لتحسين ما يعرضه الموقع استنادًا الى المعلومات والتغذية الراجعة - الملاحظات - التي نتلقاها منك.\n* لتحسين خدمة العملاء و mdash ؛ المعلومات الخاصة بك تساعدنا على الاستجابة بشكل أكثر فعالية لطلبات الدعم وخدمة العملاء.\n* لإرسال رسائل البريد الالكتروني الدورية و mdash ؛ سنستخدم عنوان البريد الالكتروني الذي وفرته لنا لإرسال معلومات إليك، الاشعارات التي تطلبها حول التحديثات في المواضيع، أو الاستجابة لاسم المستخدم الخاص بك، كالرد على الاستفسارات، او الطلبات أو اسئلة اخرى.\n\n<a name=\"protect\"></a>\n\n## [كيف نقوم بحماية معلوماتك ؟](#حماية)\n\nنقوم بتطبيق مجموعة من الإجراءات الأمنية للمحافظة على أمن وسلامة معلوماتك الشخصية، عندما تقوم بإرسال أو إدخال أو الدخول لمعلوماتك الشخصية.\n\n<a name=\"data-retention\"></a>\n\n## [ما هي سياسة الاحتفاظ بالبيانات الخاصة بك ؟](#الاحتفاظ-بالبيانات)\n\nسوف نبذل جهونا بإخلاص للتالي :\n\n* الاحتفاظ بسجلات عناوين IP لجميع الطلبات لهذا الخادم لمدة لا تزيد عن 90 يومًا.\n* الاحتفاظ بعناوين IP الخاصة بالمستخدمين المسجلين ومنشوراتهم لمدة لا تزيد عن 5 سنوات.\n\n<a name=\"cookies\"></a>\n\n## [هل نستخدم الكعكات - cookies - ملفات تعريف الارتباط ؟ ](#كعكات)\n\nنعم، الكعكات هي عبارة عن ملفات صغيرة يقوم الموقع أو مزود الخدمة بنقلها الى القرص الصلب لحاسبك من خلال متصفحك (اذا سمحتم بذلك)، هذه الكعكات تعرف الموقع على متصفحك، فن كان لديك حساب مسجل، سيتم ربطه مع حسابك.\n\nنحن نستخدم ملفات تعريف الارتباط - cookies - لفهم وحفظ التفضيلات الخاصة بك للزيارات في المستقبل، وجمع البيانات العامة حول حركة المرور والتفاعل في الموقع حتى نتمكن من تقديم تجربة وأدوات افضل في المستقبل، نحن قد نتعاقد مع مقدمي خدمات من الطرف الثالث لمساعدتنا في تحسين فهمنا لزوار الموقع، مقدمي الخدمات لا يسمح لهم بإستخدام المعلومات التي تم جمعها نيابة عنا، إلّا لمساعدتنا في سلوكنا وتحسين أعمالنا.\n\n<a name=\"disclose\"></a>\n\n## [هل نقوم بالإفصاح عن أي معلومات لأطراف خارجية؟](#إفصاح)\n\nنحن لا نبيع، ولا نتاجر أو ننقل المعلومات الشخصية الى أطراف خارجية. وهذا لا يشمل الطرف الخاجية الموثوق بها والتي تساعد في تشغيل موقعنا، واجراء أعمالنا، أو تقديم الخدمات لكم، طالما أن تلك الأطراف موافقة للحفاظ على سرية المعلومات، يجوز لنا الافراج عن معوماتك الشخصية عندما نرى أنه هو المناسب للإمتثال للقانون، مع فرض سياسة موقعنا، أو حماية حقوقنا أو حقوق الآخرين، أو حقوق الملكية، أو السلامة. ومع ذلك، يمكننا تقديم معلومات الزائرين دون تحديد الهوية، الى أطراف أخرى للتسويق والاعلان، أو غيرها من الاستخدامات.\n\n<a name=\"third-party\"></a>\n\n## [روابط الطرف الثالث](#الطرف-الثالث)\n\nأحيانًا، نفترض، أنه عند وجود مواقع طرف ثالث تقجم خدمات أو منتجات على موقعنا، كان لدى مواقع الطرف الثالث هذه، سياسات خصوصية منفصلة ومستقلة، لن يكون لدينا أية مسؤولية عن محتوى وأنشطة هذه المواقع المرتبطة، ومع ذلك، نحن نسعى إلى حماية موقعنا وسلامته، ونرحب بأي ملاحظات حول هذه المواقع. \n\n<a name=\"coppa\"></a>\n\n## [الالتزام بقانون حماية خصوصية الأطفال على الانترنت ](#coppa)\n\nموقعنا والمنتجات والخدمات موجهه للأشخاص اللذين لا تقل أعمارهم عن 13 سنة، إذا كان هذا الخادم في الولايات المتحدة الأمريكية، من شروط COPPA\n ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act))\nعدم استخدم هذا الموقع.\n\n<a name=\"online\"></a>\n\n## [سياسة الخصوصية على الانترنت](#متصل)\n\nتنطبق سياسة الخصوصية على الانترنت فقط على المعلومات التي يتم جمعها من خلال موقعنا، ولاتنطبق على المعلومات التي يتم جمعها أثناء عدم الاتصال.\n\n<a name=\"consent\"></a>\n\n## [الموافقة](#الموافقة)\n\nبإستخدام موقعنا، أنت توافق على سياسة الخصوصية لموقعنا.\n\n<a name=\"changes\"></a>\n\n## [تغييرات على سياسة الخصوصية](#تغييرات)\n\nإذا قمنا بتغيير سياسة الخصوصية، سوف نقوم بنشر هذه التغييرات في هذه الصفحة.\n\nهذه الوثيقة هي نسخة من CC-BY-SA تم تحديثها في 31 مايو عام 2013م .\n"
-  badges:
-    long_descriptions:
-      autobiographer: |
-        منحت هذه الشارة لتعبئتك <a href="/my/preferences"> صفحة المستخدم الشخصية </a> واختيار صورة شخصية. السماح للمجتمع معرفة المزيد حولك وماذاترغب يجعل المجتمع أكثر ارتباطاً
-      first_like: |
-        منحت هذه الشارة لك لإعجابك للمرة الأولى بالمشاركة بواسطة :heart: button. الإعجاب بالمشاركات وسيلة رائعة تسمح لرفاقك في المجتمع معرفة أن المشاركة كانت مثيرة للاهتمام ومفيدة وجيدة، أو ممتعة. شارك ما يعجبك!
-      first_link: |
-        منحت لك هذه الشارة لأنك قمت أول مرة بوضع رابط لموضوع آخر في الردود. المواضيع المترابطة تساعد القراء المتابعين على إيجاد المواضيع المتعلقة بحوارهم ، ويظهر الصلة بين المواضيع.
-      first_quote: |+
-        منحت هذه الشارة لإقتباسك المرة الأولى منشورًا في ردك. نقلًا عن الأجزاء ذات الصلة من المنشورات السابقة في ردودك يساعد على إبقاء المناقشات مرتكزة وحول موضوع المنشور.
-
-      first_share: |
-        منحت هذه الشارة لمشاركتك لأول مرة رابط الرد أو المنشور باستعمال زر المشاركة. مشاركة الروابط وسيلة رائعة لإظهار النقاشات المهمة للآخرين وتنمية المجتمع الخاص بك.
-      read_guidelines: |
-        منحت هذه الشارة لأنك قرأت <a href="/guidelines"> مبادئ و توجيهات المجتمع </a>. اتباع هذه المبادئ والتوجيهات البسيطة تساعد على بناء مجتمع آمن وممتع دائمًا.
-      reader: |
-        منحت هذه الشارة لقراءتك موضوع طويل. القراءة أمر اساسي، القراءة عن كثب تساعدك على متابعة الحوار و كتابة ردود أفضل ومتكاملة.
-      editor: |
-        منحت هذه الشارة لتحريرك مشاركتك، لا تترد في تحرير مشاركاتك في أي وقت لتحسينها، وإصلاح الأخطاء الصغيرة، أو إضافة شئ نسيته.
-      first_flag: |
-        منحت هذه الشارة لتبليغك عن منشور، و التبليغ ذو أهمية بالغة لصحة مجتمعك، اذا لاحظت أي منشور يتطلب متابعة المشرف رجاءًا لا تتردد في الابلاغ عنه
-        يمكنك أيضًا استخدام مربع الابلاغ لإرسال  <b>رسالة </b> الى المستخدمين الآخرين.
-      nice_share: |
-        منحت هذه الشارة لزيارة 25 شخصاً لرابط المشاركة الذي نشرته، عمل رائع ! مشاركة روابط النقاشات المثيرة للاهتمام مع أصدقاءك وسيلة ممتازة لتنمية مجتمعنا.
-      welcome: |
-        منحت هذه الشارة لأنك تلقيت علامة الإعجاب الأولى على منشورك، لقد وجد رفاقك أن منشورك مثيرٌ للاهتمام وممتعا، أو مفيدًا !
-      anniversary: |
-        منحت هذه الشارة لأنك كنت عضوًا لمدة سنة، لقد نشرت منشورًا واحدًا على الأقل في هذه السنة. شكرًا لمساهمتك في مجتمعنا !
-      good_share: |
-        منحت هذه الشارة لمشاركتك رابط المنشور الذي زاره 300 زائر، نجاح باهر! لقد عرضت نقاشًا مهما لـ<i>الكثير</i> من الأشخاص الجدد وساعدت على تنمية مجتمعنا.
-      great_share: |
-        منحت هذه الشارة لمشاركتك رابط المنشور الذي زاره 100زائر، عمل رائع! لقد شجعت على مناقشة مهمة لجمهور جديد ضخم لهذا المجتمع وساعدت على تنميته بشكل كبير.
-      nice_post: |
-        هذه الشارة تمنح لوجود رد حصل على 10 إعجابات. عمل جميل!
-      nice_topic: |
-        هذه الشارة تمنح لوجود رد حصل على 10 إعجابات. عمل جميل!
-      good_post: |
-        هذه الشارة تمنح لوجود رد حصل على 25 إعجاب. عمل جيد!
-      good_topic: |
-        هذه الشارة تمنح لوجود رد حصل على 25 إعجاب. عمل جيد!
-      great_post: |
-        هذه الشارة تمنح لوجود رد حصل على 50 إعجاب. ياللعجب!
-      great_topic: |
-        هذه الشارة تمنح لوجود رد حصل على 50 إعجاب. ياللعجب!
-      basic: |
-        منحت هذه الشارة لأنك وصلت مستوى الثقة الأول 1 ، شكرًا لتعليقاتك وقراءتك عدد من المواضيع لتتعرف على مجتمعنا، وقد تم رفع جميع قيود المستخدم الجديد عنك، و مُنحت الامكانيات الأسياسة في المجتمع، مثل الرسائل الشخصية، و الإبلاغ، و تحرير الويكي والقدرة على نشر الصور والروابط المتعددة.
-      member: |
-        منحت هذه الشارة لأنك وصلت مستوى الثقة الثاني 2، شكرًا لمشاركتك لأسابيع منذ انضمامك لمجتعنا، يمكنك الآن إرسال دعوات للأعضاء من صفحتك الشخصية أو من المواضيع، إنشاء مجموعة الرسائل، وإعطاء علامات إعجاب أكثر في اليوم الواحد.
-      regular: |+
-        يتم منح هذه الشارة عندما تصل لمستوى الثقة 3. شكرا لكونك جزءا منضبطاً من مجتمعنا على مدى أشهر، أحد القراء الأكثر نشاطا ومساهمة معتمدا، لما يجعل هذا المجتمع عظيم. يمكنك الآن إعادة تصنيف وإعادة تسمية الموضوعات، والوصول إلى الاستراحة الخاصة وأقدر على الإعلام بالبريد المزعج، وغيرها كثير من الإعجابات لكل يوم.
-
-      leader: |
-        هذه الشارة تمنح لك عندما تصل للمرحلة 4. أنت قائد في هذا المجتمع مرشح من الطاقم كمثال جيد في المجتمع في أقوالك وأفعالك. لديك القدرة على تعديل كل المشاركات، إدارة المواضيع بالتثبيت والإغلاق والتقسيم والدمج والأرشفة والعديد من الإعجابات كل يوم.
   admin_login:
     success: "البريد أُرسل"
     error: "خطأ!"
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 4f4d692b35..dab422bd42 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -542,15 +542,9 @@ bs_BA:
     tl2_requires_likes_received: "How many likes a user must receive before promotion to trust level 2."
     tl2_requires_likes_given: "How many likes a user must cast before promotion to trust level 2."
     tl2_requires_topic_reply_count: "How many topics user must reply to before promotion to trust level 2."
-    tl3_requires_topics_replied_to: "Minimum number of topics a user needs to have replied to in the last 100 days to qualify for promotion to trust level 3. (0 or higher)"
-    tl3_requires_topics_viewed: "The percentage of topics created in the last 100 days that a user needs to have viewed to qualify for promotion to trust level 3. (0 to 100)"
-    tl3_requires_posts_read: "The percentage of posts created in the last 100 days that a user needs to have viewed to qualify for promotion to trust level 3. (0 to 100)"
     tl3_requires_topics_viewed_all_time: "The minimum total number of topics a user must have viewed to qualify for trust level 3."
     tl3_requires_posts_read_all_time: "The minimum total number of posts a user must have read to qualify for trust level 3."
-    tl3_requires_max_flagged: "User must not have had more than x posts flagged by x different users in the last 100 days to qualify for promotion to trust level 3, where x is this setting's value. (0 or higher)"
     tl3_promotion_min_duration: "The minimum number of days that a promotion to trust level 3 lasts before a user can be demoted back to trust level 2."
-    tl3_requires_likes_given: "The minimum number of likes that must be given in the last 100 days to qualify for promotion to trust level 3."
-    tl3_requires_likes_received: "The minimum number of likes that must be received in the last 100 days to qualify for promotion to trust level 3."
     tl3_links_no_follow: "Do not remove rel=nofollow from links posted by trust level 3 users."
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     min_trust_to_edit_wiki_post: "The minimum trust level required to edit post marked as wiki."
@@ -761,56 +755,10 @@ bs_BA:
     subject_template: "Set password for your %{site_name} account"
   test_mailer:
     subject_template: "[%{site_name}] Email Deliverability Test"
-    text_body_template: |
-      This is a test email from
-
-      [**%{base_url}**][0]
-
-      Email deliverability is complicated. Here are a few important things you should check first:
-
-      - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**.
-
-      - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. in Gmail, it is the "show original" option in the drop-down menu at the top right of each mail.
-
-      - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered.
-
-      - Is your domain's [SPF record][8] correct? [Test your SPF record][1] here. Note that TXT is the correct official record type for SPF.
-
-      - Is your domain's [DKIM record][3] correct? This will significantly improve email deliverability. [Test your DKIM record][7] here.
-
-      - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services.
-
-      (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!)
-
-      We hope you received this email deliverability test OK!
-
-      Good luck,
-
-      Your friends at [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [5]: %{base_url}/unsubscribe
-      [7]: http://dkimcore.org/tools/dkimrecordcheck.html
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [md]: http://mandrill.com
-      [mg]: http://www.mailgun.com/
-      [mj]: http://www.mailjet.com/pricing
-
-      ----
-
-      <small>There should be an unsubscribe footer on every email you send, so let's mock one up. This email was sent by Name of Company, 55 Main Street, Anytown, USA 12345. If you would like to opt out of future emails, [click here to unsubscribe][5].</small>
   new_version_mailer:
     subject_template: "[%{site_name}] New Discourse version, update available"
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] update available"
-  flags_reminder:
-    please_review: "Please review them."
-    post_number: "post"
-    how_to_disable: 'Disable this email by changing the <pre>notify_about_flags_after</pre> setting to 0.'
   flag_reasons:
     off_topic: "Your post was flagged as **off-topic**: the community thinks it does not fit into the topic, as currently defined by the title and the first post."
     inappropriate: "Your post was flagged as **inappropriate**: the community thinks it is offensive, abusive, or a violation of [the community guidelines](/guidelines)."
@@ -942,12 +890,6 @@ bs_BA:
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Account blocked"
-      text_body_template: |
-        Hello,
-
-        This is an automated message from %{site_name} to inform you that your account has been blocked by a staff member.
-
-        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "New user %{username} blocked due to community flags"
     spam_post_blocked:
@@ -978,10 +920,6 @@ bs_BA:
     posted_by: "Odgovoreno %{username} dana %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} invited you to a private message '%{topic_title}'"
-      text_body_template: |
-        %{username} invited you to a private message '%{topic_title}' on %{site_name}:
-
-        Please visit this link to view the topic: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
     user_quoted:
@@ -1029,12 +967,6 @@ bs_BA:
 
         Kliknite na link ispod da kreirate šifru za vaš nalog:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Potvrdite vaš novi email"
-      text_body_template: |
-        Confirm your new email address for %{site_name} by clicking on the following link:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
       text_body_template: |
@@ -1061,7 +993,6 @@ bs_BA:
 
         Ako link iznad ne može da se klikne onda ga kopirajte i ubacite u vaš internet pretraživač.
   page_not_found:
-    title: "Strana koju tražite je nepostojeća ili privatna."
     popular_topics: "Popularne"
     recent_topics: "Nove"
     see_more: "Više"
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 44cacdfe13..ab1be99c65 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -739,34 +739,6 @@ cs:
     posted_by: "Zaslal uživatel %{username} dne %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} Vás pozval do konverzace '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} Vás pozval do konverzace
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        na
-
-        > %{site_title} -- %{site_description}
-
-        Prosíme klikněte na tento odkaz pro zobrazení konverzace: %{base_url}%{url}
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} Vás pozval do tématu '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} Vás pozval do konverzace
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        na
-
-        > %{site_title} -- %{site_description}
-
-        Prosíme klikněte na tento odkaz pro zobrazení konverzace: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{username} vás citoval v '%{topic_title}'"
     user_quoted:
@@ -805,12 +777,6 @@ cs:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Přihlášení"
-    confirm_new_email:
-      subject_template: "[%{site_name}] Potvrďte vaši novou emailovou adresu"
-      text_body_template: |
-        Potvrďte vaši novou emailovou adresu pro %{site_name} kliknutím na následující odkaz:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Byli jste schváleni na %{site_name}!"
     signup:
@@ -822,7 +788,6 @@ cs:
 
         Pokud tento odkaz nefunguje, zkuste ho zkopírovat a vložit přes schránku do adresního řádku vaše webového prohlížeče.
   page_not_found:
-    title: "Stránka, kterou žádáte, na tomto diskuzním fóru neexistuje. Možná vám můžeme pomoci ji najít, nebo poradit jiné téma, které se vám může líbit:"
     popular_topics: "Populární"
     recent_topics: "Nedávné"
     see_more: "Více"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index ff84e1fa6c..84523ec9d8 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -236,7 +236,6 @@ da:
       uncategorized_parent: "Ukategoriserede  kan ikke have en overordnede kategori"
       self_parent: "En underkategori kan ikke være sin egen overordnede kategori."
       depth: "Du kan ikke indlejre en underkategori i en anden underkategori."
-      email_in_already_exist: "Den indgående email-adresse  '%{email_in}' bruges allerede til kategorien '%{category_name}'."
     cannot_delete:
       uncategorized: "Kan ikke slette Ukategoriseret"
       has_subcategories: "Kan ikke slette denne kategori, fordi den har under kategorier."
@@ -612,8 +611,6 @@ da:
     purge_deleted_uploads_grace_period_days: "Grace-periode (i dage) før et slettet upload bliver fjernet."
     tl2_requires_likes_received: "Hvor mange likes en bruger skal modtage inden forfremmelse til tillidsniveau 2."
     tl2_requires_likes_given: "Hvor mange likes en bruger skal give inden forfremmelse til tillidsniveau 2."
-    tl3_requires_likes_given: "Det antal likes en bruger skal have givet i de seneste 100 dage for at kvalificere sig til forfremmelse til tillidsniveau 3."
-    tl3_requires_likes_received: "Det antal likes en bruger skal have modtaget i de seneste 100 dage for at kvalificere sig til forfremmelse til tillidsniveau 3."
     min_trust_to_create_topic: "Det mindste tillidsniveau der skal til for at oprette et nyt emne."
     title_fancy_entities: "Omdan almindelige ASCII-tegn i emnetitler til fancy HTML-entities, i stil med SmartyPants http://daringfireball.net/projects/smartypants/"
     title_prettify: "Undgå hyppige tastefejl i titlen, inklusive overforbrug af store bogstaver, første bogstav med småt, gentagne ! og ?, ekstra . i slutningen, etc."
@@ -699,8 +696,6 @@ da:
     subject_template: "[%{site_name}] test af e-mail-udsendelse"
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] Opdateringer er tilgængelige"
-  flags_reminder:
-    post_number: "indlæg"
   system_messages:
     post_hidden:
       subject_template: "Indlæg skjult på grund af feedback fra brugerne"
@@ -780,12 +775,6 @@ da:
         %{base_url}/users/password-reset/%{email_token}
     account_created:
       subject_template: "[%{site_name}] Din nye konto"
-    confirm_new_email:
-      subject_template: "[%{site_name}] Bekræft din nye e-mail-adresse"
-      text_body_template: |
-        Bekræft din nye e-mail-adresse på %{site_name} ved at klikke på følgende link:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Du er blevet godkendt på %{site_name}!"
     signup:
@@ -798,7 +787,6 @@ da:
 
         Hvis linket ikke virker, så prøv at kopiere hele linket ind i adressefeltet på din web browser.
   page_not_found:
-    title: "Den side du efterspurgte findes ikke. Måske kan vi hjælpe dig med at finde den, eller et andet lignende emne:"
     popular_topics: "Populære"
     recent_topics: "Nye"
     see_more: "Flere"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 100250b1f3..2def1aecd0 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -30,6 +30,20 @@ de:
   emails:
     incoming:
       default_subject: "Eingehende E-Mail von %{email}"
+      show_trimmed_content: "Zeige gekürzten Inhalt"
+      errors:
+        empty_email_error: "Passiert wenn die empfangene E-Mail leer war."
+        no_message_id_error: "Passiert wenn in der E-Mail die Kopfzeile 'Message-Id' fehlt."
+        auto_generated_email_error: "Passiert wenn die Kopfzeile 'precedence' folgendes enthält: list, junk, bulk oder auto_reply, oder eine der anderen Kopfzeilen enthält: auto-submitted, auto-replied oder auto-generated."
+        no_body_detected_error: "Passiert wenn kein Inhalt extrahiert werden konnte und keine Anhänge vorhanden waren."
+        inactive_user_error: "Passiert wenn der Sender nicht aktiv ist."
+        blocked_user_error: "Passiert wenn der Sender geblockt wurde."
+        bad_destination_address: "Passiert wenn keine der E-Mail Adressen in den Feldern To/Cc/Bcc zu einer konfigurierten eingehenden E-Mail Adresse passt."
+        strangers_not_allowed_error: "Passiert wenn ein Nutzer versuchte ein neues Thema in einer Kategorie ohne Mitgliedschaft zu erstellen."
+        insufficient_trust_level_error: "Passiert wenn ein Nutzer versuchte ein neues Thema in einer Kategorie zu erstellen, ohne die erforderliche Vertrauensstufe dafür zu haben."
+        reply_user_not_matching_error: "Passiert wenn die Adresse der Antwort E-Mail von der Adresse abweicht, an die gesendet wurde."
+        topic_not_found_error: "Passiert wenn eine Antwort eintraf aber das verbundene Thema gelöscht wurde."
+        topic_closed_error: "Passiert wenn eine Antwort eintraf aber das verbundene Thema geschlossen wurde."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -153,8 +167,12 @@ de:
   rss_description:
     latest: "Aktuelle Themen"
     hot: "Beliebte Themen"
+    top: "Die besten Themen"
     posts: "Letzte Beiträge"
+    private_posts: "Neueste private Nachricht"
+    group_posts: "Letzte Beiträge von %(Gruppen_name)"
   too_late_to_edit: "Dieser Beitrag wurde vor zu langer Zeit erstellt. Er kann nicht mehr bearbeitet oder gelöscht werden."
+  revert_version_same: "Die aktuelle Version entspricht der Version, zu der du zurückkehren möchtest."
   excerpt_image: "Bild"
   queue:
     delete_reason: "Aus der Moderations-Warteschlange für Beiträge gelöscht"
@@ -163,7 +181,9 @@ de:
       can_not_modify_automatic: "Du kannst eine automatisch verwaltete Gruppe nicht verändern."
       member_already_exist: "'%{username}' ist bereits Mitglied dieser Gruppe."
       invalid_domain: "'%{domain}' ist keine gültige Domain."
-      invalid_incoming_email: "'%{incoming_email}' ist keine gültige E-Mail-Adresse."
+      invalid_incoming_email: "'%{email}' ist keine gültige E-Mail Adresse."
+      email_already_used_in_group: "'%{email}' wird bereits von der Gruppe '%{group_name}' verwendet."
+      email_already_used_in_category: "'%{email}' wird bereits von der Kategorie '%{category_name}' verwendet."
     default_names:
       everyone: "jeder"
       admins: "admins"
@@ -283,7 +303,9 @@ de:
       uncategorized_parent: "Die \"unkategorisiert\" Kategorie kann keine Elternkategorie haben."
       self_parent: "Eine Kategorie kann nicht sich selbst untergeordnet werden."
       depth: "Unterkategorien können nicht ineinander verschachtelt werden."
-      email_in_already_exist: "Die E-Mail-Adresse '%{email_in}' für eingehende Themen wird bereits von der Kategorie '%{category_name}' verwendet."
+      invalid_email_in: "'%{email}' ist keine gültige E-Mail Adresse."
+      email_already_used_in_group: "'%{email}' wird bereits von der Gruppe '%{group_name}' verwendet."
+      email_already_used_in_category: "'%{email}' wird bereits von der Kategorie '%{category_name}' verwendet."
     cannot_delete:
       uncategorized: "Die \"unkategorisiert\" Kategorie kann nicht gelöscht werden."
       has_subcategories: "Diese Kategorie kann nicht gelöscht werden, weil sie Unterkategorien besitzt."
@@ -867,17 +889,9 @@ de:
     tl2_requires_likes_received: "Die Anzahl der Likes, die ein Benutzer erhalten muss, bevor er in die Vertrauensstufe 2 befördert wird."
     tl2_requires_likes_given: "Die Anzahl der Likes, die ein Benutzer vergeben muss, bevor er in die Vertrauensstufe 2 befördert wird."
     tl2_requires_topic_reply_count: "Die Anzahl der Beiträge, auf die ein Benutzer antworten muss, bevor er in die Vertrauensstufe 2 befördert wird."
-    tl3_time_period: "Zeitraum für die Bedingungen für Vertrauensstufe 3"
-    tl3_requires_days_visited: "Minimale Anzahl an Tagen, an denen der Nutzer die Seite besuchen haben muss, in den letzten 100 Tagen, um sich für eine Beförderung zu Vertrauenslevel 3 zu qualifizieren. Setze tl3 höher als die Zeitperiode um Beförderungen zu Vertrauenslevel 3 zu deaktivieren. (0 oder höher)"
-    tl3_requires_topics_replied_to: "Die Mindestanzahl an Themen, auf die ein Benutzer in den letzten 100 Tagen geantwortet haben muss, um die Vertrauensstufe 3 erreichen zu können. (0 oder mehr)"
-    tl3_requires_topics_viewed: "Prozentualer Anteil aller Themen der letzten 100 Tage, die ein Nutzer mindestens gelesen haben muss, um die Vertrauensstufe Anführer (3) erreichen zu können. (0 bis 100)"
-    tl3_requires_posts_read: "Prozentualer Anteil aller Beiträge der letzten 100 Tage, die ein Nutzer mindestens gelesen haben muss, um die Vertrauensstufe Anführer (3) erreichen zu können. (0 bis 100)"
     tl3_requires_topics_viewed_all_time: "Mindestanzahl Themen, die ein Nutzer gelesen haben muss, um die Vertrauensstufe Anführer (3) erreichen zu können."
     tl3_requires_posts_read_all_time: "Mindestanzahl Beiträge, die ein Nutzer gelesen haben muss, um die Vertrauensstufe Anführer (3) erreichen zu können."
-    tl3_requires_max_flagged: "Um die Vertrauensstufe 3 erhalten zu können dürfen in den letzten 100 Tagen höchstens X Beiträge eines Nutzers von X verschiedenen anderen Nutzern gemeldet worden sein, wobei X diesem Wert entspricht. (0 oder mehr)"
     tl3_promotion_min_duration: "Mindestanzahl an Tagen, die ein Benutzer auf Vertrauensstufe 3 beförderter Nutzer auf dieser Stufe verbleibt, bevor er automatisch wieder auf Vertrauensstufe 2 heruntergestuft werden kann."
-    tl3_requires_likes_given: "Die Mindestanzahl an \"Likes\" die Sie in den letzten 100 Tagen gegeben haben müssen um für Vertrauenslevel 3 zu qualifizieren."
-    tl3_requires_likes_received: "Die Mindestanzahl an \"Likes\" die Sie in den letzten 100 Tagen erhalten haben müssen um für Vertrauenslevel 3 zu qualifizieren."
     tl3_links_no_follow: "rel=nofollow nicht von Links entfernen, die von Benutzern mit Vertrauensstufe 3 erstellt wurden."
     min_trust_to_create_topic: "Die minimale Vertrauensstufe wird benötigt um eine neues Thema zu erstellen."
     min_trust_to_edit_wiki_post: "Die minimal benötigte Vertrauensstufe, um als Wiki markierte Beiträge bearbeiten zu können."
@@ -892,7 +906,6 @@ de:
     max_users_notified_per_group_mention: "Maximale Anzahl an Nutzern die benachrichtigt werden wenn eine Gruppe erwähnt wird (wird die Grenze erreicht, werden keine Nutzer benachrichtigt)"
     create_thumbnails: "Erzeuge ein Vorschaubild und eine Lightbox für Bilder, die zu groß sind, um in einem Beitrag angezeigt zu werden."
     email_time_window_mins: "Warte (n) Minuten, bevor Nutzern eine Hinweis-E-Mail geschickt wird, um ihnen Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können."
-    private_email_time_window_seconds: "Warte (n) Sekunden, bevor irgendwelche private E-Mail Benachrichtigungen gesendet werden, um den Nutzer die Möglichkeit zu geben, den Beitrag zu bearbeiten und finalisieren."
     email_posts_context: "Anzahl der Antworten welche als Konext einer Notifikations-Mail hinzugefügt werden."
     flush_timings_secs: "Sekunden, nach denen Zeiteinstellungen auf den Server übertragen werden."
     title_max_word_length: "Maximal erlaubte Wortlänge in Thementiteln, in Zeichen."
@@ -994,7 +1007,6 @@ de:
     disable_avatar_education_message: "Weise Benutzer nicht darauf hin, dass sie ihren Avatar ändern können"
     daily_performance_report: "Analysiere die NGINX-Logs täglich. Poste anschließend eine Zusammenfassung als Beitrag, welcher nur für Moderatoren oder Administratoren zugänglich ist."
     suppress_uncategorized_badge: "Zeige kein Abzeichen für unkategorisierte Themen in der Themenliste."
-    permalink_normalizations: "Wende den folgenden regulären Ausdruck an, bevor Permanentlinks überprüft werden, beispielsweise wird /(\\/topic.*)\\?.*/\\1 Query Strings aus Themen-Routen entfernen. Format: RegEx+String, benutze \\1 usw. um auf Gruppierungen zuzugreifen."
     global_notice: "Zeigt allen Besuchern eine DRINGENDE NOTFALL-NACHRICHT als global sichtbares Banner an. Deaktiviert bei leerer Nachricht. (HTML ist erlaubt.)"
     disable_edit_notifications: "Unterdrückt Bearbeitungshinweise durch den System-Nutzer, wenn die 'download_remote_images_to_local' Einstellung aktiviert ist."
     automatically_unpin_topics: "Themen automatisch loslösen, wenn ein Nutzer das Ende erreicht."
@@ -1028,7 +1040,6 @@ de:
     enable_emoji: "Aktiviere emoji"
     emoji_set: "Wie magst du dein emoji?"
     enforce_square_emoji: "Emojis immer mit quadratischem Seitenverhältnis darstellen."
-    approve_post_count: "Anzahl Beiträge eines neuen Nutzers, die genehmigt werden müssen"
     approve_unless_trust_level: "Beiträge von Nutzern unterhalb dieser Vertrauensstufe müssen genehmigt werden"
     notify_about_queued_posts_after: "Wenn es Beiträge gibt, welche seit mehreren Stunden auf Ihre Freischaltung warten, sende eine E-Mail an die Kontaktemailadresse. Setze diesen Wert auf 0 um das zu deaktivieren."
     default_email_digest_frequency: "Lege fest, wie oft die Benutzer eine Zusammenfassung per E-Mail erhalten."
@@ -1085,11 +1096,6 @@ de:
       category: 'Kategorien'
       topic: 'Ergebnisse'
       user: 'Benutzer'
-  sso:
-    not_found: "Konto kann nicht gefunden oder erstellt werden, kontaktiere den Administrator."
-    account_not_approved: "Das Konto wartet auf seine Überprüfung. Du bekommst eine E-Mail Benachrichtigung, wenn es überprüft wurde."
-    unknown_error: "Die Informationen konnten nicht aktualisiert werden, kontaktiere den Administrator."
-    timeout_expired: "Zeitüberschreitung beim Login. Bitte versuche dich erneut einzuloggen."
   original_poster: "Autor des ersten Beitrags"
   most_posts: "Autor der meisten Beiträge"
   most_recent_poster: "Autor des jüngsten Beitrags"
@@ -1379,12 +1385,6 @@ de:
         Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert.
 
         Deine Antwort wurde von einer anderen E-Mail-Adresse versandt als wir erwartet haben, weshalb wir nicht sicher wissen ob das die gleiche Person ist. Probiere eine andere Absenderadresse oder wende dich an einen Mitarbeiter.
-    email_reject_no_message_id:
-      subject_template: "[%{site_name}] E-Mail-Problem -- Keine Message-Id"
-      text_body_template: |
-        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert.
-
-        Wir konnten keinen `Message-Id`-Header in der E-Mail finden. Probiere eine andere Absenderadresse oder wende dich an einen Mitarbeiter.
     email_reject_no_account:
       subject_template: "[%{site_name}] E-Mail-Problem -- Unbekanntes Konto"
       text_body_template: |
@@ -1451,12 +1451,6 @@ de:
         Weitere Hilfe findest du in unserer [Richtlinien](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Benutzerkonto gesperrt"
-      text_body_template: |
-        Hallo,
-
-        dies ist eine automatisch erzeugte Nachricht von %{site_name}, um dich darüber zu informieren, dass dein Benutzerkonto durch einen Mitarbeiter gesperrt wurde.
-
-        Weitere Informationen hierzu findest du in unseren [Richtlinien](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "Neuer Benutzer %{username} wegen Gemeinschaftsrichtlinien blockiert."
     spam_post_blocked:
@@ -1490,33 +1484,6 @@ de:
     posted_by: "Erstellt von %{username} am %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} hat dich zur Unterhaltung '%{topic_title}' eingeladen"
-      text_body_template: |2
-
-        %{username} hat dich zur Unterhaltung
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        bei
-
-        > %{site_title} -- %{site_description}
-
-        eingeladen. Bitte besuche diesen Link um die Unterhaltung zu lesen: %{base_url}%{url}
-    user_invited_to_topic:
-      text_body_template: |2
-
-        %{username} hat dich zum Thema
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        bei
-
-        > %{site_title} -- %{site_description}
-
-        eingeladen. Bitte besuche diesen Link um das Thema zu lesen: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{username} hat auf deinen Beitrag '%{topic_title}' geantwortet"
     user_quoted:
@@ -1573,12 +1540,6 @@ de:
 
         Klicke auf den folgenden Link, um ein Passwort für dein neues Konto festzulegen:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Bestätige deine neue Mailadresse"
-      text_body_template: |
-        Um deine Mailadresse auf %{site_name} zu bestätigen, klicke auf den folgenden Link:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
       text_body_template: |
@@ -1669,55 +1630,6 @@ de:
     title: "Nutzungsbedingungen"
   privacy_topic:
     title: "Datenschutzrichtlinie"
-  badges:
-    long_descriptions:
-      autobiographer: |
-        Dieses Abzeichen erhältst du für das Ausfüllen von deinem <a href="/my/preferences">Benutzerprofil</a> und für das Hochladen eines Profilbildes erhalten. Die Community mehr über dich wissen zu lassen, und mehr darüber wissen zu lassen, was du gerne tust, macht die gesamte Community besser.
-      first_like: |
-        Dieses Abzeichen erhältst du, wenn du das erste mal auf den :heart: Knopf unter einem Beitrag klickst. Beiträge zu liken ist eine tolle Art dem Beitragsersteller zu zeigen, dass sein Beitrag interessant, nützlich, cool oder witzig war. Share the love!
-      first_link: |
-        Dieses Abzeichen erhältst du, sobald du das erste mal einen Link zu einem anderen Beitrag in eine Antwort schreibst. Bestehende Beiträge zu verlinken hilft den anderen Nutzern dabei, bereits geklärte oder relevante Fragen zu finden.
-      first_quote: |
-        Dieses Abzeichen erhältst du, sobald du das erste mal ein Zitat in einer Antwort verwendest. Relevante Bereiche zu zitieren und diese in deiner Antwort zu erwähnen hilft allen bei der Übersichtlichkeit.
-      first_share: |
-        Dieses Abzeichen erhältst du, sobald du das erste mal einen Link mit anderen über den "Teilen"-Button teilst. Links zu teilen ist eine tolle Möglichkeit andere auf interessante Diskussionen hinzuweisen und die Community zu vergrößern.
-      read_guidelines: |
-        Dieses Abzeichen erhältst du, sobald du die <a href="/guidelines">Regeln</a> gelesen hast. Teilen der Regeln hilft allen für einen sicheren, witzigen und nachhaltigen Umgang miteinander.
-      reader: |
-        Dieses Abzeichen erhältst du, sobald du einen sehr langen Beitrag gelesen hast. Beiträge ausführlich zu lesen hilft der gesamten Konversation und führt zu besseren, vollständigeren Antworten.
-      editor: "Dieses Abzeichen erhältst du für das Bearbeiten einer deiner Beiträge. Zögere nicht, deine Beiträge so lange zu editieren, bis sie in deinen Augen perfekt sind. \n"
-      first_flag: |
-        Dieses Abzeichen wird verliehen, wenn ein Beitrag gemeldet wird. Wenn du einen Beitrag siehst den ein Moderator prüfen sollte, zögere bitte nicht, ihn zu melden. Mit dem Melden-Dialog kannst du auch <b>Nachrichten</b> an andere Nutzer senden.
-      nice_share: |
-        Dieses Abzeichen wird für das Teilen eines Links zu einem Beitrag verliehen, dem 25 externe Besucher folgen. Großartig! Links zu interessanten Diskussionen mit deinen Freunden zu teilen ist ein exzellenter Weg, unsere Community wachsen zu lassen.
-      welcome: |
-        Dieses Abzeichen wird verliehen, wenn du den ersten Like auf einen Beitrag erhältst. Glückwunsch, du hast einen Beitrag geschrieben, den deine Mitbenutzer interessant, cool oder nützlich finden!
-      anniversary: |
-        Dieses Abzeichen wird verliehen, wenn du ein Jahr lang Mitglied warst und in diesem Jahr mindestens einen Beitrag geschrieben hast. Danke, dass du hier geblieben bist und zu unserer Community beiträgst!
-      good_share: |
-        Dieses Abzeichen wird für das Teilen eines Links zu einem Beitrag verliehen, dem 300 externe Besucher folgen. Gute Arbeit! Du hast eine interessante Diskussion <i>vielen</i> neuen Benutzern gezeigt und uns geholfen zu wachsen.
-      great_share: |
-        Dieses Abzeichen wird für das Teilen eines Links zu einem Beitrag verliehen, dem 100 externe Besucher folgen. Wow! Du hast einer interessante Diskussion zu einer großen Leserschaft verholfen und uns sehr geholfen!
-      nice_post: |
-        Dieses Abzeichen hast du erhalten, weil du eine Antwort erstellt hast, welche 10 Likes erhalten hat. Gut gemacht!
-      nice_topic: |
-        Dieses Abzeichen hast du erhalten, weil du ein Thema erstellt hast, welches 10 Likes erhalten hat. Gut gemacht!
-      good_post: |
-        Dieses Abzeichen hast du erhalten, weil du eine Antwort erstellt hast, welche 25 Likes erhalten hat. Gute Arbeit!
-      good_topic: |
-        Dieses Abzeichen hast du erhalten, weil du ein Thema erstellt hast, welches 25 Likes erhalten hat. Gute Arbeit!
-      great_post: |
-        Dieses Abzeichen hast du erhalten, weil du einen Beitrag erstellt hast, welcher 50 Likes erhalten hat. Wow!
-      great_topic: |
-        Dieses Abzeichen hast du erhalten, weil du eine Antwort erstellt hast, welche 50 Likes erhalten hat. Wow!
-      basic: |
-        Dieses Abzeichen wird verliehen wenn du Vertrauensstufe 1 erreichst. Danke dass du eine Weile dageblieben bist und ein paar Themen gelesen hast um zu lernen, worum es in unserer Community geht. Für dich gelten die Einschränkungen für neue Nutzer nicht mehr und du hast nun Zugriff auf alle wichtigen Funktionen, beispielsweise persönliche Nachrichten, die Melden-Funktion, das Bearbeiten von Wiki-Beiträgen und die Fähigkeit, Bilder und mehrere Links in Beiträgen zu verwenden.
-      member: |
-        Dieses Abzeichen wird verliehen wenn du Vertrauensstufe 2 erreichst. Danke dass du einige Wochen mitgemacht hast, um unserer Community mehr beizutreten. Du kannst nun von deiner Benutzerseite und den Themen-Seiten aus persönliche Einladungen versenden, Gruppennachrichten erstellen und ein paar mehr Likes pro Tag vergeben.
-      regular: |
-        Dieses Abzeichen wird verliehen wenn du Vertrauensstufe 3 erreicht. Danke dass du über mehrere Monate in unserer Community ein Stammgast, einer unserer aktivsten Leser und ein zuverlässiges Mitglied geworden bist, das diese Community stark macht. Du kannst nun Themen neu kategorisieren und umbenennen, auf eine private Lounge für Stammgäste zugreifen, hast mächtigere Werkzeuge um Spam zu bekämpfen und kannst viel mehr Likes pro Tag vergeben.
-      leader: |
-        Dieses Abzeichen wird verliehen wenn du Vertrauensstufe 4 erreichst. Du bist ein von den Mitarbeitern ausgezeichneter Anführer in dieser Community und hast durch deine Taten und Worte ein positives Beispiel abgegeben. Du kannst alle Beiträge bearbeiten, Moderator-Aktionen wir das Anpinnen, Schließen, Unsichtbar machen, Archivieren, Teilen und Zusammenführen von Themen durchführen und viel mehr Likes pro Tag vergeben.
   admin_login:
     success: "E-Mail gesendet"
     error: "Fehler!"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 8385c043f3..0067f05574 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -204,6 +204,9 @@ en:
     hot: "Hot topics"
     top: "Top topics"
     posts: "Latest posts"
+    private_posts: "Latest private messages"
+    group_posts: "Latest posts from %{group_name}"
+    group_mentions: "Latest mentions from %{group_name}"
   too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted."
   revert_version_same: "The current version is same as the version you are trying to revert to."
 
@@ -519,6 +522,7 @@ en:
     confirmed: "Your email has been updated."
     please_continue: "Continue to %{site_name}"
     error: "There was an error changing your email address. Perhaps the address is already in use?"
+    error_staged: "There was an error changing your email address. The address is already in use by a staged user."
     already_done: "Sorry, this confirmation link is no longer valid. Perhaps your email was already changed?"
     authorizing_old:
       title: "Thanks for confirming your current email address"
@@ -1157,6 +1161,8 @@ en:
     unsubscribe_via_email_footer: "Attach an unsubscribe link to the footer of sent emails"
 
     delete_email_logs_after_days: "Delete email logs after (N) days. 0 to keep indefinitely"
+    max_emails_per_day_per_user: "Maximum number of emails to send users per day. 0 to disable the limit"
+    enable_staged_users: "Automatically create staged users when processing incoming emails."
 
     manual_polling_enabled: "Push emails using the API for email replies."
     pop3_polling_enabled: "Poll via POP3 for email replies."
@@ -1189,6 +1195,7 @@ en:
     digest_topics: "The maximum number of topics to display in the email digest."
     digest_min_excerpt_length: "Minimum post excerpt in the email digest, in characters."
     delete_digest_email_after_days: "Suppress digest emails for users not seen on the site for more than (n) days."
+    digest_suppress_categories: "Suppress these categories from digest emails."
     disable_digest_emails: "Disable digest emails for all users."
 
     detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures."
@@ -1216,7 +1223,7 @@ en:
 
     suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists."
 
-    permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(\\/topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures"
+    permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures"
 
     global_notice: "Display an URGENT, EMERGENCY global banner notice to all visitors, change to blank to hide it (HTML allowed)."
 
@@ -1267,6 +1274,7 @@ en:
     notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact email. Set to 0 to disable these emails."
 
     default_email_digest_frequency: "How often users receive digest emails by default."
+    default_include_tl0_in_digests: "Include posts from new users in digest emails by default. Users can change this in their preferences."
     default_email_private_messages: "Send an email when someone messages the user by default."
     default_email_direct: "Send an email when someone quotes/replies to/mentions or invites the user by default."
     default_email_mailing_list_mode: "Send an email for every new post by default."
@@ -1338,10 +1346,10 @@ en:
       user: 'Users'
 
   sso:
-    not_found: "Unable to lookup or create account, contact site admin"
-    account_not_approved: "Account is pending approval, you will receive an email notification once approved"
-    unknown_error: "Error updating information, contact site admin"
-    timeout_expired: "Account login timed out, please try logging in again"
+    not_found: "Your account couldn't be found. Please contact the site's administrator."
+    account_not_approved: "Your account is pending approval. You will receive an email notification when you are approved."
+    unknown_error: "There is a problem with your account. Please contact the site's administrator."
+    timeout_expired: "Account login timed out, please try logging in again."
 
   original_poster: "Original Poster"
   most_posts: "Most Posts"
@@ -1822,6 +1830,13 @@ en:
 
         Your account does not have the required trust level to post new topics to this email address. If you believe this is in error, contact a staff member.
 
+    email_reject_user_not_found:
+      subject_template: "[%{site_name}] Email issue -- User Not Found"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        Your reply was sent from an unknown email address. Try sending from another email address, or contact a staff member.
+
     email_reject_inactive_user:
       subject_template: "[%{site_name}] Email issue -- Inactive User"
       text_body_template: |
@@ -1975,6 +1990,10 @@ en:
 
         This is an automated message from %{site_name} to inform you that your account has been blocked by a staff member.
 
+        Please be aware that you will not be able to create new replies or topics until unblocked by a staff member.
+
+        If you have questions regarding this block, please contact a [staff members](%{base_url}/about).
+
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
 
     user_automatically_blocked:
@@ -2032,6 +2051,9 @@ en:
 
   user_notifications:
     previous_discussion: "Previous Replies"
+    reached_limit:
+      one: "WARNING: you reached the limit of daily emails. Further email notifications will be suppressed."
+      other: "WARNING: you reached the limit of %{count} daily emails. Further email notifications will be suppressed."
     in_reply_to: "In Reply To"
     unsubscribe:
       title: "Unsubscribe"
@@ -2046,53 +2068,57 @@ en:
 
     posted_by: "Posted by %{username} on %{post_date}"
 
+    invited_to_private_message_body: |
+      %{username} invited you to a message
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      at
+
+      > %{site_title} -- %{site_description}
+
+    invited_to_topic_body: |
+      %{username} invited you to a discussion
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      at
+
+      > %{site_title} -- %{site_description}
+
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'"
       text_body_template: |
+        %{header_instructions}
 
-        %{username} invited you to a message
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        Please visit this link to view the message: %{base_url}%{url}
+        ---
+        %{respond_instructions}
 
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'"
       text_body_template: |
+        %{header_instructions}
 
-        %{username} invited you to a message
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        Please visit this link to view the message: %{base_url}%{url}
+        ---
+        %{respond_instructions}
 
     user_invited_to_topic:
       subject_template: "[%{site_name}] %{username} invited you to '%{topic_title}'"
       text_body_template: |
+        %{header_instructions}
 
-        %{username} invited you to a discussion
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        Please visit this link to view the message: %{base_url}%{url}
+        ---
+        %{respond_instructions}
 
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
@@ -2341,7 +2367,7 @@ en:
       size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?"
 
   avatar:
-    missing: "Sorry, but the avatar you have selected is not present on the server. Can you try uploading it again?"
+    missing: "Sorry, we can't find any avatar associated with that email address. Can you try uploading it again?"
 
   flag_reason:
     sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting."
@@ -2358,6 +2384,7 @@ en:
     post_deleted: "post was deleted by the author"
     user_suspended: "user was suspended"
     already_read: "user has already read this post"
+    exceeded_limit: "Exceeded max_emails_per_day_per_user"
     message_blank: "message is blank"
     message_to_blank: "message.to is blank"
     text_part_body_blank: "text_part.body is blank"
@@ -2721,7 +2748,7 @@ en:
         <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:single_user</code></td></tr>
         <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td><code>group:foo</code></td><td><code>badge:foo</code></td><td></td></tr>
         <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
-        <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td colspan=3></td></tr>
+        <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td><code>in:pinned</code></td><td><code>in:unpinned</code></td><td></td></tr>
         <tr><td><code>posts_count:num</code></td><td><code>before:days or date</code></td><td><code>after:days or date</code></td> <td colspan=2></td></tr>
         </table>
       </p>
@@ -2734,56 +2761,201 @@ en:
       </p>
 
   badges:
-    long_descriptions:
-      autobiographer: |
-        This badge is granted for filling out <a href="/my/preferences">your user profile</a> and selecting a profile picture. Letting the community know more about who you are and what you're interested in makes for a better, more connected community.
-      first_like: |
-        This badge is granted the first time you like a post using the :heart: button. Liking posts is a great way to let your fellow community members know that what they posted was interesting, useful, cool, or fun. Share the love!
-      first_link: |
-        This badge is granted the first time you place a link to another topic in a reply. Linking topics helps fellow readers find interesting related conversations, by showing connections between topics in both directions.
-      first_quote: |
-        This badge is granted the first time you quote a post in your reply. Quoting relevant sections of earlier posts in your reply helps keep discussions focused and on topic.
-      first_share: |
-        This badge is granted the first time you share a link to a reply or topic using the share button. Sharing links is a great way to show off interesting discussions with the rest of the world and grow your community.
-      read_guidelines: |
-        This badge is granted for <a href="/guidelines">reading the community guidelines</a>. Following and sharing these simple guidelines helps build a safe, fun, and sustainable community.
-      reader: |
-        This badge is granted for reading a long topic. Reading is fundamental. Reading closely helps you follow the conversation and leads to better, more complete replies.
-      editor: |
-        This badge is granted for editing your post. Don't hesitate to edit your posts any time to improve them, fix small mistakes, or add anything you forgot.
-      first_flag: |
-        This badge is granted for flagging a post. Flagging is critical to the health of your community. If you notice any posts that require moderator attention please
-        do not hesitate to flag. You may also use the flagging dialog to send <b>messages</b> to fellow users.
-      nice_share: |
-        This badge is granted for sharing a link to a post that's visited by 25 outside visitors. Nice job! Sharing links to interesting discussions with friends is an excellent way to grow our community.
-      welcome: |
+    editor:
+      name: Editor
+      description: First post edit
+      long_description: |
+        This badge is granted the first time you edit one of your posts. While you won't be able to edit your posts forever, editing is always a good idea — you can improve your posts, fix small mistakes, or add anything you missed when you originally posted. Edit to make your posts even better!
+    basic_user:
+      name: Basic
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Granted</a> all essential community functions
+      long_description: |
+        This badge is granted when you reach trust level 1. Thanks for sticking around a little while and reading a few topics to learn what our community is about. Your new user restrictions have been lifted; you've been granted all essential community abilities, such as personal messaging, flagging, wiki editing, and the ability to post multiple images and links.
+    member:
+      name: Member
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Granted</a> invitations, group messaging, more likes
+      long_description: |
+        This badge is granted when you reach trust level 2. Thanks for participating over a period of weeks to truly join our community. You can now send invitations from your user page or individual topics, create group personal messages, and have a few more likes per day.
+    regular:
+      name: Regular
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Granted</a> recategorize, rename, followed links, wiki, more likes
+      long_description: |
+        This badge is granted when you reach trust level 3. Thanks for being a regular part of our community over a period of months. You're now one of the most active readers, and a reliable contributor that makes our community great. You can now recategorize and rename topics, take advantage of more powerful spam flags, access a private lounge area, and you'll also get lots more likes per day.
+    leader:
+      name: Leader
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Granted</a> global edit, pin, close, archive, split and merge, more likes
+      long_description: |
+        This badge is granted when you reach trust level 4. You're a leader in this community as selected by staff, and you set a positive example for the rest of the community in your actions and words here. You have the ability to edit all posts, take common topic moderator actions such as pin, close, unlist, archive, split, and merge, and you have tons of likes per day.
+    welcome:
+      name: Welcome
+      description: Received a like
+      long_description: |
         This badge is granted when you receive your first like on a post. Congratulations, you've posted something that your fellow community members found interesting, cool, or useful!
-      anniversary: |
-        This badge is granted when you've been a member for a year with at least one post in that year. Thanks for sticking around and contributing to our community!
-      good_share: |
-        This badge is granted for sharing a link to a post that's visited by 300 outside visitors. Good work! You've shown off an interesting discussion to a <i>lot</i> of new people and helped us grow.
-      great_share: |
-        This badge is granted for sharing a link to a post that's visited by 100 outside visitors. Wow! You've promoted an interesting discussion to a huge new audience for this community, and helped us grow in a big way.
-      nice_post: |
-        This badge is granted for creating a reply that gets 10 likes. Nice job!
-      nice_topic: |
-        This badge is granted for creating a topic that gets 10 likes. Nice job!
-      good_post: |
-        This badge is granted for creating a reply that gets 25 likes. Good work!
-      good_topic: |
-        This badge is granted for creating a topic that gets 25 likes. Good work!
-      great_post: |
-        This badge is granted for creating a post that gets 50 likes. Wow!
-      great_topic: |
-        This badge is granted for creating a reply that gets 50 likes. Wow!
-      basic: |
-        This badge is granted when you reach trust level 1. Thanks for sticking around a little while and reading a few topics to learn what our community is about. Your new user restrictions have been lifted, and you've been granted all essential community abilities, such as personal messaging, flagging, wiki editing, and the ability to post images and multiple links.
-      member: |
-        This badge is granted when you reach trust level 2. Thanks for participating over a period of weeks to more join our community. You can now send personal invitations from your user page or individual topics, create group messages, and a few more likes per day.
-      regular: |
-        This badge is granted when you reach trust level 3. Thanks for being a regular part of our community over a period of months, one of the most active readers and a reliable contributor to what makes this community great. You can now recategorize and rename topics, access a private lounge area, more powerful spam flags, and lots more likes per day.
-      leader: |
-        This badge is granted when you reach trust level 4. You're a leader in this community as selected by staff, and set a positive example for the community in your deeds and words. You have the ability to edit all posts, take topic moderator actions such as pin, close, unlist, archive, split, and merge, and tons of likes per day.
+    autobiographer:
+      name: Autobiographer
+      description: Filled out <a href="/my/preferences">profile</a> information
+      long_description: |
+        This badge is granted for filling out <a href="/my/preferences">your user profile</a> and selecting a profile picture. Letting the community know a bit more about who you are and what you're interested in makes for a better, more connected community. Join us!
+    anniversary:
+      name: Anniversary
+      description: Active member for a year, posted at least once
+      long_description: |
+        This badge is granted when you've been a member for a year with at least one post in that year. Thank you for sticking around and contributing to our community. We couldn't do it without you.
+    nice_post:
+      name: Nice Reply
+      description: Received 10 likes on a reply
+      long_description: |
+        This badge is granted when your reply gets 10 likes. Your reply really made an impression on the community and helped move the conversation forward!
+    good_post:
+      name: Good Reply
+      description: Received 25 likes on a reply
+      long_description: |
+        This badge is granted when your reply gets 25 likes. Your reply was exceptional and made the conversation a whole lot better for everyone!
+    great_post:
+      name: Great Reply
+      description: Received 50 likes on a reply
+      long_description: |
+        This badge is granted when your reply gets 50 likes. Wow! Your reply was inspiring, fascinating, hilarious, or insightful and the community loved it.
+    nice_topic:
+      name: Nice Topic
+      description: Received 10 likes on a topic
+      long_description: |
+        This badge is granted when your topic gets 10 likes. Hey, you started an interesting conversation that the community enjoyed!
+    good_topic:
+      name: Good Topic
+      description: Received 25 likes on a topic
+      long_description: |
+        This badge is granted when your topic gets 25 likes. You launched a vibrant conversation that the community rallied around and loved!
+    great_topic:
+      name: Great Topic
+      description: Received 50 likes on a topic
+      long_description: |
+        This badge is granted when your topic gets 50 likes. You kicked off a fascinating conversation and the community enjoyed the dynamic discussion that resulted!
+    nice_share:
+      name: Nice Share
+      description: Shared a post with 25 unique visitors
+      long_description: |
+        This badge is granted for sharing a link that was clicked by 25 outside visitors. Thanks for spreading the word about our discussions, and this community.
+    good_share:
+      name: Good Share
+      description: Shared a post with 300 unique visitors
+      long_description: |
+        This badge is granted for sharing a link that was clicked by 300 outside visitors. Good work! You've shown off a great discussion to a bunch of new people and helped this community grow.
+    great_share:
+      name: Great Share
+      description: Shared a post with 1000 unique visitors
+      long_description: |
+        This badge is granted for sharing a link that was clicked by 1000 outside visitors. Wow! You've promoted an interesting discussion to a huge new audience, and helped us grow our community in a big way!
+    first_like:
+      name: First Like
+      description: Liked a post
+      long_description: |
+        This badge is granted the first time you like a post using the :heart: button. Liking posts is a great way to let your fellow community members know that what they posted was interesting, useful, cool, or fun. Share the love!
+    first_flag:
+      name: First Flag
+      description: Flagged a post
+      long_description: |
+        This badge is granted the first time you flag a post. Flagging is how we all help keep this a clean, well lit place for everyone. If you notice any posts that require moderator attention for any reason please don't hesitate to flag. You can also flag to send <b>personal messages</b> to fellow users if you see an issue with their post. If you see a problem, :flag_black: flag it!
+    promoter:
+      name: Promoter
+      description: Invited a user
+      long_description: |
+        This badge is granted when you invite someone to join the community via the invite button on your user page, or at the bottom of a topic. Inviting friends who might be interested in specific discussions is an great way to introduce new people to our community, so thanks!
+    campaigner:
+      name: Campaigner
+      description: Invited 3 basic users
+      long_description: |
+        This badge is granted when you've invited 3 people who subsequently spent enough time on the site to become basic users. A vibrant community needs a regular infusion of newcomers who regularly participate and add new voices to the conversationss.
+    champion:
+      name: Champion
+      description: Invited 5 members
+      long_description: |
+        This badge is granted when you've invited 5 people who subsequently spent enough time on the site to become full members. Wow! Thanks for expanding the diversity of our community with new members!
+    first_share:
+      name: First Share
+      description: Shared a post
+      long_description: |
+        This badge is granted the first time you share a link to a reply or topic using the share button. Sharing links is a great way to show off interesting discussions with the rest of the world and grow your community.
+    first_link:
+      name: First Link
+      description: Added a link to another topic
+      long_description: |
+        This badge is granted the first time you add a link to another topic. Linking topics helps fellow readers find interesting related conversations, by showing the connections between topics in both directions. Link freely!
+    first_quote:
+      name: First Quote
+      description: Quoted a post
+      long_description: |
+        This badge is granted the first time you quote a post in your reply. Quoting relevant sections of earlier posts in your reply helps keep discussions focused and on topic. And it's easy: you can quickly quote by highlighting a section of any post and using the Quote Reply button that appears near the selection. Quote generously!
+    read_guidelines:
+      name: Read Guidelines
+      description: Read the <a href="/guidelines">community guidelines</a>
+      long_description: |
+        This badge is granted for <a href="/guidelines">reading the community guidelines</a>. Following and sharing these simple guidelines helps build a safe, fun, and sustainable community for everyone. Always remember there's another human being, one very much like yourself, on the other side of that screen. Be nice!
+    reader:
+      name: Reader
+      description: Read every reply in a topic with more than 100 replies
+      long_description: |
+        This badge is granted the first time you read a long topic with more than 100 replies. Reading a conversation closely helps you follow the discussion, understand different viewpoints, and leads to more interesting conversations. The more you read, the better the conversation gets. As we like to say, Reading is Fundamental! :slight_smile:
+    popular_link:
+      name: Popular Link
+      description: Posted an external link with 50 clicks
+      long_description: |
+        This badge is granted when a link you shared gets 50 clicks. Thanks for posting a useful link that added interesting context to the conversation!
+    hot_link:
+      name: Hot Link
+      description: Posted an external link with 300 clicks
+      long_description: |
+        This badge is granted when a link you shared gets 300 clicks. Thanks for posting a fascinating link that drove the conversation forward and illuminated the discussion!
+    famous_link:
+      name: Famous Link
+      description: Posted an external link with 1000 clicks
+      long_description: |
+        This badge is granted when a link you shared gets 1000 clicks. Wow! You posted a link that significantly improved the conversation by addding essential detail, context, and information. Great work!
+    appreciated:
+      name: Appreciated
+      description: Received 1 like on 20 posts
+      long_description: |
+        This badge is granted when you receive at least one like on 20 different posts. The community is enjoying your contributions to the conversations here!
+    respected:
+      name: Respected
+      description: Received 2 likes on 100 posts
+      long_description: |
+        This badge is granted when you receive at least 2 likes on 100 different posts. The community is growing to respect your many contributions to the conversations here.
+    admired:
+      name: Admired
+      description: Received 5 likes on 300 posts
+      long_description: |
+        This badge is granted when you receive at least 5 likes on 300 different posts. Wow! The community admires your frequent, high quality contributions to the conversations here.
+    out_of_love:
+      name: Out of Love
+      description: Used 50 likes in a day
+      long_description: |
+        This badge is granted when you use all 50 of your daily likes. Remembering to take a moment and like the posts you enjoy and appreciate encourages your fellow community members to create even more great discussions in the future.
+    higher_love:
+      name: Higher Love
+      description: Used 50 likes in a day 5 times
+      long_description: |
+        This badge is granted when you use all 50 of your daily likes for 5 days. Thanks for taking the time actively encouraging the best conversations every day!
+    crazy_in_love:
+      name: Crazy in Love
+      description: Used 50 likes in a day 20 times
+      long_description: |
+        This badge is granted when you use all 50 of your daily likes for 20 days. Wow! You're a model of regularly encouraging your fellow community members!
+    thank_you:
+      name: Thank You
+      description: Has 20 liked posts and gave 10 likes
+      long_description: |
+        This badge is granted when you've received 20 likes on your posts and have given 10 or more likes in return. When someone likes your posts, you find the time to like what other people are posting in return.
+    gives_back:
+      name: Gives Back
+      description: Has 100 liked posts and gave 100 likes
+      long_description: |
+        This badge is granted when you've received 100 likes and have given 100 or more likes in return. Thanks for paying it forward, and liking in return!
+    empathetic:
+      name: Empathetic
+      description: Has 500 liked posts and gave 1000 likes
+      long_description: |
+        This badge is granted when you've received 500 likes and have given 1000 or more likes in return. Wow! You're a model of generosity and mutual love :two_hearts:.
 
   admin_login:
     success: "Email Sent"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index d76da507b7..b2a17b830d 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -169,6 +169,9 @@ es:
     hot: "Temas candentes"
     top: "Top temas"
     posts: "Últimos posts"
+    private_posts: "Últimos mensajes privados"
+    group_posts: "Últimos posts de %{group_name}"
+    group_mentions: "Últimas menciones de %{group_name}"
   too_late_to_edit: "Ese post fue publicado hace demasiado tiempo. No puede ser editado ni eliminado."
   revert_version_same: "La versión actual es la misma que la versión a la que intentas volver."
   excerpt_image: "imagen"
@@ -343,11 +346,15 @@ es:
       first_day_topics_per_day: "Has llegado al límite de temas que un nuevo usuario puede crear en su primer día. Por favor, espera %{time_left} antes de intentarlo de nuevo."
       create_topic: "Estás creando temas demasiado rápido. Por favor, espera %{time_left} antes de intentarlo de nuevo."
       create_post: "Estás respondiendo demasiado rápido. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      delete_post: "Estás eliminando posts demasiado rápido. Por favor espera %{time_left} antes de intentarlo de nuevo."
       topics_per_day: "Has llegado al límite de nuevos temas de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
       pms_per_day: "Has llegado al límite de mensajes de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
       create_like: "Has llegado al límite de Me gusta de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
       create_bookmark: "Has llegado al límite de marcadores de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
       edit_post: "Has llegado al límite de ediciones de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      live_post_counts: "Estás solicitando actualizaciones de posts demasiado rápido. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      unsubscribe_via_email: "Has alcanzado el máximo de bajas de suscripción vía email por hoy. Por favor espera %{time_left} antes de intentarlo de nuevo."
+      topic_invitations_per_day: "Has alcanzado el máximo de invitaciones a temas por hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
     hours:
       one: "1 hora"
       other: "%{count} horas"
@@ -442,6 +449,11 @@ es:
     confirmed: "Tu email ha sido actualizado."
     please_continue: "Continuar a %{site_name}"
     error: "Hubo un problema cambiando tu dirección de email. ¿Quizás la dirección ya está en uso?"
+    error_staged: "Hubo un error al cambiar tu email. La dirección ya está en uso por un usuario provisional."
+    already_done: "Lo sentimos, este enlace de confirmación ya no es válido. ¿Quizá tu email ya fue cambiado?"
+    authorizing_old:
+      title: "Gracias por confirmar tu dirección de correo actual"
+      description: "Te enviaremos un email a tu nueva dirección para confirmar."
   activation:
     action: "Haz clic aquí para activar tu cuenta"
     already_done: "Lo sentimos, este link de confirmación de cuenta ya no es válido. ¿Quizás tu cuenta ya está activa?"
@@ -692,11 +704,15 @@ es:
     site_contact_username_warning: "Introduce el nombre de un administrador o moderador simpático desde el cual se enviarán mensajes automáticos importantes. Actualiza site_contact_username en <a href='/admin/site_settings'>Ajustes del sitio</a>."
     notification_email_warning: "Las notificaciones por email no están siendo enviadas desde una dirección de correo electrónico válida en tu dominio; la entrega de emails será errática y poco fiable. Por favor, establece para notification_email una dirección de correo electrónico local válida en <a href='/admin/site_settings'>Ajustes del sitio</a>."
     subfolder_ends_in_slash: "La configuación del subdirectorio no es correcta; el campo DISCOURSE_RELATIVE_URL_ROOT termina con una barra."
+    email_polling_errored_recently:
+      one: "El email polling ha generado un error en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles."
+      other: "El email polling ha generado %{count} errores en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles."
   site_settings:
     censored_words: "Las palabras serán reemplazadas con &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-borrar cualquier post que se quede oculto por mas de 30 días."
     default_locale: "El idioma por defecto de Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permitir que los usuarios escojan su propio idioma para la interfaz"
+    set_locale_from_accept_language_header: "Establece el lenguaje de la interfaz para usuarios anónimos desde el lenguaje declarado por su navegador web. (EXPERIMENTAL, no funciona con caché anónimo)"
     min_post_length: "Extensión mínima de los posts, en número de caracteres"
     min_first_post_length: "Extensión mínima permitida en el primer mensaje (cuerpo del tema) en caracteres"
     min_private_message_post_length: "Extensión mínima de los posts en los mensajes, en número de caracteres"
@@ -818,6 +834,7 @@ es:
     max_username_length: "Longitud máxima del nombre de usuario en caracteres."
     reserved_usernames: "Nombres de usuario no permitidos en el registro."
     min_password_length: "Longitud mínima de contraseña."
+    min_admin_password_length: "Longitud mínima de la contraseña para un Admin."
     block_common_passwords: "No permitir contraseñas que están entre las 10.000 más comunes."
     enable_sso: "Activar single sign on a través de un sitio externo (AVISO: ¡LAS DIRECCIONES DE EMAIL SERÁN VALIDADAS POR EL SITIO EXTERNO!)"
     enable_sso_provider: "Implementar el protocolo del proveedor de SSO de Discourse en el endpoint /session/sso_provider requiere establecer un sso_secret"
@@ -838,6 +855,9 @@ es:
     enable_twitter_logins: "Activar autenticación por Twitter, requiere una twitter_consumer_key y un twitter_consumer_secret"
     twitter_consumer_key: "Comsumer key para autenticación por Twitter, registrado en http://dev.twitter.com"
     twitter_consumer_secret: "Comsumer secret para autenticación por Twitter, registrado en http://dev.twitter.com"
+    enable_instagram_logins: "Activar la autenticación por Instagram, requiere instagram_consumer_key y instagram_consumer_secret"
+    instagram_consumer_key: "Consumer key para autenticación por Instagram"
+    instagram_consumer_secret: "Consumer secret para autenticación por Instagram"
     enable_facebook_logins: "Activar autenticación por Facebook, requiere una facebook_app_id y un facebook_app_secret"
     facebook_app_id: "App id para la autenticación por Facebook, registrado en https://developers.facebook.com/apps"
     facebook_app_secret: "App secret para autenticación por Facebook, registrado en https://developers.facebook.com/apps"
@@ -850,11 +870,15 @@ es:
     backup_frequency: "Con qué frecuencia, en días, crearemos un backup del sitio."
     enable_s3_backups: "Sube copias de seguridad a S3 cuando complete. IMPORTANTE: requiere credenciales validas de S3 puestas Archivos configuración."
     s3_backup_bucket: "El bucket remoto para mantener copias de seguridad. AVISO: Asegúrate de que es un bucket privado."
+    s3_disable_cleanup: "Desactivar el eliminado de backups de S3 cuando se eliminen de forma local."
     backup_time_of_day: "Hora UTC del día cuando debería ejecutarse el backup."
     backup_with_uploads: "Incluir archivos adjuntos en los backups programados. Desactivando esta opción tan solo se ejecutará una copia de seguridad de la base de datos."
     active_user_rate_limit_secs: "Con qué frecuencia actualizaremos el campo 'last_seen_at', en segundos"
     verbose_localization: "Mostrar sugerencias de localización extendida en la interface de usuario "
     previous_visit_timeout_hours: "Cuanto tiempo debe pasar antes de que una visita sea considerada la 'visita previa', en horas"
+    top_topics_formula_log_views_multiplier: "valor del multiplicador de visitas (n) en la fórmula de temas top: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_first_post_likes_multiplier: "valor del multiplicador de me gusta en el primer post (n) en la fórmula de temas top:: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_least_likes_per_post_multiplier: "valor del multiplicador de me gusta por post (n) en la fórmula de temas top: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     rate_limit_create_topic: "Después de crear un tema, los usuarios deben esperar (n) segundos antes de crear otro tema."
     rate_limit_create_post: "Después de publicar un post, los usuarios deben esperar (n) segundos antes de crear otro post."
     rate_limit_new_user_create_topic: "Después de crear un tema, los nuevos usuarios deben esperar (n) segundos antes de crear otro tema."
@@ -867,6 +891,8 @@ es:
     max_private_messages_per_day: "Máximo número de mensajes por usuario y día."
     max_invites_per_day: "Máximo número de invitaciones que un usuario puede enviar al día."
     max_topic_invitations_per_day: "Máximo número de invitaciones a un tema que un usuario puede enviar por día."
+    alert_admins_if_errors_per_minute: "Número de errores por minuto que activa la alerta a administración. Un valor de 0 desactiva esta funcionalidad. NOTA: requiere reiniciar la instancia."
+    alert_admins_if_errors_per_hour: "Número de errores por hora que activa la alerta a administración. Un valor de 0 desactiva esta funcionalidad. NOTA: requiere reiniciar la instancia."
     suggested_topics: "Número de temas sugeridos mostrados al pie del tema."
     limit_suggested_to_category: "Solo mostrar temas de la categoría actual en los temas sugeridos."
     clean_up_uploads: "Eliminar subidas huérfanas sin referencia para prevenir hosting ilegal. AVISO: antes de habilitar esta opción quizá quieres hacer un backup de tu directorio de /uploads"
@@ -898,17 +924,10 @@ es:
     tl2_requires_likes_received: "¿Cuántos 'me gusta' un usuario debe de recibir antes de promoverlo a nivel de confianza 2?"
     tl2_requires_likes_given: "¿Cuántos 'me gusta' un usuario debe de dar antes de promoverlo a nivel de confianza 2?"
     tl2_requires_topic_reply_count: "¿Cuántos temas un usuario debe de contestar antes de promoverlo a nivel de confianza 2?"
-    tl3_time_period: "Tiempo para requisitos del nivel de confianza 3"
-    tl3_requires_days_visited: "Mínimo número de días que un usuario necesita haber visitado el sitio en los últimos 100 para poder ser promocionado a nivel de confianza 3. Establece un valor superior para desactivar la posibilidad de subir a nivel de confianza 3. (De 0 a 100)"
-    tl3_requires_topics_replied_to: "El número mínimo de temas que un usuario necesito haber respondido en los últimos 100 días para calificar a promoción de nivel de confianza 3. (0 o superior)."
-    tl3_requires_topics_viewed: "El porcentaje de temas creados en los últimos 100 días que un usuario necesito haber visto para calificar a promoción de nivel de confianza 3. (0 a 100)"
-    tl3_requires_posts_read: "El porcentaje de posts creados en los últimos 100 días que un usuario necesito haber visto para calificar a promoción de nivel de confianza 3. (0 a 100)"
+    tl3_time_period: "Período de tiempo (en días) para los requisitos de nivel de confianza 3"
     tl3_requires_topics_viewed_all_time: "El número total mínimo de temas que un usuario debió de haber visto para calificar a promoción de nivel de confianza 3."
     tl3_requires_posts_read_all_time: "El número mínimo total de posts que un usuario debió de haber leído para calificar a nivel de confianza 3."
-    tl3_requires_max_flagged: "El usuario no debió de haber tenido mas de x posts reportados por más de x diferentes usuarios en los últimos 100 días para calificar a promoción de nivel de confianza 3, donde x es el valor de configuración. (0 o superior)."
     tl3_promotion_min_duration: "El número mínimo de días que una promoción de nivel de confianza 3 dura antes que el usuario pueda ser degradado de vuelta a nivel de confianza 2."
-    tl3_requires_likes_given: "El número mínimo de 'me gusta' que deben de ser dados en los últimos 100 días para calificar a promoción de nivel de confianza 3."
-    tl3_requires_likes_received: "El número mínimo de 'me gusta' que debió haber recibido en los últimos 100 días para calificar a promoción de nivel de confianza 3."
     tl3_links_no_follow: "No remover rel=nofollow de los enlaces publicados por usuarios con nivel de confianza 3."
     min_trust_to_create_topic: "El mínimo nivel de confianza requerido para crear un nuevo tema."
     min_trust_to_edit_wiki_post: "El mínimo nivel de confianza requerido para editar un post marcado como wiki."
@@ -923,7 +942,6 @@ es:
     max_users_notified_per_group_mention: "Número de usuarios máximos que serán notificados si un grupo es mencionado (si se llega al límite no se mandarán más invitaciones)"
     create_thumbnails: "Crear miniaturas de imágenes y lightbox cuando estas son demasiado grandes para encajar en un post."
     email_time_window_mins: "Esperar (n) minutos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus posts."
-    private_email_time_window_seconds: "Espera (n) segundos antes de enviar emails de notificación privada, para dar tiempo a los usuarios a editar y finalizar sus posts."
     email_posts_context: "Cuántas respuestas previas se incluirán como contexto en los emails de notificación."
     flush_timings_secs: "Cuán frecuente, en segundos, se alinean los datos de sincronización con el servidor."
     title_max_word_length: "La longitud máxima permitida de una palabra, en caracteres, en el título del tema."
@@ -981,6 +999,7 @@ es:
     unsubscribe_via_email: "Permitir a los usuarios darse de baja de los emails respondiendo con el texto 'unsubscribe' en el asunto o el cuerpo del mensaje"
     unsubscribe_via_email_footer: "Adjuntar un enlace para darse de baja al pie de los emails enviados"
     delete_email_logs_after_days: "Eliminar logs de email después de (N) días. Si es 0 permanecerán de forma indefinida."
+    enable_staged_users: "Crear cuentas provisionales automáticamente al procesar emails entrantes."
     pop3_polling_enabled: "Poll vía POP3 para respuestas de e-mail."
     pop3_polling_ssl: "Usar SSL mientras se conecta al servidor POP3. (Recomendado)"
     pop3_polling_period_mins: "El período en minutos entre revisiones de correo de la cuenta POP3. NOTA: requiere reiniciar."
@@ -1025,7 +1044,6 @@ es:
     disable_avatar_education_message: "Desactivar mensaje incentivador para que los usuarios se cambien su foto de perfil."
     daily_performance_report: "Analizar registros de NGINX diariamente y publicar un tema para Administradores con los detalles"
     suppress_uncategorized_badge: "No mostrar la etiqueta de los temas sin categoría en la lista de temas."
-    permalink_normalizations: "Aplicar la siguiente expresion regular antes de los enlaces, por ejemplo: /(\\/topic.*)\\?.*/\\1 despojará las cadenas de consulta de las rutas de los temas. El formato es regex+string use \\1 etc. para acceder a capturas"
     global_notice: "Mostrar una noticia de URGENCIA o EMERGENCIA para todos los visitantes, deja este campo en blanco para ocultarla (se puede utilizar código HTML)"
     disable_edit_notifications: "Inhabilitar editar notificaciones por el usuario system cuando 'download_remote_images_to_local' este activo."
     automatically_unpin_topics: "Quitar destacado automáticamente cuando el usuario llega al final del tema."
@@ -1059,7 +1077,6 @@ es:
     enable_emoji: "Habilitar emoji"
     emoji_set: "¿De qué tipo os gustan los emoji?"
     enforce_square_emoji: "Forzar una relación de aspecto cuadrada para todos los emojis."
-    approve_post_count: "La cantidad de posts de un nuevo usuario que deben ser aprobados"
     approve_unless_trust_level: "Los posts de usuarios con un nivel de confianza inferior a este deberán ser aprobados"
     notify_about_queued_posts_after: "Si hay posts esperando a ser revisados por este número de horas, se enviará un email al correo de contacto. Establece este valor a 0 para desactivar estos emails."
     default_email_digest_frequency: "Frecuencia por defecto con la que se reciben los emails resumen."
@@ -1099,7 +1116,6 @@ es:
       pop3_polling_password_is_empty: "Debes establecer una contraseña de 'pop3 polling' antes de activar el polling POP3."
       pop3_polling_authentication_failed: "La autenticación POP3 falló. Por favor, verifica tus credenciales pop3."
       reply_by_email_address_is_empty: "Debes establecer el campo 'reply by email address' antes de activar respuesta por email."
-      pop3_polling_disabled: "Debes habilitar primero el polling POP3 antes de activar respuesta por email."
   notification_types:
     group_mentioned: "%{group_name} ha sido mencionado en %{link}"
     mentioned: "%{display_username} te ha mencionado en %{link}"
@@ -1121,11 +1137,6 @@ es:
       category: 'Categorías'
       topic: 'Resultados'
       user: 'Usuarios'
-  sso:
-    not_found: "No se puede buscar o crear cuenta, contacta al administrador del sitio"
-    account_not_approved: "La cuenta está pendiente de aprobación, recibirás una notificación por email cuando se apruebe"
-    unknown_error: "Error al actualizar la información, contacta al administrador del sitio"
-    timeout_expired: "Se agotó el tiempo de espera para el inicio de sesión, por favor, intenta iniciar sesión de nuevo"
   original_poster: "Autor original"
   most_posts: "Con más posts"
   most_recent_poster: "Autor más reciente"
@@ -1457,12 +1468,6 @@ es:
         Para orientación adicional, por favor revisa nuestras [reglas de comunidad](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Cuenta bloqueada"
-      text_body_template: |
-        Hola,
-
-        Esto es un mensaje automatizado de %{site_name} para informatarte que tu cuenta ha sido bloqueada por un miembro del staff.
-
-        Para orientación adicional, por favor revisa nuestras [reglas de comunidad](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "El nuevo usuario %{username} ha sido bloqueado tras ser reportado por la comunidad"
       text_body_template: |
@@ -1522,49 +1527,10 @@ es:
     posted_by: "Publicado por %{username} el %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} te ha invitado a un hilo de mensajes '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} te invitó al hilo de mensajes
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        en
-
-        > %{site_title} -- %{site_description}
-
-        Por favor visita este enlace para verlo: %{base_url}%{url}
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} te ha invitado a un mensaje '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} te ha invitado a un mensaje
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        Por favor, visita este enlace para ver el mensaje: %{base_url}%{url}
     user_invited_to_topic:
       subject_template: "[%{site_name}] %{username} te invitó a '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} te invitó al hilo
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        en
-
-        > %{site_title} -- %{site_description}
-
-        Por favor, visita este enlace para verlo: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
@@ -1707,12 +1673,6 @@ es:
 
         Pulsa en el siguiente enlace para escoger una contraseña para tu nueva cuenta:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Confirma tu nueva dirección de email"
-      text_body_template: |
-        Confirma tu nueva dirección de email para %{site_name} haciendo clic en el siguiente enlace:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Tú solicitud ha sido aprobada en %{site_name}!"
       text_body_template: |
@@ -2039,82 +1999,6 @@ es:
   privacy_topic:
     title: "Políticas de Privacidad"
     body: "<a name=\"collect\"></a>\n\n## [¿Qué información recolectamos?](#collect)\n\nRecolectamos información tuya cuando te registras en nuestra web, y recopilamos información cuando participas en ella leyendo, escribiendo y evaluando el contenido compartido aquí.\n\nAl registrarte en nuestra web, puede que se te pida que indiques tu nombre y tu email. Sin embargo, puedes visitarnos sin registrarte. Tu email será verificado a través de un mensaje que contendrá un enlace único. Si ese enlace es visitado, sabremos que controlas el email.\n\nCuando estés registrado y publiques, guardamos la dirección IP de donde el mensaje ha sido publicado. Puede que guardemos registros que incluyan la dirección IP de cada intercambio de datos con nuestro servidor.\n\n<a name=\"use\"></a>\n\n## [¿Para qué usamos tu información?](#use)\n\nCualquier información recolectada puede ser usada en una de las siguientes maneras:\n\n* Para personalizar tu experiencia &mdash; tu información nos ayuda a responder a tus necesidades individuales.\n* Para mejorar nuestra web &mdash; intentamos continuamente mejorar nuestro sitio web ofreciéndote contenido basado en la información que recibimos de ti.\n* Para mejorar el servicio de soporte &mdash; tu información nos ayuda a responder de una forma más efectiva a tus dudas y problemas.\n* Para enviar emails cada cierto tiempo &mdash; La direccion de email que nos proporciones puede ser usada para enviarte información, notificaciones que tú solicites sobre cambios en temas, sobre respuestas a tu nombre, respuestas a consultas y/o cualquier otro tipo de solicitudes o cuestiones.\n\n<a name=\"protect\"></a>\n\n## [¿Cómo protegemos tu información?](#protect)\n\nTenemos implementadas varias medidas de seguridad para mantener tu información personal segura cuuando la introduces o accedes a ella.\n\n<a name=\"data-retention\"></a>\n\n## [¿Cuál es la política de retención de datos?](#data-retention)\n\nIntentamos:\n\n* No retener los registros de los servidores conteniendo la dirección IP de todas las solicitudes durante más de 90 días.\n* No retener las direcciones IP asociadas con usuarios registrados y sus mensajes durante no más de 5 años.\n\n\n<a name=\"cookies\"></a>\n\n## [¿Usamos cookies?](#cookies)\n\nSí. Las cookies con pequeños archivos que una web o su proveedor de servicios transfiere a tu disco duro a través de tu navegador (si lo permites).\nEstas cookies permiten a la web reconocer tu navegador y, si tienes una cuenta registrada, asociarlo con ella.nt.\n\nUsamos cookies para entender y guardar tus preferencias para futuras visitas y para recolectar información sobre el tráfico y la interacción con este sitio web para que podamos ofrecer mejores experiencias y herramientas en un futuro. Puede que nos asociemos con terceras personas para que nos asisten a entender mejor a nuestros visitantes. Estos proveedores de servicios no tienen permitido usar esta información para otro propósito que no sea ayudarnos a mejorar.\n\n<a name=\"disclose\"></a>\n\n## [¿Revelamos alguna información a terceros?](#disclose)\n\nNo vendemos, intercambiamos o transferimos a terceros tu información personal. Esto no incluye a terceros que nos ayuden a operar correctamente este sitio web, a administrar nuestro negocio o a ofrecerte un servicio, siempre y cuando acepten mantener esta información confidencial.\nPuede que revelemos tu información cuando creamos que sea apropiado para cumplir con la ley, hacer cumplir con nuestras políticas, derechos, propiedades, o seguridad nuestros o de terceros. Sin embargo, la información no personal de los visitantes puede que sea entregada debidamente a terceros con propósitos de marketing, publicidad u otros usos. \n\n<a name=\"third-party\"></a>\n\n## [Enlaces de terceros](#third-party)\n\nOcasionalmente, es posible que incluyamos u ofrezcamos enlaces a productos o servicios de terceros en esta web. Estos sitios webs de terceros tienen otras políticas de privacidad, por lo que no nos hacemos responsables del contenido y actividades de estos sitios. Sin embargo, intentamos proteger la integridad de nuestra web y aceptamos opiniones sobre estos sitios de terceros.\n\n<a name=\"coppa\"></a>\n\n## [Cumplimiento del Acta de Protección de la Privacidad Online de los Niños de 1998](#coppa)\n\nNuestra web, sus productos y servicios están dirigidos a personas que tengan 13 o más años de edas. Si este servidor está en EEUU, y tienes menos de 13 años de edad, a causa del Acta de Protección de la Privacidad Online de los Niños de 1998 ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) de EEUU, no uses este sitio web.\n\n<a name=\"online\"></a>\n\n## [Política de privacidad online](#online)\n\nEsta política de privacidad sólo tiene validez para la información recolectada a través de nuestro sitio web, y no para aquella recolectada offline.\n\n<a name=\"consent\"></a>\n\n## [Consentimiento](#consent)\n\nAl usar nuestra web, aceptas esta política.\n\n<a name=\"changes\"></a>\n\n## [Cambios a nuestra política de privacidad](#changes)\n\nSi decidimos cambiar nuestra política de privacidad, publicaremos los cambios en esta misma página.\n\nEste documento tiene una licencia \"CC-BY-SA\". Última actualización: 31 de mayo del 2013.\n"
-  static:
-    search_help: |
-      <h3>Consejos</h3>
-      <p>
-      <ul>
-      <li>Los títulos de temas tienen prioridad &ndash; cuando tengas dudas busca títulos.</li>
-      <li>Palabras coco comunes y/o únicas producirán mejores resultados.</li>
-      <li>Prueba a buscar en una categoría, tema o usuario en particular.</li>
-      </ul>
-      </p>
-      <h3>Opciones</h3>
-      <p>
-      <table>
-      <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td><code>order:likes</code><td></td><td colspan=2></td></tr>
-      <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:single_user</code></td></tr>
-      <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td><code>group:foo</code></td><td><code>badge:foo</code></td><td></td></tr>
-      <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
-      <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td colspan=3></td></tr>
-      <tr><td><code>posts_count:num</code></td><td><code>min_age:days</code></td><td><code>max_age:days</code></td> <td colspan=2></td></tr>
-      </table>
-      </p>
-      <h3>Examples</h3>
-      <p>
-      <ul>
-      <li><code>gatos category:parques status:open order:latest</code> buscará temas que contengan la palabra "gatos" en la categoría "parques", que no estén cerrados ni archivados, y los ordenará por la fecha del último mensaje.</li>
-      <li><code>gatos category:"parques y jadrines" in:bookmarks</code> buscará temas que contengan la palabra "gatos" eb ka categoría "parques y jadrines" y que tengan un marcador colocado por ti.</li>
-      </ul>
-      </p>
-  badges:
-    long_descriptions:
-      autobiographer: |
-        Este distintivo se otorga por completar <a href="/my/preferences">tu perfil de usuario</u> y seleccionando una foto de perfil. Permitiendo a la comunidad saber más sobre ti y tus intereses hace que la comunidad sea mejor y esté más conectada.
-      first_like: "Este distintivo se otorga la primera vez que le das 'Me gusta' a un post usando el botón de :heart:. Dándole 'Me gusta' a posts es una manera estupenda de hacer saber al resto de compañeros de la comunidad que lo que han publicado te ha parecido interesante, útil, chulo o divertido. \n"
-      first_link: |
-        Este distintivo se otorga la primera vez que incluyes un enlace a otro tema en una respuesta. Enlazar temas ayuda al resto de lectores a encontrar interesantes conversaciones relevantes al enseñar las conexiones que dos temas tienen.
-      first_quote: |
-        Este distintivo se otorga la primera vez que citas un post en una respuesta. Citar secciones relevantes de posts anteriores en tus respuestas ayuda a mantener los debates centrados en el tema central.
-      first_share: |
-        Este distintivo se otorga la primera vez que compartes un enlace a una respuesta o tema usando el botón de compartir. Compartir enlaces es una buena manera de mostrar contenido interesante de la comunidad al resto de gente, ayudando a su crecimiento.
-      read_guidelines: |
-        Este distintivo se otorga por <a href="/guidelines">leer las directrices de la comunidad</a>. Siguiendo y compartiendo estas simples directrices ayuda a construir una comunidad segura, divertida y sostenible.
-      reader: |
-        Este distintivo se otorga por leer un tema largo. Leer es fundamental. Leer al detalle ayuda a seguir la conversación y hace que las respuestas sean mejores y más completas.
-      editor: |
-        Este distintivo se otorga por editar tu post. No dudes en editar tus posts en cualquier momento para mejorarlos, corregir pequeños errores o añadir algo que olvidaste.
-      first_flag: "Este distintivo se concede por reportar un post. Reportar es crítico para la salud de tu comunidad. Si detectas que alguna publicación requiere de la atención de un moderador por favor \nno dudes en reportarlo. También puedes usar el diálogo de reporte para enviar <b>mensajes</b> a otros usuarios.\n\n"
-      nice_share: |
-        Este distintivo se concede por compartir un enlace a un post que ha recibido 25 visitantes nuevos. ¡Buen trabajo! Compartir enlaces a debates interesantes con amigos es una manera excelente de hacer crecer nuestra comunidad.
-      welcome: |
-        Este distintivo se concede cuando recibes tu primer Me gusta en un post. ¡Enhorabuena, has publicado algo que la comunidad considera guay, útil o interesante!
-      anniversary: |
-        Este distintivo se concede cuando cumples un año como miembro que ha publicado al menos un post. ¡Gracias por pasarte por aquí y contribuir a nuestra comunidad!
-      good_share: |
-        Este distintivo se concede por compartir un enlace a un post que ha recibido 300 visitantes nuevos. ¡Genial! Has descubierto un debate interesante para <i>mucha</i> gente que no conocía el sitio y nos has ayudado a crecer.
-      great_share: |
-        Este distintivo se concede por compartir un enlace a un post que ha recibido 1000 visitantes nuevos. ¡Bravo! Has promovido un debate interesante para una inmensa audiencia que no conocía el sitio y nos has ayudado a crecer muchísimo.
-      nice_post: |
-        Este distintivo se concede al publicar una respuesta con 10 Me gusta. ¡Buen trabajo!
-      nice_topic: |
-        Este distintivo se concede al crear un tema con 10 Me gusta. ¡Buen trabajo!
-      good_post: |
-        Este distintivo se concede al publicar una respuesta con 25 Me gusta. ¡Genial!
-      good_topic: |
-        Este distintivo se concede al crear un tema con 25 Me gusta. ¡Genial!
-      great_post: |
-        Este distintivo se concede al publicar una respuesta con 50 Me gusta. ¡Excelente!
-      great_topic: |
-        Este distintivo se concede al crear un tema con 50 Me gusta. ¡Excelente!
-      basic: |
-        Este distintivo se concede cuando alcanzas el nivel de confianza 1. Gracias por pasar por aquí un momento y leer unos cuantos temas para ver de qué va esta comunidad. Las restricciones de nuevo usuario se eliminan y podrás usar las funcionalidades esenciales del sitio como enviar mensajes a otras personas, reportar posts, editar posts wiki y publicar imágenes o varios enlaces.
-      member: |
-        Este distintivo se concede cuando alcanzas el nivel de confianza 2. Gracias por tu constante participación en la comunidad. Ahora puedes enviar invitaciones a otras personas desde tu perfil o temas individuales, enviar mensajes a grupos y dar más Me gusta por día.
-      regular: |
-        Este distintivo se concede cuando alcanzas el nivel de confianza 3. Gracias por tomar parte activa de nuestra comunidad por tanto tiempo, ser uno de los más ávidos lectores y contribuir tanto a su crecimiento y calidad. Ahora puedes recategorizar o renombrar temas, acceder al área vip, reportar spam de forma más contundente y dar muchos más Me gusta por día.
-      leader: |
-        Este distintivo se concede cuando alcanzas el nivel de confianza 4. Eres un líder de la comunidad elegido por los administradores, constituyes un ejemplo positivo para los demás mediante tus hechos y palabras. Ahora puedes editar todos los posts, dar muchísimos Me gusta por día y realizar acciones de moderador como destacar temas, cerrarlos, archivarlos, hacerlos invisibles, dividirlos o integrarlos.
   admin_login:
     success: "Email enviado"
     error: "¡Error!"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 0420e01100..22b0cf5acc 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -143,7 +143,6 @@ fa_IR:
       can_not_modify_automatic: "شما امکان تغییر یک گروه خودکار را ندارید."
       member_already_exist: "%{username}' در حال حاضر عضو این گروه است."
       invalid_domain: "'%{domain}' یک دامنه معتبر نیست."
-      invalid_incoming_email: "'%{incoming_email}' یک آدرس ایمیل معتبر نیست."
     default_names:
       everyone: "همه"
       admins: "مدیران"
@@ -263,7 +262,6 @@ fa_IR:
       uncategorized_parent: "بدون دسته بندی نمی تواند طبقه خانواده داشته باشد"
       self_parent: "والد زیر شاخه نمی تواند خودش باشد."
       depth: "شما نمی توانید یک زیر شاخه را به آشیانه تبدیل کنید تحت دیگری "
-      email_in_already_exist: "ایمیل آدرس های ورودی '%{email_in}' که در حال حاضر استفاده می شوند برای '%{category_name}' دسته بندی. "
     cannot_delete:
       uncategorized: "بدون دسته بندی را نمی توان حذف کرد"
       has_subcategories: "این دسته بندی به دلیل داشتن زیردسته قابل پاک شدن نیست."
@@ -623,7 +621,6 @@ fa_IR:
     min_private_message_title_length: "حداقل طول مجاز عنوان برای پیام در کاراکتر"
     min_search_term_length: "حداقل طول واژه جستجوی معتبر در کاراکتر"
     allow_uncategorized_topics: "اجازه ایجاد عناوین فاقد دسته‌بندی را بده. <strong>هشدار</strong>: درصورتی که عناوین فاقد دسته‌بندی وجود داشته باشد، بایستی قبل از غیر فعال کردن این قابلیت آن‌ها را دسته‌بندی کنید."
-    uncategorized_description: "شرح دسته بندی های دسته بندی نشده. خالی بگذارید برای بدون شرح. "
     allow_duplicate_topic_titles: "جستارها را با عناوین یکسان و تکراری اجازه بده "
     unique_posts_mins: "چند دقیقه قبل از اینکه کاربر بتواند دوباره نوشته ای با محتویات یکسان را بگذارد."
     educate_until_posts: "وقتی کاربر شروع کرد به نوشتن اولین (n)  پست جدید٬ آموزش ها را برای کاربران جدید بصورت بالاپر در قسمت نویسنده نشان بدهو"
@@ -792,15 +789,9 @@ fa_IR:
     tl2_requires_likes_received: "کاربر چندین پسند باید دریافت کند قبل از اینکه به سطح اعتماد  2 برسد."
     tl2_requires_likes_given: "کاربر چندین لایک باید بزند تا بتواند به سطح اعتماد 2 برسد. "
     tl2_requires_topic_reply_count: "کاربرچندین پاسخ باید بدهد قبل از اینکه به سطح اعتماد 2 برسد."
-    tl3_requires_topics_replied_to: "حداقل تعداد جستارهایی که کاربر نیاز به پاسخ دارد در 100 روز گذشته تا بتواند سطح اعتماد 3 را بدست آورد.  (0 to 100)"
-    tl3_requires_topics_viewed: "درصد جستارهای ساخته شده در 100 روز گذشته  که کاربر نیاز به دیده شدن دارد برای ارتقا به سطح اعتماد 3. (0 to 100)"
-    tl3_requires_posts_read: "درصد نوشته های ساخته شده در 100 روز گذشته  که کاربر نیاز به دیده شدن دارد برای ارتقا به سطح اعتماد 3. (0 to 100)"
     tl3_requires_topics_viewed_all_time: "حداقل تعداد جستار ها که کاربر نیاز به بازدید دارد تا بتواند به سطح اعتماد  3 برسد."
     tl3_requires_posts_read_all_time: "حداقل تعداد نوشته ها که کاربر نیاز به خواندن دارد تا بتواند به سطح اعتماد  3 برسد."
-    tl3_requires_max_flagged: "کاربر نباید بیشتر از X نوشته های پرچم گزاری شده توسط X کاربران متفاوت در 100 روز گذشته داشته باشد برای ارتقا به سطح اعتماد 3 ٬ که  در آن X  مقدار این تنظیمات است. (0 یا بیشتر)"
     tl3_promotion_min_duration: "حداقل تعداد روزهایی که ارتقا به سطح اعتماد 3 باقی می ماند قبل از اینکه کاربر تنزل پیدا کنه به سطح اعتماد 2. "
-    tl3_requires_likes_given: "حداقل تعداد پسندهای که باید داده شود در 100 روز گذشته تا بتواند به سطح اعتماد 3 ارتقا پیدا کند."
-    tl3_requires_likes_received: "حداقل تعداد پسندهایی که باید دریافت شود در 100 روز گذشته تا به سطح اعتماد 3 ارتقا پیدا کند. "
     tl3_links_no_follow: "rel=nofollow را از پیوند های پست شده توسط کاربران با سطح اعتماد 3 حذف نکن. "
     min_trust_to_create_topic: "حداقل سطح اعتمادی که برای  ساخت جستار جدید مورد نیاز است. "
     min_trust_to_edit_wiki_post: "حداقل سطح اعتمادی  برای ویرایش نوشته ای که بعنوان ویکی نشانه گزاری شده است. "
@@ -881,7 +872,6 @@ fa_IR:
     automatically_download_gravatars: "آواتار را برای کاربران دریافت کن برای ساختن حساب کاربری یا ایمیل. "
     digest_topics: "حداکثر تعداد جستارهایی که در دایجست ایمیل نشان داده می شود "
     digest_min_excerpt_length: "حداقل نوشته های گزیده در ایمیل دایجست٬‌ در کاراکتر."
-    delete_digest_email_after_days: "ایمیل های خلاصه را مهار کن برای کاربرانی که در وب سایت دیده نشده اند بیشتر از (n) روز  "
     disable_digest_emails: "ایمیل های دایجست را برای تمام کاربران غیر فعال کن. "
     max_daily_gravatar_crawls: "حداکثرتعداد زمانی که دیسکورس Gravatar را چک می کند برای آواتار سفارشی در هر روز. "
     public_user_custom_fields: "لیست مجاز فیلد سفارشی برای کاربر که می تواند به همه نشان داده شود."
@@ -924,7 +914,6 @@ fa_IR:
     enable_emoji: "فعالسازی ایموجی"
     emoji_set: "می‌خواهید ایموجی شما چطور باشد؟"
     enforce_square_emoji: "تحمیل نسبت ابعاد مربع به تمام شکلک ها emojis . "
-    approve_post_count: "تعداد پست ها برای کاربران جدید باید تایید شود"
     approve_unless_trust_level: "نوشته ها برای کاربران پایین ت از این سطح اعتماد نیاز به تایید دارد. "
     errors:
       invalid_email: "آدرس ایمیل نامعتبر"
@@ -950,7 +939,6 @@ fa_IR:
     moved_post: "%{display_username} نوشته شما منتقل شد به %{link}"
     private_message: "%{display_username} یک پیام ارسال کنید: %{link}"
     invited_to_private_message: "%{display_username}  شما را به این پیام دعوت کرده : %{link}"
-    invited_to_topic: "%{display_username}  شما را به این جستار دعوت کرده:  %{link}"
     invitee_accepted: " %{display_username} دعوت نامه شما را پذیرفته شد "
     linked: "%{display_username} شما پیوند خوردید در %{link}"
     granted_badge: "شما وارد شدید %{link}"
@@ -960,11 +948,6 @@ fa_IR:
       category: 'دسته‌ها'
       topic: 'درخواست ها'
       user: 'کاربران'
-  sso:
-    not_found: "نمی توانی مراجعه کنی یا حساب کاربری بسازی٬ با مدیر سایت تماس بگیر "
-    account_not_approved: "حساب کاربری در انتظار تایید است٬ شما ایمیلی دریافت خواهید کرد زمانی که تایید شد"
-    unknown_error: "ایراد به روز رسانی اطلاعات٬ با مدیر سایت تماس بگیرید"
-    timeout_expired: "ورود حساب کاربری از زمان خارج شد است. لطفا دوباره وارد سیستم شوید"
   original_poster: "نویسنده اصلی"
   most_posts: "بیشترین نوشته ها"
   most_recent_poster: "جدیدترین نویسنده ها"
@@ -1052,68 +1035,10 @@ fa_IR:
     subject_template: "تنظیم رمز عبور برای حساب کاربری {site_name}%"
   test_mailer:
     subject_template: "[%{site_name}] ایمیل تست دهش"
-    text_body_template: |
-      This is a test email from
-
-      [**%{base_url}**][0]
-
-      Email deliverability is complicated. Here are a few important things you should check first:
-
-      - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**.
-
-      - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. in Gmail, it is the "show original" option in the drop-down menu at the top right of each mail.
-
-      - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered.
-
-      - Is your domain's [SPF record][8] correct? [Test your SPF record][1] here. Note that TXT is the correct official record type for SPF.
-
-      - Is your domain's [DKIM record][3] correct? This will significantly improve email deliverability. [Test your DKIM record][7] here.
-
-      - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services.
-
-      (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!)
-
-      We hope you received this email deliverability test OK!
-
-      Good luck,
-
-      Your friends at [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: http://dkimcore.org/tools/dkimrecordcheck.html
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [md]: http://mandrill.com
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
   new_version_mailer:
     subject_template: "[%{site_name}] نسخه جدید Discourse برای به روز رسانی موجود است"
-    text_body_template: |
-      نسخه‌ جدیدی از [دیسکورس](http://www.discourse.org) موجود است.
-
-      نسخه کنونی: %{installed_version}
-      نسخه جدید: **%{new_version}**
-
-      شما می‌توانید:
-
-      - تغییرات جدید را در  [GitHub changelog](https://github.com/discourse/discourse/commits/master) ببینید.
-
-      - از طریق مروگر خود به‌روزرسانی را انجام دهید [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
-
-      - از [meta.discourse.org](http://meta.discourse.org) برای دسترسی به اخبار و پشتیبانی دیسکورس استفاده کنید.
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] بروزرسانی در دسترس"
-  flags_reminder:
-    flags_were_submitted:
-      other: "این پرچم گزاری ها  در %{count} ساعت پیش ارسال شده است."
-    please_review: "لطفا بازبینی کن."
-    post_number: "نوشته"
-    how_to_disable: 'شما می توانید تکرار یاد توسط این ایمیل را عوض کنید یا از کار بیندازید از طریق اعلام کردت بعد ازتنظیم پرچم گزاری .'
-    subject_template:
-      other: "%{count} نشانه ها منتظر استفاده"
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} نوشته منتظر بررسی است"
@@ -1196,7 +1121,6 @@ fa_IR:
       text_body_template: "ما متاسفیم٬ ولی خارج کردن اطلاعات ناموفق شد. لطفا سیستم را چک کنید یا با یکی از مدیران تماس بگیرید. "
     email_reject_no_account:
       subject_template: "[%{site_name}]  مشکل ایمیل  -- حساب کاربری ناشناس "
-      text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\n\nحساب کاربری با این ایمیل شناخته نمی شود. دوباره برای ارسال تلاش کنید با ایمیل دیگری٬ یا با یکی از مدیران تماس بگیرید.\n"
     email_reject_empty:
       subject_template: "[%{site_name}] مشکل ایمیل -- بدون محتوا"
     email_reject_parsing:
@@ -1206,11 +1130,6 @@ fa_IR:
       text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\nحساب کاربری شما دارای سطح اعتماد کافی برای ارسال نوشته جدید به این ایمیل نیست. اگر این مشکل را قبول دارید٬ با یکی از مدیران تماس بگیرید.\n"
     email_reject_reply_key:
       subject_template: "[%{site_name}] مشکل ایمیل  -- کلید پاسخ ناشناس"
-      text_body_template: |+
-        ما متاسفیم٬ ولی پیام  ایمیل شما به  %{destination} (titled %{former_title}) کار نکرد.
-
-        کلید پاسخ وارد شده خراب یا ناشناس است٬ پس ما نمی دانیم این ایمیل در پاسخ چی هست. با یکی از مدیران تماس بگیرید.
-
     email_reject_topic_not_found:
       subject_template: "[%{site_name}] مشکل ایمیل  -- جستار یافت نشد"
     email_reject_topic_closed:
@@ -1219,13 +1138,11 @@ fa_IR:
       subject_template: "[%{site_name}] مشکل ایمیل  -- پاسخ خودکار"
     email_error_notification:
       subject_template: "[%{site_name}] مشکل ایمیل  -- ایراد تصدیق POP "
-      text_body_template: "ایراد تصدیقی وجود داشته همزمان با گرفتن ایمیل ها از سرور POP. \n\n\nلطفا اطمینان حاصل کنید از اینکه بطور درست تنظیم اعتبارنامه POP را در [تنظیمات وب سایت] انجام داده اید. (%{base_url}/ریس/تنظیمات _ سایت /دسته/ایمیل)\n"
     too_many_spam_flags:
       subject_template: "حساب جدید کاربری انسداد شد "
       text_body_template: "سلام \n\nاین یک پیغام خوکار است از  %{site_name}  برای تایید اینکه نوشته های شما بطور خودکار مخفی شده اند زیرا آنها توسط انجمن پرچم گزاری شده اند. \n\n\nبه عنوان یک اقدام احتیاطی٬ حساب کاربری جدید شما مسدود شده است از ساختن پاسخ های جدید یا جستارهای جدید تا قبل از اینکه یک مدیران حساب کاربری شما را بررسی کند.\n\n\nبرای راهنمایی بیشتر به[ دستور عمل های انجمن]  مراجعه کنید. (%{base_url}/guidelines).\n"
     blocked_by_staff:
       subject_template: "حساب کاربری مسدود شد"
-      text_body_template: "سلام٬ \n\n\nاین یک پیام خودکار است از طرف  %{site_name}  برای اطلاع  در جهت اینکه حساب کاربری شما توسط یکی از مدیران مدیران مسدود شده است.\n\nبرای راهنمایی بیشتر٬ لطفا  مراجعه کنید به  [دستورالعمل انجمن](%{base_url}/guidelines).\n"
     user_automatically_blocked:
       subject_template: "کاربر جدید%{username}  مسدود شد بخاطر پرچم های انجمن"
     spam_post_blocked:
@@ -1253,10 +1170,6 @@ fa_IR:
     posted_by: "نوشته شده توسط {username}% در تاریخ {post_date}%"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} شما را به یک پیام دعوت کرده است: '%{topic_title}'"
-      text_body_template: "\n%{username} شما را به یک پیام دعوت کرده\n\n\n> **%{topic_title}**\n\n>\n\n> %{topic_excerpt}\n\n\nat \n\n\n> %{site_title} -- %{site_description}\n\n\nلطفا از این پیوند بازدید کنید تا پیام را ببینید: %{base_url}%{url}\n"
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} شما را به یک جستار دعوت کرده  '%{topic_title}'"
-      text_body_template: "\n%{username} به گفتگو دعوت شده است\n\n\n> **%{topic_title}**\n\n>\n\n> %{topic_excerpt}\n\nat \n\n\n> %{site_title} -- %{site_description}\n\n\nلطفا از این پیوند بازدید کنید تا پیام را ببینید: %{base_url}%{url}\n"
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
     user_quoted:
@@ -1300,9 +1213,6 @@ fa_IR:
     account_created:
       subject_template: "[%{site_name}] حساب کاربری جدید شما"
       text_body_template: "حساب کاربری جدید برای شما ساخته شد در  %{site_name}\n\nبر روری پیوند پیش رو کلیک کنید برای انتخاب رمز برای حساب کاربری جدیدتان: \n\n%{base_url}/users/password-reset/%{email_token}\n"
-    confirm_new_email:
-      subject_template: "آدرس ایمیل جدید را تایید کنید برای [%{site_name}]"
-      text_body_template: "آدرس ایمیل جدید را تایید کنید برای %{site_name} با کلیک کردن بر پیوند پیش رو : \n\n\n%{base_url}/users/authorize-email/%{email_token}\n"
     signup_after_approval:
       subject_template: "شما تایید شدید %{site_name}! "
       text_body_template: "خوش آمدید به  %{site_name}!\n\nیکی از مدیران حساب کاربری شما را تایید کرد در %{site_name}.\n\nبر روی پیوند پیش رو کلیک کنید تا حساب کاربری شما تایید شود: \n%{base_url}/users/activate-account/%{email_token}\n\nاگر پیوند بالا قابل کلیک کردن نیست٬ پیوند را کپی کنید و در مرور گر وب انتقال دهید. \n\n%{new_user_tips}\n\n\nما به  [رفتار انجمن متمدن] معتقدیم (%{base_url}/guidelines) برای  همیشه. \n\nاز بودنتان در اینجا لذت ببرید! \n\n( اگر شما نیاز  به ارتباط با مدیران را دارید[staff members](%{base_url}/about) به عنوان یک کاربر جدید٬ لطفا به این پیام پاسخ دهید.)\n"
@@ -1310,7 +1220,6 @@ fa_IR:
       subject_template: "[%{site_name}] حساب کاربری جدید را تایید کنید"
       text_body_template: "خوش آمدید به %{site_name}!\n\n\nبرای فعال نمودن حساب کاربریتان بر روی پیوند پیش رو کلیک کنید: \n\n%{base_url}/users/activate-account/%{email_token}\n\n\nاگر پیوند بالا قابل کلیک کردن نیست٬ پیوند را کپی کنید و در مرور گر وب انتقال دهید. \n"
   page_not_found:
-    title: "صفحه ای که درخواست کردید وجود ندارد یا خصوصی است. "
     popular_topics: "محبوب"
     recent_topics: "اخیر"
     see_more: "بیشتر"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 587f6365e6..a49c66c4cf 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -169,6 +169,9 @@ fi:
     hot: "Kuumat ketjut"
     top: "Huippuketjut"
     posts: "Uusimmat viestit"
+    private_posts: "Uusimmat yksityisviestit"
+    group_posts: "Uusimmat viestit ryhmässä %{group_name}"
+    group_mentions: "Uusimmat maininnat ryhmässä %{group_name}"
   too_late_to_edit: "Tämä viesti luotiin liian kauan sitten. Sitä ei voi enää muokata tai poistaa."
   revert_version_same: "Nykyinen revisio on sama, kuin jonka yrität palauttaa."
   excerpt_image: "kuva"
@@ -709,11 +712,15 @@ fi:
     site_contact_username_warning: "Aseta käyttäjänimi, jonka nimissä palsta automaattiset viestit lähetetään. Muokkaa asetusta site_contact <a href='/admin/site_settings'>sivuston asetuksissa</a>."
     notification_email_warning: "Palstan sähköpostien lähettäjäosoite ei ole kelvollinen, josta johtuen sähköpostit eivät mene perille luotettavasti. Aseta toimiva sähköpostiosoite kohtaan notification_email <a href='/admin/site_settings'>sivuston asetuksissa</a>."
     subfolder_ends_in_slash: "Alihakemiston asetuksesi ei kelpaa; DISCOURSE_RELATIVE_URL_ROOT päättyy vinoviivaan."
+    email_polling_errored_recently:
+      one: "Sähköpostin pollaus on aiheuttanut virheen edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
+      other: "Sähköpostin pollaus aiheutti %{count} virhettä edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
   site_settings:
     censored_words: "Sanat, jotka korvataan automaattisesti merkeillä &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Poista automaattisesti kaikki yli 30 päivää piilotettuna olleet viestit."
     default_locale: "Sivuston oletuskieli (ISO 639-1 koodi)"
     allow_user_locale: "Salli käyttäjien vaihtaa käyttöliittymän kieli omista asetuksista"
+    set_locale_from_accept_language_header: "Aseta sivuston kieli kirjautumattomille käyttäjille selaimen kielivalinnan perusteella. (KOKEELLINEN, ei toimi anonyymin välimuistin kanssa)"
     min_post_length: "Viestin merkkien minimimäärä"
     min_first_post_length: "Ketjun aloitusviestin (leipätekstin) merkkien minimimäärä"
     min_private_message_post_length: "Viestin merkkien minimimäärä viesteille"
@@ -722,7 +729,7 @@ fi:
     max_topic_title_length: "Viestin otsikon merkkien maksimimäärä"
     min_private_message_title_length: "Viestin otsikon merkkien minimimäärä viestille"
     min_search_term_length: "Haun merkkien minimimäärä"
-    allow_uncategorized_topics: "Salli ketjujen luominen valitsematta aluetta. VAROITUS: Sinun täytyy siirtää alueettomat ketjut jollekin alueelle, ennen tämän asetuksen poistamista käytöstä."
+    allow_uncategorized_topics: "Salli ketjujen luominen valitsematta aluetta. VAROITUS: Alueettomat ketjut täytyy siirtää jollekin alueelle ennen kuin poistat asetuksen käytöstä."
     allow_duplicate_topic_titles: "Salli ketjun luominen identtisellä otsikolla."
     unique_posts_mins: "Kuinka monta minuuttia, kunnes käyttäjä voi luoda uudestaan saman sisältöisen viestin"
     educate_until_posts: "Näytä uuden käyttäjän ohje, kun käyttäjä alkaa kirjoittamaan ensimmäistä (n) viestiään viestikenttään."
@@ -924,17 +931,17 @@ fi:
     tl2_requires_likes_received: "Kuinka monta tykkäystä käyttäjän täytyy saada ennen ylentämistä luottamustasolle 2."
     tl2_requires_likes_given: "Kuinka monta tykkäystä käyttäjän täytyy antaa ennen ylentämistä luottamustasolle 2."
     tl2_requires_topic_reply_count: "Kuinka moneen ketjuun käyttäjän täytyy vastata ennen ylentämistä luottamustasolle 2."
-    tl3_time_period: "Luottamustason 3 vaatimuksiin liittyvän ajanjakson pituus"
-    tl3_requires_days_visited: "Minimimäärä päiviä, joina käyttäjän täytyy olla vieraillut sivustolla viimeisen 100 päivän aikana voidakseen saavuttaa luottamustason 3. Poistaaksesi ylennykset aseta arvo korkeammaksi, kuin lt3 aikaraja,  (0 tai korkeampi)"
-    tl3_requires_topics_replied_to: "Moneenko ketjuun vähintään käyttäjän täytyy olla vastannut viimeisen 100 päivän aikana voidakseen saavuttaa luottamustason 3. (0 tai korkeampi)"
-    tl3_requires_topics_viewed: "Montako prosenttia viimeisen 100 päivän aikana luoduista ketjuista käyttäjän täytyy olla katsellut voidakseen saavuttaa luottamustason 3. (asteikko 0-100)"
-    tl3_requires_posts_read: "Montako prosenttia viimeisen 100 päivän aikana luoduista viesteistä käyttäjän täytyy olla katsellut voidakseen saavuttaa luottamustason 3. (asteikko 0-100)"
+    tl3_time_period: "Luottamustason 3 vaatimuksiin liittyvän ajanjakson pituus (päivissä)"
+    tl3_requires_days_visited: "Monenako päivänä vähintään käyttäjän täytyy olla vieraillut sivustolla viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3. Ota ylennykset käytöstä asettamalla arvo korkeammaksi kuin lt3 aikaraja, (0 tai korkeampi)"
+    tl3_requires_topics_replied_to: "Moneenko ketjuun vähintään käyttäjän täytyy olla vastannut viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3. (0 tai korkeampi)"
+    tl3_requires_topics_viewed: "Montako prosenttia viimeisen (tl3 time period) päivän aikana luoduista ketjuista käyttäjän täytyy olla katsellut voidakseen saavuttaa luottamustason 3. (asteikko 0-100)"
+    tl3_requires_posts_read: "Montako prosenttia viimeisen (tl3 time period) päivän aikana luoduista viesteistä käyttäjän täytyy olla katsellut voidakseen saavuttaa luottamustason 3. (asteikko 0-100)"
     tl3_requires_topics_viewed_all_time: "Montako ketjua käyttäjän täytyy olla katsonut voidakseen saavuttaa luottamustason 3."
     tl3_requires_posts_read_all_time: "Montako viestiä käyttäjän täytyy olla katsonut voidakseen saavuttaa luottamustason 3."
-    tl3_requires_max_flagged: "Käyttäjällä ei saa olla enempää kuin x viestiä liputettuna x eri käyttäjältä viimeisen 100 päivän aikana voidakseen saavuttaa luottamustason 3. (0 tai korkeampi)"
+    tl3_requires_max_flagged: "Käyttäjällä ei saa olla enempää kuin x viestiä liputettuna x eri käyttäjältä viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3. (0 tai korkeampi)"
     tl3_promotion_min_duration: "Kuinka montaa päivää luottamustasolle 3 ylennyksen jälkeen käyttäjä voidaa jälleen alentaa luottamustasolle 2."
-    tl3_requires_likes_given: "Montako tykkäystä käyttäjän täytyy olla vähintään antanut viimeisen 100 päivän aikana voidakseen saavuttaa luottamustason 3."
-    tl3_requires_likes_received: "Montako tykkäystä käyttäjän täytyy olla vähintään saanut viimeisen 100 päivän aikana voidakseen saavuttaa luottamustason 3."
+    tl3_requires_likes_given: "Montako tykkäystä käyttäjän täytyy olla vähintään antanut viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3."
+    tl3_requires_likes_received: "Montako tykkäystä käyttäjän täytyy olla vähintään saanut viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3."
     tl3_links_no_follow: "Älä poista rel=nofollow -attribuuttia linkeistä luottamustason 3 käyttäjiltä."
     min_trust_to_create_topic: "Ketjun luomiseksi vaadittava luottamustaso."
     min_trust_to_edit_wiki_post: "Wikiviestin muokkaamiseen vaadittava luottamustaso."
@@ -949,7 +956,7 @@ fi:
     max_users_notified_per_group_mention: "Kuinka moni voi saada ilmoituksen, kun ryhmään viitataan (jos raja ylittyy, kukaan ei saa ilmoitusta)"
     create_thumbnails: "Luo esikatselu- ja lightbox-kuvia, jotka ovat liian suuria mahtuakseen viestiin."
     email_time_window_mins: "Odota (n) minuuttia ennen ilmoitussähköpostien lähettämistä, jotta käyttäjällä on aikaa muokata ja viimeistellä viestinsä."
-    private_email_time_window_seconds: "Odota (n) sekuntia ennen ilmoitusten lähettämistä käyttäjille, jotta kirjoittajalla on mahdollisuus muokata ja viimeistellä viestinsä."
+    private_email_time_window_seconds: "Odota (n) sekuntia ennen sähköposti-ilmoitusten lähettämistä käyttäjille, jotta kirjoittajalla on mahdollisuus tehdä muokkaukset ja viimeistellä viestinsä."
     email_posts_context: "Kuinka monta edellistä vastausta liitetään kontekstiksi sähköposti-ilmoituksessa."
     flush_timings_secs: "Kuinka usein timing data päivitetään palvelimelle, sekunneissa."
     title_max_word_length: "Sanan enimmäispituus merkkeinä ketjun otsikossa"
@@ -1007,6 +1014,7 @@ fi:
     unsubscribe_via_email: "Salli käyttäjän lakkauttaa sähköposti-ilmoitukset lähettämällä sähköpostiviesti, jonka otsikossa tai leipätekstissä esiintyy sana \"unsubscribe\""
     unsubscribe_via_email_footer: "Liitä sähköpostiviestien alaosaan linkki, jonka avulla saaja voi lakkauttaa sähköposti-ilmoitukset"
     delete_email_logs_after_days: "Poista sähköpostilokit (N) päivän jälkeen. Aseta 0 säilyttääksesi ikuisesti."
+    max_emails_per_day_per_user: "Käyttäjälle päivässä lähetettävien sähköpostien enimmäismäärä. Aseta 0, jos et halua rajoittaa."
     pop3_polling_enabled: "Pollaa sähköpostivastaukset POP3:lla."
     pop3_polling_ssl: "Käytä SSL-salausta yhdistettäessä POP3-palvelimeen. (Suositellaan)"
     pop3_polling_period_mins: "Tiheys minuuteissa kuinka usein POP3 tililtä tarkastetaan uudet sähköpostit. HUOM: vaatii uudelleenkäynnistyksen."
@@ -1034,6 +1042,7 @@ fi:
     digest_topics: "Sähköpostitiivistelmässä näytettävien ketjujen maksimimäärä."
     digest_min_excerpt_length: "Viestin katkelman vähimmäispituus sähköpostitiivistelmässä, merkeissä"
     delete_digest_email_after_days: "Jätä lähettämättä tiivistelmäsähköpostit käyttäjille, joita ei ole nähty (n) päivän aikana."
+    digest_suppress_categories: "Älä liitä näiden alueiden viestejä sähköpostitiivistelmiin."
     disable_digest_emails: "Ota tiivistelmäsähköpostit pois käytöstä kaikilta käyttäjiltä."
     detect_custom_avatars: "Tarkistetaanko, ovatko käyttäjät ladanneet oman profiilikuvan."
     max_daily_gravatar_crawls: "Korkeintaan kuinka monta kertaa Discourse tarkistaa avatarit Gravatarista päivässä"
@@ -1088,6 +1097,7 @@ fi:
     approve_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien viestit tarkastetaan"
     notify_about_queued_posts_after: "Jos hyväksyntää odottavia viestejä on odottanut näin monta tuntia, lähetä sähköposti contact_email osoitteeseen. Aseta 0 ottaaksesi pois käytöstä."
     default_email_digest_frequency: "Kuinka usein käyttäjille lähetetään tiivistelmäsähköposti oletuksena."
+    default_include_tl0_in_digests: "Sisällytä uusien käyttäjien viestit sähköpostitiivistelmiin oletuksena. Tätä voi muuttaa käyttäjäasetuksissa."
     default_email_private_messages: "Lähetä oletuksena sähköposti, kun joku lähettää käyttäjälle viestin."
     default_email_direct: "Lähetä oletuksena sähköposti, kun joku lainaa/vastaa/mainitsee tai kutsuu käyttäjän."
     default_email_mailing_list_mode: "Lähetä oletuksena sähköposti jokaisesta uudesta viestistä."
@@ -1126,7 +1136,7 @@ fi:
       pop3_polling_password_is_empty: "Sinun täytyy asettaa 'pop3 polling password' ennen POP3-pollauksen ottamista käyttöön."
       pop3_polling_authentication_failed: "POP3 autentikaatio epäonnistui. Tarkasta pop3 kirjautumistiedot."
       reply_by_email_address_is_empty: "'reply by email address' täytyy olla asetettuna ennen sähköpostivastausten ottamista käyttöön."
-      pop3_polling_disabled: "POP3 polling täytyy olla asetettuna ennen sähköpostivastausten ottamista käyttöön."
+      user_locale_not_enabled: "'allow user locale' täytyy olla asetettuna ennen tämän asetuksen ottamista käyttöön."
   notification_types:
     group_mentioned: "%{group_name} mainittiin täällä %{link}"
     mentioned: "%{display_username} viittasi sinuun viestissä %{link}"
@@ -1149,10 +1159,10 @@ fi:
       topic: 'Tulokset'
       user: 'Käyttäjät'
   sso:
-    not_found: "Käyttäjätilin hakeminen tai luominen ei onnistunut, ota yhteys järjestelmävalvojaan."
-    account_not_approved: "Tili odottaa hyväksyntää, saat sähköpostiin ilmoituksen kun hyväksyntä on valmis"
-    unknown_error: "Virhe tietojen päivittämisessä, ota yhteyttä järjestelmävalvojaan"
-    timeout_expired: "Kirjautuminen on vanhentunut, ole hyvä ja kirjaudu uudestaan"
+    not_found: "Tiliäsi ei löydetty. Ota yhteyttä sivuston ylläpitäjään."
+    account_not_approved: "Tilisi odottaa hyväksyntää. Saat sähköpostin, kun tunnuksesi on hyväksytty."
+    unknown_error: "Tiliisi liittyen on tapahtunut virhe. Ota yhteyttä sivuston ylläpitäjään."
+    timeout_expired: "Kirjautuminen on vanhentunut, yritä kirjautua sisään uudestaan."
   original_poster: "Alkuperäinen kirjoittaja"
   most_posts: "Eniten viestejä"
   most_recent_poster: "Uusin kirjoittaja"
@@ -1671,12 +1681,6 @@ fi:
         Saadaksesi lisätietoa, tutustu [yhteisön ohjeisiin](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Tili estetty"
-      text_body_template: |
-        Hei,
-
-        Tämä automaattinen viesti on lähetetty sivustolta %{site_name} kertoaksemme, että tilisi on estetty henkilökunnan toimesta.
-
-        Saadaksesi lisätietoa, tutustu [yhteisön ohjeisiin](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "Uusi käyttäjä %{username} on estetty muiden käyttäjien liputuksen perusteella"
       text_body_template: |
@@ -1724,6 +1728,9 @@ fi:
   subject_pm: "[YV]"
   user_notifications:
     previous_discussion: "Edelliset vastaukset"
+    reached_limit:
+      one: "VAROITUS: Olet saavuttanut päivittäisen rajan sähköpostien määrälle. Seuraavia sähköposti-ilmoituksia ei lähetetä."
+      other: "VAROITUS: Sinulle on lähetetty tänään %{count} sähköpostia, joka on päivittäinen raja sähköpostien määrälle. Seuraavia sähköposti-ilmoituksia ei lähetetä."
     in_reply_to: "Vastauksena"
     unsubscribe:
       title: "Peru tilaus"
@@ -1734,51 +1741,53 @@ fi:
     visit_link_to_respond: "Vastaa [vierailemalla ketjussa](%{base_url}%{url})"
     visit_link_to_respond_pm: "Vastaa [vierailemalla ketjussa](%{base_url}%{url})."
     posted_by: "Käyttäjältä %{username} %{post_date}"
+    invited_to_private_message_body: |
+      %{username} kutsui sinut viestiketjuun
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      sivustolla
+
+      > %{site_title} -- %{site_description}
+    invited_to_topic_body: |
+      %{username} kutsui sinut keskusteluun
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      sivustolla
+
+      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} kutsui sinut viestiin '%{topic_title}'"
-      text_body_template: |2
+      text_body_template: |
+        %{header_instructions}
 
-        %{username} kutsui sinut viestiin
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        sivustolla
-
-        > %{site_title} -- %{site_description}
-
-        Seuraa tätä linkkiä nähdäksesi viestin: %{base_url}%{url}
+        ---
+        %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} kutsui sinut yksityiseen keskusteluun '%{topic_title}'"
-      text_body_template: |2
+      text_body_template: |
+        %{header_instructions}
 
-        %{username} kutsui sinut yksityiseen keskusteluun
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        sivustolla
-
-        > %{site_title} -- %{site_description}
-
-        Klikkaa tätä linkkiä nähdäksesi viestin: %{base_url}%{url}
+        ---
+        %{respond_instructions}
     user_invited_to_topic:
       subject_template: "[%{site_name}] %{username} kutsui sinut ketjuun '%{topic_title}'"
-      text_body_template: |2
+      text_body_template: |
+        %{header_instructions}
 
-        %{username} kutsui sinut keskusteluun
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        sivustolla
-
-        > %{site_title} -- %{site_description}
-
-        Seuraa tätä linkkiä nähdäksesi keskustelun: %{base_url}%{url}
+        ---
+        %{respond_instructions}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
@@ -2014,6 +2023,7 @@ fi:
     post_deleted: "kirjoittaja poisti viestin"
     user_suspended: "käyttäjä hyllytettiin"
     already_read: "käyttäjä on jo lukenut tämän viestin"
+    exceeded_limit: "Ylitti max_emails_per_day_per_user"
     message_blank: "viesti on tyhjä"
     message_to_blank: "message.to on tyhjä"
     text_part_body_blank: "text_part.body on tyhjä"
@@ -2139,7 +2149,7 @@ fi:
       <p>
       <ul>
       <li>Otsikon vastaavuudet ovat etusijalla &ndash; jos olet epävarma, etsi otsikkoa</li>
-      <li>Parhaat tulokset saa uniikeilla ja epätavallisilla sanoilla</li>
+      <li>Parhaat tulokset saa uniikeilla ja harvinaisilla sanoilla</li>
       <li>Voit kokeilla etsiä tietyn alueen, ketjun tai käyttäjän viesteistä</li>
       </ul>
       </p>
@@ -2150,8 +2160,8 @@ fi:
       <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:single_user</code></td></tr>
       <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td><code>group:foo</code></td><td><code>badge:foo</code></td><td></td></tr>
       <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
-      <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td colspan=3></td></tr>
-      <tr><td><code>posts_count:num</code></td><td><code>min_age:days</code></td><td><code>max_age:days</code></td> <td colspan=2></td></tr>
+      <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td><code>in:pinned</code></td><td><code>in:unpinned</code></td><td></td></tr>
+      <tr><td><code>posts_count:num</code></td><td><code>before:days or date</code></td><td><code>after:days or date</code></td> <td colspan=2></td></tr>
       </table>
       </p>
       <h3>Esimerkkejä</h3>
@@ -2162,56 +2172,123 @@ fi:
       </ul>
       </p>
   badges:
-    long_descriptions:
-      autobiographer: |
-        Tämä arvomerkki myönnetään, kun täytät käyttäjätietosi ja valitset profiilikuvan. Kertomalla yhteisölle itsestäsi ja mielenkiinnon kohteistasi edistät yhteisöllisyyttä.
-      first_like: |
-        Tämä arvomerkki myönnetään, kun ensimmäistä kertaa tykkäät viestistä klikkaamalla sydänkuvaketta. Tykkääminen on hyvä tapa viestittää yhteisön toiselle jäsenelle, että hänen viestinsä oli kiinnostava, hyödyllinen, osuva tai hauska.  Jakakaa rakkautta!
-      first_link: |
-        Tämä arvomerkki myönnetään, kun ensimmäistä kertaa laitat viestiisi linkin toiseen ketjuun. Linkittämällä autat kanssaihmisiä löytämään kiintoisia keskusteluita osoittamalla aiheiden välisiä yhteyksiä.
-      first_quote: |
-        Tämä arvomerkki myönnetään, kun ensimmäistä kertaa lainaat toista viestiä vastauksessasi. Lainaamalla aiempien viestien olennaiset osat autat pitämään keskustelua raiteillaan.
-      first_share: |
-        Tämä arvomerkki myönnetään, kun ensimmäistä kertaa jaat linkin viestiin tai ketjuun käyttämällä jakokuvaketta. Jakaminen on hyvä tapa esitellä mielenkiintoisia keskusteluja muulle maailmalle ja kasvattaa yhteisöä.
-      read_guidelines: |
-        Tämä arvomerkki myönnetään, kun <a href="/guidelines">luet yhteisön ohjeet</a>. Noudattamalla ja jakamalla näitä yksinkertaisia ohjeita edistät yhteisön turvallisuutta, viihtyisyyttä ja jatkuvuutta.
-      reader: |
-        Tämä arvomerkki myönnetään, kun selaat läpi pitkän keskustelun. Lukeminen on tärkeää. Huolellinen lukeminen auttaa seuraamaan keskustelua ja johdattaa parempiin, kattavampiin vastauksiin.
-      editor: |
-        Tämä arvomerkki myönnetään, kun ensimmäistä kertaa muokkaat viestiäsi. Älä epäröi muokata viestiäsi, jos haluat parannella sitä, korjata pieniä virheitä tai unohdit siitä jotain.
-      first_flag: |
-        Tämä arvomerkki myönnetään, kun liputat viestin. Liputus on tärkeää yhteisön kannalta. Jos havaitset jotakin, mitä valvojien tulisi huomioida
-        älä epäröi liputtaa. Liputuskuvakkeen kautta voi myös lähettää <b>yksityisviestejä</b> toisille käyttäjille.
-      nice_share: |
-        Tämä arvomerkki myönnnetään, kun jaat linkin viestiin ja sen kautta saapuu 25 ulkopuolista vierailijaa. Hienoa työtä! Linkkien jakaminen kiintoisiin keskusteluihin on erinomainen tapa kasvattaa yhteisöä.
-      welcome: |
-        Tämä arvomerkki myönnetään, kun viestisi saa tykkäyksen ensimmäistä kertaa. Onnittelut, olet kirjoittanut jotakin, mitä toinen yhteisön jäsen piti kiinnostavana, osuvana tai hyödyllisenä.
-      anniversary: |
-        Tämä arvomerkki myönnetään, kun olet ollut yhteisömme jäsen vuoden ajan ja lähettänyt sinä aikana ainakin yhden viestin. Kiitos kun olet täällä ja annat panoksesi yhteisön hyväksi!
-      good_share: |
-        Tämä arvomerkki myönnetään, kun jaat linkin viestiin ja sen kautta saapuu 300 ulkopuolista vierailijaa. Hienoa työtä! Olet esitellyt kiintoisan keskustelun <i>suurelle</i> joukolle uusia ihmisiä ja auttanut yhteisöä kasvamaan.
-      great_share: |
-        Tämä arvomerkki myönnetään, kun jaat linkin viestiin ja sen kautta saapuu 100 ulkopuolista vierailijaa. Vau! Olet esitellyt kiintoisan keskustelun <i>valtaisalle</i> joukolle uusia potentiaalisia yhteisön jäseniä ja auttanut suuresti yhteisöä kasvamaan.
-      nice_post: |
-        Tämä arvomerkki myönnetään, kun vastauksesi saa 10 tykkäystä. Hyvää työtä!
-      nice_topic: |
-        Tämä arvomerkki myönnetään, kun avaamasi ketju saa 10 tykkäystä. Hyvää työtä!
-      good_post: |
-        Tämä arvomerkki myönnetään, kun vastauksesi saa 25 tykkäystä. Hienoa työtä!
-      good_topic: |
-        Tämä arvomerkki myönnetään, kun avaamasi ketju saa 25 tykkäystä. Hienoa työtä!
-      great_post: |
-        Tämä arvomerkki myönnetään, kun vastauksesi saa 50 tykkäystä. Vau!
-      great_topic: |
-        Tämä arvomerkki myönnetään, kun avaamasi ketju saa 50 tykkäystä. Vau!
-      basic: |
-        Tämä arvomerkki myönnetään, kun saavutat luottamustason 1. Kiitos kun olet ollut täällä hetken ja lukenut muutamaa ketjua oppiaksesi yhteisöstämme. Uuden käyttäjän rajoituksia on löysätty ja sinulla on käytössäsi kaikki perustoiminnot kuten yksityisviestit, liputtaminen, wiki-viestien muokkaaminen, kuvien liittäminen ja useamman linkin laittaminen.
-      member: |
-        Tämä arvomerkki myönnetään, kun saavutat luottamustason 2. Kiitos, kun olet ollut täällä useamman viikon ajan ja kasvanut yhteisömme jäseneksi. Voit nyt lähettää henkilökohtaisia kutsuja käyttäjäsivultasi ja yksittäisistä ketjuista, lähettää ryhmäviestejä ja tykätä muutaman kerran enemmän päivää kohden.
-      regular: |
-        Tämä arvomerkki myönnetään, kun saavutat luottamustason 3. Kiitos kun olet ollut iso osa yhteisöä viimeisten kuukausien ajan: olet yksi aktiivisimmasta lukijoista ja myötävaikuttanut yhteisön tilaan. Voit nyt siirtää alueelta toiselle ja uudelleennimetä ketjuja, pääset lounge-alueelle, liputuksiesi painoarvo on korkeampi ja voit tykätä monta kertaa enemmän päivää kohden.
-      leader: |
-        Tämä arvomerkki myönnetään, kun saavutat luottamustason 4. Olet palstan henkilökunnan valitsema luottohenkilö. Näytät myönteistä esimerkkiä teollasi ja sanoillasi. Sinulla on nyt oikeudet muokata mitä tahansa viestiä ja muitakin valvojan valtuuksia kuten ketjujen kiinnittäminen, sulkeminen, listauksista poistaminen, arkistoiminen, pilkkominen ja yhdistely. Käytössäsi on myös runsaasti tykkäyksiä päivää kohden.
+    editor:
+      name: Muokkaaja
+      description: Ensimmäinen viestin muokkaus
+      long_description: |
+        Tämä arvomerkki myönnetään, kun ensimmäistä kertaa muokkaat viestiäsi. Viestiä ei voi muokata kuin määrätyn ajan viestin lähettämisen jälkeen, mutta sinä aikana muokkaaminen on aina hyvä ajatus. Voit parannella viestiä, korjata pieniä virheitä tai lisätä jotakin, mikä pääsi unohtumaan viestin kirjoittamisen hetkellä. Muokkaa viesteistäsi entistäkin parempia!
+    basic_user:
+      name: Haastaja
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Myönnetty</a> kaikki palstan välttämättömimmät toiminnot
+      long_description: |
+        Tämä arvomerkki myönnetään, kun nouset luottamustasolle 1. Kiitos siitä, että olet päättänyt antaa palstalle mahdollisuuden ja lukenut muutamaa ketjua ottaaksesi selvää, mistä yhteisössä on kyse. Uuden käyttäjän rajoituksia on nyt poistettu; sait käyttöösi välttämättömimmät palstan toiminnot kuten yksityisviestit, liputtamisen, wiki-viestien muokkaamisen ja oikeuden laittaa viestiin useampia kuvia ja linkkejä.
+    member:
+      name: Konkari
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Myönnetty</a> kutsut, ryhmäviestit ja lisää tykkäyksiä
+      long_description: |
+        Tämä arvomerkki myönnetään, kun nouset luottamustasolle 2. Kiitos siitä, että olet ollut keskuudessamme viikkojen ajan ja tullut osaksi yhteisöä. Voit nyt lähettää kutsuja käyttäjäsivultasi ja ketjuista, luoda ryhmäviestejä ja käytössäsi on muutama tykkäys enemmän päivää kohden.
+    regular:
+      name: Mestari
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Myönnetty</a> ketjujen siirto toiselle alueelle ja uudelleen nimeäminen, hakukoneiden seuraamat linkit, wiki-viestit ja lisää tykkäyksiä
+    leader:
+      name: Johtaja
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Myönnetty</a> minkä tahansa viestin muokkaaminen, kiinnittäminen, sulkeminen, arkistoiminen, pilkkominen ja yhdistäminen ja lisää tykkäyksiä
+    welcome:
+      name: Tervetuloa
+      description: Sai tykkäyksen
+    autobiographer:
+      name: Omaelämäkerta
+      description: Täytti <a href="/my/preferences">käyttäjätiedot</a>
+    anniversary:
+      name: Vuosipäivä
+      description: Aktiivinen jäsen vuoden ajan, kirjoittanut ainakin yhden viestin
+    nice_post:
+      name: Hyvä vastaus
+      description: Vastaus sai 10 tykkäystä
+    good_post:
+      name: Erinomainen vastaus
+      description: Vastaus sai 25 tykkäystä
+    great_post:
+      name: Loistava vastaus
+      description: Vastaus sai 50 tykkäystä
+    nice_topic:
+      name: Hyvä ketju
+      description: Ketjunavaus sai 10 tykkäystä
+    good_topic:
+      name: Erinomainen ketju
+      description: Ketjunavaus sai 25 tykkäystä
+    great_topic:
+      name: Loistava ketju
+      description: Ketjunavaus sai 50 tykkäystä
+    nice_share:
+      name: Hyvä jako
+      description: Jakoi viestin, ja linkin kautta saapui 25 vierailijaa
+    good_share:
+      name: Erinomainen jako
+      description: Jakoi viestin, ja linkin kautta saapui 300 vierailijaa
+    great_share:
+      name: Loistava jako
+      description: Jakoi viestin, ja linkin kautta saapui 1000 vierailijaa
+    first_like:
+      name: Ensimmäinen tykkäys
+      description: Tykkäsi viestistä
+    first_flag:
+      name: Ensimmäinen liputus
+      description: Liputti viestin
+    promoter:
+      name: Markkinoija
+      description: Kutsui käyttäjän
+    campaigner:
+      name: Kampanjoija
+      description: Kutsui kolme haastajaa (luottamustaso 1)
+    champion:
+      name: Kampanjapäällikkö
+      description: Kutsui viisi konkaria (luottamustaso 2)
+    first_share:
+      name: Ensimmäinen jako
+      description: Jakoi viestin
+    first_link:
+      name: Ensimmäinen linkki
+      description: Linkitti toiseen ketjuun
+    first_quote:
+      name: Ensimmäinen lainaus
+      description: Lainasi viestiä
+    read_guidelines:
+      name: Luki ohjeet
+      description: Luki <a href="/guidelines">palstan säännöt</a>
+    reader:
+      name: Lukutoukka
+      description: Luki jokaisen viestin ketjusta, jossa on enemmän kuin 100 vastausta
+    popular_link:
+      name: Suosittu linkki
+      description: Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 50 kertaa
+    hot_link:
+      name: Kuuma linkki
+      description: Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 300 kertaa
+    famous_link:
+      name: Kuuluisa linkki
+      description: Linkitti ulkoiselle sivustolle, ja linkkiä klikattiin 1000 kertaa
+    appreciated:
+      name: Arvostettu
+      description: 20 viestiä sai tykkäyksen
+    respected:
+      name: Kunnioitettu
+      description: 100 viestiä sai ainakin 2 tykkäystä
+    admired:
+      name: Ihailtu
+      description: 300 viestiä sai ainakin 5 tykkäystä
+    out_of_love:
+      name: Rakkauden rajat
+      description: Tykkäsi 50 kertaa päivän aikana
+    thank_you:
+      name: Kiitos
+      description: 20 viestistä on tykätty ja on tykännyt 10 viestistä
+    gives_back:
+      name: Vastavuoroinen
+      description: 100 viestistä on tykätty ja on tykännyt 100 viestistä
+    empathetic:
+      name: Empaattinen
+      description: 500 viestistä on tykätty ja on tykännyt 1000 viestistä
   admin_login:
     success: "Sähköposti lähetetty"
     error: "Virhe!"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 5c8cdf7256..355c0edc42 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -919,17 +919,9 @@ fr:
     tl2_requires_likes_received: "Combien de J'aime un utilisateur doit recevoir pour être promu au niveau de confiance 2."
     tl2_requires_likes_given: "Combien de J'aime un utilisateur doit donner pour être promu au niveau de confiance 2."
     tl2_requires_topic_reply_count: "A combien de sujet un utilisateur doit avoir participé pour être promu au niveau de confiance 2."
-    tl3_time_period: "Période de temps requis pour Niveaux de confiance 3"
-    tl3_requires_days_visited: "Nombre minimum de jours qu'un utilisateur doit avoir passer sur le site dans les 100 derniers jours pour être éligible au niveau de confiance 3. Fixer à plus que la période TL3 pour désactiver les promotions (0 ou plus)"
-    tl3_requires_topics_replied_to: "Nombre minimum de sujets auquel un utilisateur doit avoir répondu dans les 100 derniers jours pour être promu au niveau de confiance 3. (0 à 100)"
-    tl3_requires_topics_viewed: "Pourcentage de sujets crées dans les 100 derniers jours qu'un utilisateur doit avoir vu pour être promu au niveau de confiance 3. (0 à 100)"
-    tl3_requires_posts_read: "Pourcentage de message crées dans les 100 derniers jours qu'un utilisateur doit avoir vu pour être promu au niveau de confiance 3. (0 à 100)"
     tl3_requires_topics_viewed_all_time: "Nombre minimum de sujets qu'un utilisateur doit avoir vu pour être promu au niveau de confiance 3."
     tl3_requires_posts_read_all_time: "Nombre minimum de messages qu'un utilisateur doit avoir vu pour être promu au niveau de confiance 3."
-    tl3_requires_max_flagged: "L'utilisateur ne doit pas avoir plus de x messages signalés par x utilisateurs différents dans les 100 derniers jours pour être promu au niveau de confiance 3; x étant la valeur de ce paramètre. (0 ou plus)"
     tl3_promotion_min_duration: "Nombre minimum de jours qu'un utilisateur restera promu au niveau de confiance 3 avant de pouvoir être rétrogradé au niveau de confiance 2."
-    tl3_requires_likes_given: "Nombre minimum de J'aime à donner dans les 100 derniers jours pour être promu au niveau de confiance 3."
-    tl3_requires_likes_received: "Nombre minimum de J'aime à recevoir dans les 100 derniers jours pour être promu au niveau de confiance 3."
     tl3_links_no_follow: "Ne pas retirer rel=nofollow sur les liens des messages par les utilisateurs de niveau de confiance 3."
     min_trust_to_create_topic: "Le niveau de confiance minimum pour créer un nouveau sujet."
     min_trust_to_edit_wiki_post: "Le niveau de confiance minimum requis pour modifier les messages de type wiki."
@@ -944,7 +936,6 @@ fr:
     max_users_notified_per_group_mention: "Nombre maximum d'utilisateurs qui peuvent recevoir une notification si un groupe est mentionné (si le seuil est atteint aucune notification n'est envoyée)"
     create_thumbnails: "Créer un aperçu pour les images imbriquées qui sont trop large pour le message."
     email_time_window_mins: "Attendre (n) minutes avant l'envoi des courriels de notification, afin de laisser une chance aux utilisateurs de modifier ou finaliser leurs messages."
-    private_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer les notifications par courriel, afin de laisser aux utilisateurs l'opportunité de modifier leurs messages."
     email_posts_context: "Combien de réponses précédentes doit-on inclure dans les courriels de notifications pour situer le contexte."
     flush_timings_secs: "A quelle fréquence les données de timing doivent être vider, en secondes."
     title_max_word_length: "Le nombre maximum de caractères dans le titre d'un sujet."
@@ -1046,7 +1037,6 @@ fr:
     disable_avatar_education_message: "Désactiver le message incitant à changer l'avatar."
     daily_performance_report: "Analyser les logs de NGINX quotidiennement et poster un sujet Responsables Uniquement avec les détails"
     suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets non catégorisés dans les listes des sujets."
-    permalink_normalizations: "Appliquer l'expression régulière suivante avant de faire correspondre les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les query strings des routes des sujets. Le format est regex+string, utilisez \\1 etc. pour accéder aux captures"
     global_notice: "Affiche un bandeau global URGENT pour tout les utilisateurs du site, laissez vide pour le cacher (HTML autorisé)."
     disable_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée."
     automatically_unpin_topics: "Désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin."
@@ -1143,11 +1133,6 @@ fr:
       category: 'Catégories'
       topic: 'Résultats'
       user: 'Utilisateurs'
-  sso:
-    not_found: "Impossible de rechercher ou de créer un compte, contacter l'administrateur du site"
-    account_not_approved: "Le compte est en attente d'approbation. Vous recevrez un avis par courriel une fois approuvé."
-    unknown_error: "Erreur de mise à jour des informations, contacter l'administrateur du site"
-    timeout_expired: "La connexion au compte a été interrompue, veuillez vous connecter à nouveau"
   original_poster: "Créateur du sujet"
   most_posts: "Le plus de messages"
   most_recent_poster: "Auteur le plus récent"
@@ -1473,8 +1458,6 @@ fr:
 
         Si un commentaire vous pose problème, prévenez soit son auteur en privé, soit [l'équipe de modération](%{base_url}/about) grâce au bouton **drapeau**.
 
-        Vous pouvez aussi partager un lien vers une contribution ou lui mettre un signet afin de la retrouver plus tard dans votre page utilisateur.
-
         ## Notifications
 
         Quand quelqu'un vous répond, vous cite ou mentionne votre `@pseudo`, un numéro apparaîtra immédiatement en haut à droite de la page. Cliquez dessus pour accéder à vos **notifications**.
@@ -1686,12 +1669,6 @@ fr:
         Pour plus d'informations, merci de vous en référer à la [charte de la communauté](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Compte bloqué"
-      text_body_template: |
-        Bonjour,
-
-        Ceci est un message automatique de %{site_name} pour vous informer que vos messages ont été bloqués par un membre de l'équipe.
-
-        Pour plus d'informations, merci de vous en référer à la [charte de la communauté](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "Nouvel utilisateur %{username} bloqué à cause de signalements de la communauté"
       text_body_template: |
@@ -1744,25 +1721,10 @@ fr:
     posted_by: "Ecrit par %{username} le %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} vous a invité dans la conversation '%{topic_title}'"
-      text_body_template: "\n%{username} vous a invité dans un message\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nsur \n\n> %{site_title} -- %{site_description}\n\nVeuillez suivre ce lien pour voir le message: %{base_url}%{url}\n"
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} vous a invité à voir un message '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} vous a invité à voir un message
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        à
-
-        > %{site_title} -- %{site_description}
-
-        Veuillez suivre ce lien pour consulter le message: %{base_url}%{url}
     user_invited_to_topic:
       subject_template: "[%{site_name}] %{username} vous a invité dans le sujet '%{topic_title}'"
-      text_body_template: "\n%{username} vous a invité à une conversation\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nsur \n\n> %{site_title} -- %{site_description}\n\nVeuillez suivre ce lien pour voir le message: %{base_url}%{url}\n"
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
@@ -2096,55 +2058,11 @@ fr:
 
       Si nous décidons de changer notre politique de confidentialité, nous afficherons ces modifications sur cette page. Ce document est soumis à la licence creative commons CC-BY-SA. Il a été mis à jour le 31 mai 2013.
   badges:
-    long_descriptions:
-      autobiographer: |
-        Ce badge est accordé au remplissage de <a href="/my/preferences">votre profil utilisateur</a> et au choix d'une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée.
-      first_like: |
-        Ce badge est accordé la première fois que vous aimez un message en utilisant le bouton :heart:. Aimer des messages est le moyen parfait pour dire aux autres membres de la communauté que ce qu'ils ont posté était intéressant, utile, cool, ou amusant.
-      first_link: |
-        Ce badge est accordé la première fois que vous placez un lien vers un autre sujet dans une de vos réponses. Lier des sujets aide les autres lecteurs à trouver des conversations proches potentiellement intéressantes, en montrant les connexions entre sujets dans les deux directions.
-      first_quote: |
-        Ce badge est accordé la première fois que vous citez un message dans une de vos réponses. Citer des passages pertinents des messages précédents dans votre réponse aide à garder les discussions ciblées et à rester dans le sujet.
-      first_share: |
-        Ce badge est accordé la première fois que vous partagez un lien vers une réponse ou un sujet en utilisant le bouton de partage. Partager des liens est un très bon moyen de diffuser des discussions intéressantes auprès du reste du monde et de faire grandir votre communauté.
-      read_guidelines: |
-        Ce badge est accordé après <a href="/guidelines">lecture de la charte de la communauté</a>. Respecter et partager ces règles simples permet de construire une communauté sure, agréable et durable.
-      reader: |
-        Ce badge est accordé après lecture d'un long sujet. Lire est fondamental. Lire attentivement vous aide à suivre une conversation et mène à des réponses meilleures et plus complètes.
-      editor: |
-        Ce badge est accordé après édition d'un de vos messages. N'hésitez pas à éditer vos messages à n'importe quel moment pour les améliorer, corriger de petites erreurs, ou ajouter quelque chose que vous auriez oublié.
-      first_flag: |
-        Ce badge est accordé après signalement d'un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Vous pouvez aussi utiliser les boîtes de dialogue de signalement pour envoyer des <b>messages</ba> à d'autres utilisateurs.
-      nice_share: |
-        Ce badge est accordé après le partage d'un lien vers un message consulté par 25 visiteurs extérieurs. Bien joué ! Partager des liens vers des discussions intéressantes auprès de vos amis est un excellent moyen de faire grandir votre communauté.
-      welcome: |
-        Ce badge est accordé lorsque vous recevez votre premier "J'aime" sur un de vos messages. Félicitations, vous avez écrit quelque chose que les membres de votre communauté ont trouvé intéressant, cool, ou utile !
-      anniversary: |
-        Ce badge est accordé après avoir été membre du site pendant une année, avec au moins un message crée. Merci d'être resté avec nous et de contribuer ainsi à notre communauté !
-      good_share: |
-        Ce badge est accordé après le partage d'un lien vers un message consulté par 300 visiteurs extérieurs. Bon travail ! Vous avez diffusé une discussion intéressante à <i>beaucoup</i> de nouvelles personnes et nous avez aidés à grandir.
-      great_share: |
-        Ce badge est accordé après le partage d'un lien vers un message consulté par 100 visiteurs extérieurs. Wow ! Vous avez fait la promotion d'une discussion intéressante auprès d'une énorme nouvelle audience pour le compte de cette communauté, et nous avez beaucoup aidé à grandir.
-      nice_post: |
-        Ce badge est accordé après la création d'une réponse ayant reçu 10 "J'aime". Bien joué !
-      nice_topic: |
-        Ce badge est accordé après la création d'un sujet ayant reçu 10 "J'aime". Bien joué !
-      good_post: |
-        Ce badge est accordé après la création d'une réponse ayant reçu 25 "J'aime". Bon travail !
-      good_topic: |
-        Ce badge est accordé après la création d'un sujet ayant reçu 25 "J'aime". Bon travail !
-      great_post: |
-        Ce badge est accordé après la création d'un message ayant reçu 50 "J'aime". Wow !
-      great_topic: |
-        Ce badge est accordé après la création d'une réponse ayant reçu 50 "J'aime". Wow !
-      basic: |
+    basic_user:
+      name: Actif
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Accordé</a>  toutes les fonctions communautaires essentielles sont accessibles
+      long_description: |
         Ce badge est accordé lorsque vous atteignez le niveau de confiance 1. Merci d'être resté dans le coin un petit moment et d'avoir lu quelques sujets pour en apprendre plus sur notre communauté. Vos restrictions "nouvel utilisateur" ont été levées, et vous avez accès aux fonctionnalités essentielles telles que la messagerie personnelle, le signalement, l'édition des wikis, et la possibilité de poster des images et de multiples liens.
-      member: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, des messages groupés, et quelques "J'aime" supplémentaires chaque jour.
-      regular: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 3. Merci d'avoir été un participant régulier à notre communauté pendant ces quelques mois, l'un de nos lecteurs les plus actifs et un contributeur sérieux à ce qui rend notre communauté si belle. Vous pouvez désormais recatégoriser et renommer des sujets, accéder à la section privée, signaler des spams, et vous avez plein de "J'aime" en plus chaque jour.
-      leader: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité d'éditer tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et réunir, ainsi que des tonnes de "J'aime" par jour.
   admin_login:
     success: "Courriel envoyé"
     error: "Erreur !"
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
new file mode 100644
index 0000000000..ec595498c7
--- /dev/null
+++ b/config/locales/server.gl.yml
@@ -0,0 +1,484 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "D MMMM, YYYY h:mm a"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%d-%m-%Y"
+      short_no_year: "%-d de %B"
+      date_only: "%-d de %B, %Y"
+  date:
+    month_names: [null, Xaneiro, Febreiro, Marzo, Abril, Maio, Xuño, Xullo, Agosto, Setembro, Outubro, Novembro, Decembro]
+    <<: *datetime_formats
+  title: "Discourse"
+  topics: "Temas"
+  posts: "publicacións"
+  loading: "Cargndo"
+  log_in: "Iniciar sesión"
+  anonymous: "Anónimo"
+  errors: &errors
+    format: '%{attribute} %{message}'
+    messages:
+      taken: "xa está en uso"
+      accepted: debe ser aceptado
+      blank: non pode quedar baleiro
+      present: debe quedar baleiro
+      confirmation: "%{attribute} non coincide"
+      empty: non pode quedar baleiro
+      equal_to: debe ser igual a %{count}
+      exclusion: está reservado
+      greater_than: debe ser maior de %{count}
+      greater_than_or_equal_to: debe ser igual ou maior de %{count}
+      has_already_been_used: "xa está en uso"
+      inclusion: no está incluído na lista
+      invalid: é incorrecto
+      less_than: debe ser menor de %{count}
+      less_than_or_equal_to: debe ser igual ou menor de %{count}
+      not_a_number: non é un número
+      not_an_integer: debe ser un enteiro
+      odd: debe ser impar
+      record_invalid: 'Fallou a validación: %{errors}'
+      restrict_dependent_destroy:
+        one: "Non é posíbel eliminalo porque existe outro %{record} dependente"
+        many: "Non é posíbel eliminalo porque existen outros %{record} dependentes"
+      too_long:
+        one: demasiado longo (máximo un caracterer)
+        other: demasiado longo (máximo %{count} caracteres)
+      too_short:
+        one: demasiado curto (mínimo un caracter)
+        other: demasiado curto (mínimo %{count} caracteres)
+      other_than: "debe ser distinto de %{count}"
+    template:
+      body: 'Producíronse problemas cos seguintes campos:'
+    embed:
+      load_from_remote: "Produciuse un erro cargando esta publicación."
+    site_settings:
+      min_username_length_range: "O mínimo non pode ser maior que o máximo."
+  not_logged_in: "Debes iniciar sesión para facer iso."
+  not_found: "Non foi posíbel atopar o recurso ou URL solicitado."
+  invalid_access: "Non se che permite ver o recurso solicitado."
+  read_only_mode_enabled: "O sitio está en modo só-lectura. As interaccións están desactivadas."
+  reading_time: "Tempo de lectura"
+  likes: "Gústames"
+  embed:
+    start_discussion: "Comezar a discusión"
+    continue: "Continuar a discusión"
+    more_replies:
+      one: "Unha resposta máis"
+      other: "%{count} respostas máis"
+    loading: "Cargando a discusión..."
+    permalink: "Ligazón permanente"
+    in_reply_to: "▶ %{username}"
+    replies:
+      one: "Unha resposta"
+      other: "%{count} respostas"
+  no_mentions_allowed: "Sentímolo pero non podes mencionar outros usuarios"
+  has_already_been_used: "xa está en uso"
+  invalid_characters: "contén caracteres incorrectos"
+  next_page: "páxina seguinte →"
+  prev_page: "← páxina anterior"
+  page_num: "Páxina %{num}"
+  home_title: "Inicio"
+  rss_posts_in_topic: "Fonte RSS de '%{topic}»"
+  author_wrote: "%{author} escribiu:"
+  num_posts: "Publicacións:"
+  num_participants: "Participantes:"
+  read_full_topic: "Ler todo o tema"
+  private_message_abbrev: "Msx."
+  rss_description:
+    latest: "Últimos temas"
+    hot: "Temas quentes"
+    posts: "Últimas publicacións"
+  too_late_to_edit: "Esta publicación ten moito tempo. Xa non se pode modificar nin eliminar."
+  excerpt_image: "imaxe"
+  queue:
+    delete_reason: "Eliminación por medio da cola de moderación de publicacións"
+  groups:
+    default_names:
+      everyone: "todos"
+      admins: "administradores"
+      moderators: "moderadores"
+      staff: "equipo"
+      trust_level_0: "nivel_de_confianza_0"
+      trust_level_1: "nivel_de_confianza_1"
+      trust_level_2: "nivel_de_confianza_2"
+      trust_level_3: "nivel_de_confianza_3"
+      trust_level_4: "nivel_de_confianza_4"
+  education:
+    until_posts:
+      one: "Unha publicación"
+      other: "%{count} publicacións"
+  activerecord:
+    attributes:
+      category:
+        name: "Nome da categoría"
+      post:
+        raw: "Corpo"
+      user_profile:
+        bio_raw: "Verbo de min"
+    errors:
+      models:
+        topic:
+          attributes:
+            base:
+              warning_requires_pm: "Só podes anexar avisos a mensaxes privadas."
+              no_user_selected: "Debes seleccionar un usuario correcto."
+        user:
+          attributes:
+            password:
+              common: "é un dos 10000 contrasinais máis habituais. Usa un máis seguro."
+              same_as_username: "é igual ao teu nome de usuario. Usa un contrasinal máis seguro."
+              same_as_email: "é igual ao teu correo electrónico. Usa un contrasinal máis seguro."
+            ip_address:
+              signup_not_allowed: "Non esta permitido rexistrarse desde esta conta."
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "non é unha cor válida"
+      <<: *errors
+  vip_category_name: "Taberna"
+  vip_category_description: "Unha categoría exclusiva para membros cun nivel de confianza igual ou maior a 3."
+  meta_category_name: "Opinións sobre o sitio"
+  meta_category_description: "Discusións sobre este sitio, a súa organización, como funciona e como se pode mellorar."
+  staff_category_name: "Equipo"
+  staff_category_description: "Categoría privada para discusións do equipo. Os temas son visíbeis unicamente para administradores e moderadores."
+  lounge_welcome:
+    title: "Benvido/a á Taberna"
+  category:
+    topic_prefix: "Sobre a categoría %{category}"
+    errors:
+      depth: "Non podes aniñar unha subcategoría dentro doutra"
+  trust_levels:
+    newuser:
+      title: "novo usuario"
+    basic:
+      title: "usuario básico"
+    member:
+      title: "membro"
+    regular:
+      title: "normal"
+    leader:
+      title: "líder"
+  rate_limiter:
+    hours:
+      one: "Unha hora"
+      other: "%{count} horas"
+  datetime:
+    distance_in_words:
+      half_a_minute: "< 1m"
+      less_than_x_seconds:
+        one: "< 1s"
+        other: "< %{count}s"
+      x_seconds:
+        one: "1s"
+        other: "%{count}s"
+      less_than_x_minutes:
+        one: "< 1m"
+        other: "< %{count}m"
+      about_x_hours:
+        one: "1h"
+        other: "%{count}h"
+      x_days:
+        one: "1d"
+        other: "%{count}d"
+      about_x_months:
+        one: "1mes"
+        other: "%{count}mes"
+      x_months:
+        one: "1mes"
+        other: "%{count}mes"
+      about_x_years:
+        one: "1ano"
+        other: "%{count}ano"
+      over_x_years:
+        one: "> 1ano"
+        other: "> %{count}ano"
+      almost_x_years:
+        one: "1ano"
+        other: "%{count}ano"
+    distance_in_words_verbose:
+      half_a_minute: "agora mesmiño"
+  password_reset:
+    choose_new: "Selecciona un novo contrasinal"
+    choose: "Selecciona un contrasinal"
+    update: 'Actualizar contrasinal'
+    save: 'Estabelecer o contrasinal'
+    title: 'Contrasinal restabelecido'
+    continue: "Continuar a %{site_name}"
+  change_email:
+    confirmed: "O teu correo electrónico foi actualizado."
+    please_continue: "Continuar a %{site_name}"
+    error: "Produciuse un erro cambiando o enderezo de correo electrónico. Quizais xa está en uso?"
+  activation:
+    action: "Preme aquí para activar a conta"
+    continue_button: "Continuar a %{site_name}"
+    welcome_to: "Benvido/a a %{site_name}!"
+  post_action_types:
+    off_topic:
+      title: 'Sen-relación'
+      long_form: 'marcou isto como non relacionado'
+    spam:
+      title: 'Spam'
+      long_form: 'denunciou isto como spam'
+    inappropriate:
+      title: 'Inapropiado'
+      long_form: 'denunciou isto como inapropiado'
+    notify_moderators:
+      title: "Algo máis"
+      description: 'Esta publicación require a atención dos responsábeis do sitio por unha razón non listada arriba.'
+      long_form: 'denunciou isto para revisión polo equipo'
+      email_title: 'Unha publicación en «%{title}» require a atención dos responsábeis do sitio'
+    bookmark:
+      title: 'Marcador'
+      description: 'Marcar esta publicación'
+      long_form: 'Marcar este tema'
+    like:
+      title: 'Gústame'
+      description: 'Gústame esta publicación'
+      long_form: 'gustoume isto'
+    vote:
+      title: 'Votar'
+      description: 'Votar por esta publicación'
+      long_form: 'votei esta publicación'
+  topic_flag_types:
+    spam:
+      title: 'Spam'
+      long_form: 'denunciou isto como spam'
+    inappropriate:
+      title: 'Inapropiado'
+      long_form: 'denunciou isto como inapropiado'
+    notify_moderators:
+      title: "Algo máis"
+      long_form: 'denunciou isto para revisión por un moderador'
+  archetypes:
+    regular:
+      title: "Tema normal"
+    banner:
+      title: "Tema do báner"
+  unsubscribed:
+    title: 'Dado de baixa'
+    description: "Démoste de baixa. Non contactaremos contigo de novo."
+  resubscribe:
+    action: "Re-subscribir"
+    title: "Subscrito de novo"
+    description: "Subscribícheste de novo"
+  reports:
+    visits:
+      title: "Visitas de usuarios"
+      xaxis: "Día"
+      yaxis: "Número de visitas"
+    signups:
+      title: "Novos usuarios"
+      xaxis: "Día"
+      yaxis: "Número de novos usuarios"
+    profile_views:
+      title: "Vistas dos perfís de usuario"
+      xaxis: "Día"
+      yaxis: "Número de perfís de usuario vistos"
+    topics:
+      title: "Temas"
+      xaxis: "Día"
+      yaxis: "Número de temas vistos"
+    posts:
+      title: "Publicacións"
+      xaxis: "Día"
+      yaxis: "Número de novas publicacións"
+    likes:
+      title: "Gústames"
+      xaxis: "Día"
+      yaxis: "Número de novos gústames"
+    flags:
+      title: "Denuncias"
+      xaxis: "Día"
+      yaxis: "Número de denuncias"
+    bookmarks:
+      title: "Marcadores"
+      xaxis: "Día"
+      yaxis: "Número de novos marcadores"
+    starred:
+      title: "Con estrela"
+      xaxis: "Día"
+      yaxis: "Número de novos temas con estrela"
+    users_by_trust_level:
+      title: "Usuarios por nivel de confianza"
+      xaxis: "Nivel de confianza"
+      yaxis: "Número de usuarios"
+    emails:
+      title: "Correos-e enviados"
+      xaxis: "Día"
+      yaxis: "Número de correos-e enviados"
+    user_to_user_private_messages:
+      title: "Entre usuarios"
+      xaxis: "Día"
+      yaxis: "Número de mensaxes"
+    system_private_messages:
+      title: "Sistema"
+      xaxis: "Día"
+      yaxis: "Número de mensaxes"
+    moderator_warning_private_messages:
+      title: "Avisos dun moderador"
+      xaxis: "Día"
+      yaxis: "Número de mensaxes"
+    notify_moderators_private_messages:
+      title: "Notificacións os moderadores"
+      xaxis: "Día"
+      yaxis: "Número de mensaxes"
+    notify_user_private_messages:
+      title: "Notificacións os usuarios"
+      xaxis: "Día"
+      yaxis: "Número de mensaxes"
+    top_referrers:
+      xaxis: "Usuario"
+      num_clicks: "Clics"
+      num_topics: "Temas"
+    top_traffic_sources:
+      title: "As maiores fontes de tráfico"
+      xaxis: "Dominio"
+      num_clicks: "Clics"
+      num_topics: "Temas"
+      num_users: "Usuarios"
+    top_referred_topics:
+      xaxis: "Tema"
+      num_clicks: "Clics"
+    page_view_anon_reqs:
+      title: "Anónimo"
+      xaxis: "Día"
+      yaxis: "Peticións API anónimas"
+    page_view_logged_in_reqs:
+      title: "Sesión iniciada"
+      xaxis: "Día"
+    page_view_crawler_reqs:
+      title: "Extractores web"
+      xaxis: "Día"
+      yaxis: "Peticións API dos extractores web"
+    page_view_total_reqs:
+      title: "Total"
+      xaxis: "Día"
+      yaxis: "Total de peticións API"
+    page_view_logged_in_mobile_reqs:
+      xaxis: "Día"
+    page_view_anon_mobile_reqs:
+      xaxis: "Día"
+    http_background_reqs:
+      title: "Fondo"
+      xaxis: "Día"
+      yaxis: "Peticións usadas para actualizacións e seguimentos"
+    http_2xx_reqs:
+      title: "Estado 2xx (OK)"
+      xaxis: "Día"
+      yaxis: "Peticións con éxito (estado 2xx)"
+    http_3xx_reqs:
+      title: "HTTP 3xx (redireccionar)"
+      xaxis: "Día"
+      yaxis: "Redireccionar peticións (estado 3xx)"
+    http_4xx_reqs:
+      title: "HTTP 4xx (erro do cliente)"
+      xaxis: "Día"
+      yaxis: "Erros do cliente (estado 4xx)"
+    http_5xx_reqs:
+      title: "HTTP 5xx (erro do servidor)"
+      xaxis: "Día"
+    http_total_reqs:
+      title: "Total"
+      xaxis: "Día"
+    time_to_first_response:
+      xaxis: "Día"
+    topics_with_no_response:
+      xaxis: "Día"
+      yaxis: "Total"
+    mobile_visits:
+      title: "Visitas de usuarios"
+      xaxis: "Día"
+      yaxis: "Número de visitas"
+  site_settings:
+    delete_old_hidden_posts: "Eliminar automaticamente as publicacións ocultas durante máis de 30 días."
+    default_locale: "Idioma predeterminado desta instancia (código ISO 639-1)"
+    allow_user_locale: "Permitir os usuarios escoller o idioma da interface"
+    min_post_length: "Número mínimo de caracteres permitido para unha publicación"
+    min_first_post_length: "Número mínimo de caracteres (corpo do tema) permitido para unha primeira publicación"
+    min_private_message_post_length: "Número mínimo de caracteres permitido para unha mensaxe"
+    max_post_length: "Número máximo de caracteres permitido para unha publicación"
+    post_undo_action_window_mins: "Número de minutos que os usuarios teñen para desfacer accións recentes nunha publicación (gústames, denuncias, etc)."
+    enable_badges: "Activar o sistema de insignias"
+    max_flags_per_day: "Número máximo de denuncias por usuario e día."
+    category_style: "Estilo visual para as insignias de categoría."
+    enable_user_directory: "Proporcionar un directorio de usuarios para navegación"
+    allow_anonymous_posting: "Permitir os usuarios cambiar ao modo anónimo"
+    suppress_uncategorized_badge: "Non mostrar a insignia para temas sen categoría nas listas de temas."
+    automatically_unpin_topics: "Despegar os temas automaticamente cando o usuario chega ao fondo."
+    full_name_required: "O nome completo no perfil do usuario é obrigatorio."
+    embed_username_key_from_feed: "Clave para recuperar o nome do usuario desde a fonte."
+    enable_emoji: "Activar emojis"
+  notification_types:
+    liked: "A %{display_username} gustoulle a túa publicación en %{link}"
+  search:
+    types:
+      category: 'Categorías'
+      user: 'Usuarios'
+  frequent_poster: "Publicador frecuente"
+  redirected_to_top_reasons:
+    new_user: "Benvido/a á nosa comunidade. Estes son os temas recentes máis populares."
+  login:
+    admin_not_allowed_from_ip_address: "Non podes acceder como administrador desde este enderezo IP."
+    new_registrations_disabled: "Neste momento non se permite o rexistro de novas contas."
+  flags_dispositions:
+    agreed: "Grazas por comunicárnolo. Estamos de acordo en que hai un problema e estamos botándolle un ollo."
+    agreed_and_deleted: "Grazas por comunicárnolo. Estamos de acordo en que hai un problema e xa eliminamos a publicación."
+    disagreed: "Grazas por comunicárnolo. Estamos botándolle un ollo."
+    deferred: "Grazas por comunicárnolo. Estamos botándolle un ollo."
+    deferred_and_deleted: "Grazas por comunicárnolo. Xa eliminamos a publicación."
+  temporarily_closed_due_to_flags: "Este tema está pechado temporalmente polo gran número de denuncias da comunidade."
+  system_messages:
+    post_hidden:
+      subject_template: "Publicación oculta polas denuncias da comunidade."
+    welcome_user:
+      subject_template: "Benvido/a a %{site_name}!"
+      text_body_template: |
+        Grazas por unirte %{site_name}, e benvido/a!
+
+        %{new_user_tips}
+
+        Cremos nun [comportamento civilizado da comunidade](%{base_url}/guidelines) en todo momento.
+
+        Goza da túa estancia!
+
+        (Se precisas comunicarte cos [membros do equipo](%{base_url}/about) como novo usuario responde a esta mensaxe.)
+    welcome_invite:
+      subject_template: "Benvido/a a %{site_name}!"
+    backup_succeeded:
+      subject_template: "A copia de seguranza completouse correctamente"
+    bulk_invite_succeeded:
+      subject_template: "O convite en bloque procesouse correctamente"
+    csv_export_succeeded:
+      subject_template: "Completouse a exportación dos datos"
+  page_not_found:
+    see_more: "Máis"
+    search_google: "Google"
+  terms_of_service:
+    title: "Termos do servizo"
+  about: "Sobre"
+  guidelines: "Directrices"
+  privacy: "Confidencialidade"
+  csv_export:
+    boolean_yes: "Si"
+    boolean_no: "Non"
+  tos_topic:
+    title: "Termos do servizo"
+  privacy_topic:
+    title: "Política de intimidade"
+  admin_login:
+    error: "Erro!"
+    submit_button: "Enviar correo-e"
+  time:
+    <<: *datetime_formats
+  activemodel:
+    errors:
+      <<: *errors
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index ddec7d6c5f..1674c98ce0 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -264,7 +264,6 @@ he:
       uncategorized_parent: "נטול קטגוריה לא יכול להיות עם קטגוריית אם"
       self_parent: "קטגוריית אם לא יכולה להיות הקטגוריה עצמה"
       depth: "לא ניתן להניח תת-קטגוריה תחת תת-קטגוריה אחרת"
-      email_in_already_exist: "דוא\"ל '%{email_in}'  כבר בשימוש עבור קטגוריה '%{category_name}' ."
     cannot_delete:
       uncategorized: "לא ניתן למחוק תוכן ללא קטגוריה"
       has_subcategories: "לא ניתן למחוק קטגוריה זו משום שיש בה תת-קטגוריות."
@@ -646,7 +645,6 @@ he:
     min_private_message_title_length: "אורך הכותרת המנימילי המותר להודעה בתווים"
     min_search_term_length: "מספר התווים המינמלי התקין כאורך מונח לחיפוש"
     allow_uncategorized_topics: "הרשה לפתוח נושאים ללא קטגוריה.\nאזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את האופציה. "
-    uncategorized_description: "תיאור הקבוצה \"ללא קטגוריה\". השאירו ריק אם אין צורך בתיאור."
     allow_duplicate_topic_titles: "אשר/י נושאים עם כותרות זהות או משוכפלות."
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
     educate_until_posts: "כאשר המשתמש/ת מתחילים להקיש את (n) ההודעות הראשונות שלהם, הציגו פאנל הנחיה למשתמש באזור חיבור ההודעות."
@@ -829,15 +827,9 @@ he:
     tl2_requires_likes_received: "כמה \"לייקים\" משתמש צריך לקבל לפני שישודרג לרמת אמון 2."
     tl2_requires_likes_given: "כמה לייקים משתמש צריך לתת לפני שישודרג לרמת אמון 2."
     tl2_requires_topic_reply_count: "בכמה נושאים משתמש צריך לענות לפני שישודרג לרמת אמון 2."
-    tl3_requires_topics_replied_to: "מספר נושאים מינימלי שמשתמש צריך היה לענות להם ב-100 הימים האחרונים על מנת שיתאפשר לו להיות משודרג לרמת אמון 3 (ערך בין 0 ל-100)."
-    tl3_requires_topics_viewed: "אחוז הנושאים שנוספו שמשתמש צריך היה לעיין בהם ב-100 הימים האחרונים על מנת שיתאפשר לו להיות משודרג לרמת אמון 3 (ערך בין 0 ל-100)."
-    tl3_requires_posts_read: "מספר הפרסומים שמשתמש פרסם ב-100 הימים האחרונים על מנת שיתאפשר לו להיות משודרג לרמת אמון 3 (ערך בין 0 ל-100)."
     tl3_requires_topics_viewed_all_time: "מספר מינימלי של נושאים שמשתמש צריך לעיין בהם על מנת שיתאפשר לו להיות משודרג לרמת אמון 3."
     tl3_requires_posts_read_all_time: "מספר מינימלי של פרסומים שמשתמש קרא על מנת שיוכל להיות משודרג לרמת אמון 3."
-    tl3_requires_max_flagged: "משתמש לא פרסם יותר מ-X פרסומים שסומנו (flagged) ע\"י משתמשים ב-100 הימים האחרונים, על מנת שיוכל להיות משודרג לרמת אמון 3, כאשר X הוא הערך הזה (0 או גבוה יותר)."
     tl3_promotion_min_duration: "מספר הימים המינימלי ששדרוג לרמת אמון 3 תארך לפני שמשתמש יורד בדרגה לרמת אמון 2."
-    tl3_requires_likes_given: "מינימום הלייקים הנדרשים ב-100 הימים האחרונים כדי להכשיר קידום לרמת אמון 3."
-    tl3_requires_likes_received: "מינימום הלייקים הנדרש ב-100 הימים האחרונים כדי לאפשר קידום לרמת אמון 3."
     tl3_links_no_follow: "מניעת הסרת rel=nofollow מקישורים שמפורסמים על ידי משתמשים ברמת אמון 3."
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     min_trust_to_edit_wiki_post: "דרגת האמון המינימלי הנדרשת כדי לערוך פרסום שמסומן כ-wiki."
@@ -925,7 +917,6 @@ he:
     automatically_download_gravatars: "הורדת גראווטרים למשתמשים בעת יצירת החשבון או שינוי כתובת הדוא\"ל."
     digest_topics: "מספר הנושאים המקסימלי להצגה במייל סיכום."
     digest_min_excerpt_length: "מספר התווים המינימלי למובאות מתוך הפרסום במייל הסיכום."
-    delete_digest_email_after_days: "השהיית מיילים מסכמים עבור משתמשים שלא נראו באתר במשך יותר מ(n) ימים."
     disable_digest_emails: "נטרול דוא\"ל סיכום לכל המשתמשים."
     detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures."
     max_daily_gravatar_crawls: "מספר הפעמים המקסימלי ש-Discourse יבדוק אווטרים ב-Gravatar ביום"
@@ -940,7 +931,6 @@ he:
     dominating_topic_minimum_percent: "איזה אחוז מהפרסומים משתמש צריך לייצר בנושא לפני שיקבל תזכורת לגבי שליטת/שתלטנות יתר על הנושא."
     daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
     suppress_uncategorized_badge: "אל תציגו את התג (badge) לנושאים נטולי קטגוריה ברשימת הנושאים."
-    permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(\\/topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures"
     global_notice: "הציגו הודעת אזהרה דחופה כללית לכל המבקרים, החליפו לריק כדי להסתיר אותה (ניתן להשתמש ב-HTML)."
     disable_edit_notifications: "ביטול התראות עריכה על ידי משתמש המערכת כאשר 'download_remote_images_to_local' פעיל."
     full_name_required: "שם מלא הוא שדה נדרש לפרופיל משתמש/ת."
@@ -971,7 +961,6 @@ he:
     enable_emoji: "אפשרו emoji"
     emoji_set: "איך אתם אוהבים את ה-emoji שלכם?"
     enforce_square_emoji: "חובת מימדי ריבועיים בכל ה-emojis."
-    approve_post_count: "The amount of posts from a new user that must be approved"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
     notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact email. Set to 0 to disable these emails."
     default_email_digest_frequency: "באיזה תדירות משתמשים מקבלים מייל עדכון בתור ברירת מחדל. "
@@ -1013,7 +1002,6 @@ he:
     moved_post: "%{display_username} העביר את ההודעה שלך ל %{link}"
     private_message: "%{display_username}  שלח/ה לך הודעה: %{link}"
     invited_to_private_message: "%{display_username}  הזמין אותך להודעה:  %{link}"
-    invited_to_topic: "%{display_username} הזמין אותך לנושא: %{link}"
     invitee_accepted: "%{display_username} קיבל את הזמנתך"
     linked: "%{display_username} קישר אליך ב %{link}"
     granted_badge: "הרווחת %{link}"
@@ -1023,11 +1011,6 @@ he:
       category: 'קטגוריות'
       topic: 'תוצאות'
       user: 'משתמשים'
-  sso:
-    not_found: "לא ניתן לאתר או ליצור חשבון, צרו קשר עם אדמין."
-    account_not_approved: "החשבון ממתין לאישור, תקבל/י הודעת דוא\"ל ברגע שיאושר."
-    unknown_error: "שגיאה בעדכון המידע, צרו קשר עם האדמין"
-    timeout_expired: "תם זמן החיבור לחשבון, אנא נסו להתחבר שוב"
   original_poster: "מפרסם מקורים"
   most_posts: "מירב ההודעות"
   most_recent_poster: "המפרסם האחרון"
@@ -1110,8 +1093,6 @@ he:
       characters: "חייב לכלול מספרים, אותיות ומקפים תחתונים בלבד."
       unique: "חייב להיות ייחודי"
       blank: "חייב להיות מלא"
-      must_begin_with_alphanumeric: "חייב להתחיל עם אות, מספר או קו תחתון"
-      must_end_with_alphanumeric: "חייב להסתיים עם אות, מספר, או קו תחתון"
       must_not_contain_two_special_chars_in_seq: "לא יכול להכיל רצף של 2 או יותר תווים מיוחדים  (.-_)"
     email:
       not_allowed: "לא מורשה מכתובת הדואר האלקטרוני הזו. בבקשה השתמש בכתובת אחרת."
@@ -1164,83 +1145,10 @@ he:
       (אם הקישור פג תוקף, בחר ב"שכחתי אץ הסיסמא שלי" בהתחברות.)
   test_mailer:
     subject_template: "[%{site_name}] Email Deliverability Test"
-    text_body_template: |
-      This is a test email from
-      [**%{base_url}**][0]
-
-      Email deliverability is complicated. Here are a few important things you should check first:
-
-      - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**.
-
-      - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. in Gmail, it is the "show original" option in the drop-down menu at the top right of each mail.
-
-      - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered.
-
-      - Is your domain's [SPF record][8] correct? [Test your SPF record][1] here. Note that TXT is the correct official record type for SPF.
-
-      - Is your domain's [DKIM record][3] correct? This will significantly improve email deliverability. [Test your DKIM record][7] here.
-       If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services.
-
-
-      (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!)
-
-      We hope you received this email deliverability test OK!
-
-      Good luck,
-
-      Your friends at [Discourse](http://www.discourse.org)
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: http://dkimcore.org/tools/dkimrecordcheck.html
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [md]: http://mandrill.com
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
   new_version_mailer:
     subject_template: "[%{site_name}] גרסת Discourse חדשה, עדכון זמין."
-    text_body_template: |+
-      גרסה חדש של [Discourse](http://www.discourse.org) זמינה.
-
-      הגרסה שלכם:  %{installed_version}
-      הגרסה החדשה:  **%{new_version}**
-
-      ייתכן ותרצו:
-
-      - לראות מה חדש ב- [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - לעדכן דרך הדפדפן ב [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
-
-      - לבקר ב-[meta.discourse.org](http://meta.discourse.org) לחדשות, דיונים ותמיכה ב-Discourse.
-
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] update available"
-    text_body_template: |
-      גרסא חדש של [Discourse] (http://www.discourse.org) זמינה.
-      הגרסא שלכם: %{installed_version}
-      גרסא חדשה: **%{new_version}**
-
-      ייתכן שתרצו:
-
-      - לראות מה חדש ב[יומן השינויים בגיטהאב](https://github.com/discourse/discourse/commits/master).
-
-      - לעדכן דרך הדפדפן ב- [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade)
-
-      - לבקר ב[meta.discourse.org](http://meta.discourse.org) לחדשות, דיונים ותמיכה ב-Discourse.
-       ### Release notes
-      %{notes}
-  flags_reminder:
-    flags_were_submitted:
-      one: "סימונים אלו נשלחו לפני כשעה."
-      other: "סימונים אלה נשלחו לפני %{count} שעות."
-    please_review: "Please review them."
-    post_number: "post"
-    how_to_disable: 'תוכל/י לבטל או לשנות את תדירות תזכורת דוא"ל באמצעות ההגדרה "הודעה על סימונים אחרי...".'
-    subject_template:
-      one: "סימון אחד ממתין לטיפול"
-      other: "%{count} סימונים ממתינים לטיפול"
   queued_posts_reminder:
     subject_template:
       one: "[%{site_name}] תגובה אחת מחכה לבדיקה"
@@ -1326,10 +1234,6 @@ he:
       text_body_template: "צר לנו, אך ייצוא הנתונים שלכם נכשל. אנא בדקו את רישומי המערכת או צרו קשר עם איש/אשת צוות."
     email_reject_no_account:
       subject_template: "[%{site_name}]  בעיית מייל -- חשבון לא מזוהה"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת הדוא"ל שלכם אל %{destination} (titled %{former_title}) לא עברה.
-
-        לא ידוע לנו על חשבון משתמש/ת עם כתובת כזו. נסו לשלוח מכתובת דוא"ל אחרת, או צרו קשר עם אנשי הצוות שלנו.
     email_reject_empty:
       subject_template: "[%{site_name}]  בעיית מייל -- ללא תוכן"
     email_reject_parsing:
@@ -1343,16 +1247,8 @@ he:
         אין לחשבון שלך את רמון האמון הנדרשת כדי לפרסם נושאים חדשים  בקטגוריה הזו.  אם אתם חושבים שזוהי שגיאה, צרו קשר עם אחד מאנשי הצוות.
     email_reject_reply_key:
       subject_template: "[%{site_name}]  בעיית מייל -- תו תגובה לא מוכר"
-      text_body_template: |
-        אנו מצטערים, אבל הודעת הדוא"ל שלך אל %{destination} (titled %{former_title}) לא עברה.
-
-        מפתח התגובה לא קיים או לא מוכר, כך שאיננו יודעים לאיזה פרסום המייל הזה אמור להגיב. אנא צרו קשר עם אנשי הצוות.
     email_reject_topic_not_found:
       subject_template: "[%{site_name}]  בעיית מייל -- לא נמצא נושא"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת הדוא"ל ששלחת אל %{destination} (בנושא %{former_title}) לא עברה.
-
-        הנושאחושבים שהגבתם אליו כבר לא קיים, אולי הוא נמחק? אם אתם  שמדובר בתקלה, צרו קשר עם איש/אשת צוות.
     email_reject_topic_closed:
       subject_template: "[%{site_name}]  בעיית מייל -- נושא נסגר"
       text_body_template: |
@@ -1361,16 +1257,8 @@ he:
         הנושא שהשבתם אליו נסגר ולכן לא ניתן להשיב לו יותר.  אם אתם מאמינים שזוהי תקלה, אנא צרו קשר עם איש/אשת צוות.
     email_reject_auto_generated:
       subject_template: "[%{site_name}]  בעיית מייל -- תגובה נוצרה אוטומטית"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת הדוא"ל ששלחת אל %{destination} (בנושא %{former_title}) לא עברה.
-
-        המייל שלך סומן כ"נוצר אוטומטית", ולכן לא ניתן לקבל אותו. אם אתם מאמינים שמדובר בתקלה, צרו קשר עם איש/אשת צוות.
     email_error_notification:
       subject_template: "[%{site_name}]  בעיית מייל -- בעיית אימות POP"
-      text_body_template: |
-        התרחשה תקלת אימות בזמן שבדקנו הודעות מייל בשרת ה-POP.
-
-        אנא וודאו שכיוונים נכון את הרשאות ה-POP ב[הגדרות האתר](%{base_url}/admin/site_settings/category/email).
     too_many_spam_flags:
       subject_template: "New account blocked"
       text_body_template: |
@@ -1383,12 +1271,6 @@ he:
         לפרטים נוספים, אנא פנו אל [כללי ההתנהלות הקהילתיים] [community guidelines](%{base_url}/guidelines) שלנו.
     blocked_by_staff:
       subject_template: "Account blocked"
-      text_body_template: |
-        שלום.
-
-        זוהי הודעה אוטומטית שנשלחה אליך מ%{site_name} כדי לעדכן אותך שהחשבון שלך נחסם על ידי איש/אשת צוות.
-
-        להדרכה נוספת, אנא פנו ל[כללי ההתנהגות הקהיליתיים](%{base_url}/guidelines) שלנו.
     user_automatically_blocked:
       subject_template: "המשתמש/ת החדשים %{username} נחסמו בשל התראות מהקהילה."
     spam_post_blocked:
@@ -1422,10 +1304,6 @@ he:
     posted_by: "Posted by %{username} on %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} הזמין אותך להודעה '%{topic_title}'"
-      text_body_template: "\n%{username} הזמינ/ה אותך להודעה. \n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nב\n\n> %{site_title} -- %{site_description}\n\nתלחץ על הלינק בשביל לראות את ההודעה %{base_url}%{url}\n"
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} הזמין אותך לנושא '%{topic_title}'"
-      text_body_template: "\n%{username} הזמינ/ה אותך לשיחה. \n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nב\n\n> %{site_title} -- %{site_description}\n\nתלחץ על הלינק בשביל לראות את ההודעה %{base_url}%{url}\n"
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
     user_quoted:
@@ -1476,12 +1354,6 @@ he:
 
         הקישו על הקישור המצורף כדי להגדיר סיסמא לחשבונך החדש:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Confirm your new email address"
-      text_body_template: |
-        Confirm your new email address for %{site_name} by clicking on the following link:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
       text_body_template: "ברוכים הבאים ל%{site_name}!\n\nחבר צוות אישר את החשבון שלך ב %{site_name}. \n\nלחץ על הקישור הבא לאשר והפעיל את החשבון החדש שלך:\n%{base_url}/users/activate-account/%{email_token}\n\nאם הלינק לא לחיץ, נסה להעתיק ולהדביק אותו לסרגל הכתובת בראש הדפדפן. \n\n%{new_user_tips}\n\nאנו מאמינים ב  [civilized community behavior](%{base_url}/guidelines)  בכל זמן.\n\nתהנה מהביקור!\n\n(אם אתה צריך ליצור קשר עם [staff members](%{base_url}/about)  כחבר חדש, רק השב להודעה זאת. )\n\n"
@@ -1495,7 +1367,6 @@ he:
 
         If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
   page_not_found:
-    title: "The page you requested doesn't exist or is private."
     popular_topics: "פופלארי"
     recent_topics: "לאחרונה"
     see_more: "עוד"
@@ -1557,22 +1428,6 @@ he:
     title: "תנאי השימוש"
   privacy_topic:
     title: "מדיניות פרטיות"
-  badges:
-    long_descriptions:
-      autobiographer: "אות יוענק לך כשתמלא את  <a href=\"/my/preferences\">פרופיל המשתמש שלך</a> ותבחר תמונת פרופיל. לשתף את הקהילה לגבי מי אתה ובמה אתה מעוניין עוזר ליצור קהילה יותר טובה ומחוברת. \n"
-      first_like: |
-        אות מוענק בפעם הראשונה שאתה עושה "לייק" לפרסום בעזרת כפתור ה :heart: . לעשות לייק לפרסומים היא דרך מעולה לידע את חברך בקהילה שמה שהם פרסמו היה מעניין, שימושי או מגניב. חלוק את האהבה!
-      first_link: |
-        תג זה מוענק בפעם הראשונה ששמים קישור לנושא אחר בתגובה. קישור נושאים עוזר לקוראים למצוא שיחות מעניינות קשורות לנושא.
-      first_quote: |
-        תג זה מוענק בפעם הראשונה שמצטטים פרסום בתגובה. ציטוט חלקים רלוונטים של פרסומים קודמים בתגובתך עוזר לשמור על דיונים מפוקסים.
-      first_share: |
-        תג זה מוענק בפעם הראשונה שמשתפים קישור לתגובה או נושא באמצעות כפתור השיתוף. שיתוף קישורים היא דרך מעולה להראות דיונים מעניינים עם שאר העולם ולהגדיל את הקהילה.
-      read_guidelines: |
-        תג זה מוענק על  <a href="/guidelines">קריאת נהלי הקהילה</a>. מעקב ושיתוף של הקוים המנחים עוזר ליצור קהילה בטוחה, כיפית ובת קימא.
-      basic: "הגעתם לשלב 1! תודה על כך שהפכתם לחלק מהקהילה, וקראתם קצת פוסטים כדי להכיר אותנו. \nכל ההגבלות של חשבון חדש הוסרו ואתם יכולים להשתמש עכשיו בכל האפשרויות בקהילה כמו: הודעות פרטיות, סימון פוסטים, עריכת ה-Wiki, העלאת תמונות וקישורים. \n"
-      member: |
-        הגעתם לשלב 2! תודה על ההשתתפות שלכם בקהילה במשך מספר שבועות. אתם יכולים לשלוח עכשיו הזמנות אישיות מדף המשתמש שלכם או מפוסטים אישיים, ליצור הודעות קבוצתיות, ולעשות עוד כמה לייקים ביום.
   admin_login:
     success: "דוא\"ל נשלח"
     error: "שגיאה!"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 99c33f6b08..859e27ccca 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -27,6 +27,10 @@ it:
   purge_reason: "Cancellato automaticamente come account abbandonato e mai attivato"
   disable_remote_images_download_reason: "Lo scaricamento delle immagini remote è stato disabilitato perché non c'è abbastanza spazio disco disponibile."
   anonymous: "Anonimo"
+  emails:
+    incoming:
+      default_subject: "Email in arrivo da %{email}"
+      show_trimmed_content: "Mostra contenuto tagliato"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -160,7 +164,6 @@ it:
       can_not_modify_automatic: "Non puoi modificare un gruppo automatico"
       member_already_exist: "'%{username}' è già membro di questo gruppo."
       invalid_domain: "'%{domain}' non è un dominio valido."
-      invalid_incoming_email: "'%{incoming_email}' non è un indirizzo email valido."
     default_names:
       everyone: "chiunque"
       admins: "amministratori"
@@ -257,7 +260,6 @@ it:
       uncategorized_parent: "La categoria \"Non classificato\" non può avere una categoria superiore."
       self_parent: "La categoria-genitore di una sottocategoria non può essere se stessa."
       depth: "Non puoi annidare una sottocategoria sotto un'altra"
-      email_in_already_exist: "L'indirizzo email in ingresso '%{email_in}' è già stato usato per la categoria '%{category_name}'."
     cannot_delete:
       uncategorized: "Non puoi eliminare la categoria \"Non classificato\""
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
@@ -819,15 +821,9 @@ it:
     tl2_requires_likes_received: "Quanti \"Mi piace\" deve ricevere un utente per essere promosso al livello di esperienza 2."
     tl2_requires_likes_given: "Quanti \"Mi piace\" deve dare un utente per essere promosso al livello di esperienza 2."
     tl2_requires_topic_reply_count: "A quanti argomenti deve rispondere un utente per essere promosso al livello di esperienza 2."
-    tl3_requires_topics_replied_to: "Numero minimo di argomenti cui un utente deve aver risposto negli ultinmi 100 giorni per essere promosso al livello di esperienza 3 (0 o maggiore)."
-    tl3_requires_topics_viewed: "Percentuale di argomenti creati negli ultimi 100 giorni che un utente deve leggere per essere promosso al livello di esperienza 3 (da 0 a 100)."
-    tl3_requires_posts_read: "Percentuale di messaggi creati negli ultimi 100 giorni che un utente deve leggere per essere promosso al livello di esperienza 3 (da 0 a 100)."
     tl3_requires_topics_viewed_all_time: "Il numero minimo di argomenti che un utente deve aver letto per poter accedere al livello di esperienza 3."
     tl3_requires_posts_read_all_time: "Il numero minimo di messaggi che un utente deve aver letto per poter accedere al livello di esperienza 3."
-    tl3_requires_max_flagged: "L'utente non deve aver ricevuto più di x segnalazioni sui messaggi da x diversi utenti negli ultimi 100 giorni, per poter essere promosso al livello di esperienza 3, dove x è il valore di questa impostazione (0 o maggiore)."
     tl3_promotion_min_duration: "Per quanti giorni al minimo mantenere la promozione al livello di esperienza 3 prima che un utente venga degradato al livello di esperienza 2."
-    tl3_requires_likes_given: "Il minimo numero di Mi piace che devono essere dati negli ultimi 100 giorni per essere promossi al livello di esperienza 3."
-    tl3_requires_likes_received: "Il minimo numero di Mi piace che devono essere ricevuti negli ultimi 100 giorni per essere promossi al livello di esperienza 3."
     tl3_links_no_follow: "Non rimuovere rel=nofollow dai collegamenti pubblicati da utenti con livello di esperienza 3."
     min_trust_to_create_topic: "Livello minimo richiesto per creare un nuovo argomento."
     min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
@@ -951,11 +947,6 @@ it:
       category: 'Categorie'
       topic: 'Risultati'
       user: 'Utenti'
-  sso:
-    not_found: "Impossibile cercare o creare l'account, contatta l'amministratore del sito"
-    account_not_approved: "L'account è in attesa di approvazione, riceverai una notifica per email una volta approvato"
-    unknown_error: "Errore nell'aggiornamento delle informazioni, contatta l'amministratore del sito"
-    timeout_expired: "Il tempo di autenticazione di questo account è scaduto, prova ad autenticarti nuovamente"
   original_poster: "Autore Iniziale"
   most_posts: "Maggioranza Messaggi"
   most_recent_poster: "Autore Più Recente"
@@ -1044,15 +1035,6 @@ it:
     subject_template: "[%{site_name}] Nuova versione di Discourse, aggiornamento disponibile"
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] aggiornamento disponibile"
-  flags_reminder:
-    flags_were_submitted:
-      one: "Queste segnalazioni sono state inviate oltre un'ora fa."
-      other: "Queste segnalazioni sono state inviate oltre %{count} ore fa."
-    please_review: "Per favore, revisionale."
-    post_number: "messaggio"
-    subject_template:
-      one: "1 segnalazione in attesa di essere revisionata"
-      other: "%{count} segnalazioni in attesa di essere revisionate"
   flag_reasons:
     off_topic: "Il tuo messaggio è stato segnalato come **fuori tema**: la comunità pensa non riguardi l'argomento, come attualmente definito dal titolo e dal contenuto del primo messaggio."
     inappropriate: "Il tuo messaggio è stato segnalato come **inappropriato**: la comunità lo ritiene offensivo, ingiurioso o una violazione delle [linee guida della comunità](/guidelines)."
@@ -1130,12 +1112,6 @@ it:
       text_body_template: "Ciao, \n\nil presente è un messaggio automatico da %{site_name} per informarti che i tuoi messaggi sono stati automaticamente nascosti perché segnalati dalla comunità. \n\nCome misura precauzionale, il tuo nuovo account non può creare altre risposte o argomenti finché il tuo account non verrà revisionato da un membro dello staff. \n\nPer ulteriori informazioni, ti rimandiamo alle [Linee guida della comunità](%{base_url}/guidelines).\n"
     blocked_by_staff:
       subject_template: "Account bloccato"
-      text_body_template: |
-        Ciao,
-
-        questo è un messaggio automatico da %{site_name} per informarti che il tuo account è stato bloccato da un membro dello staff.
-
-        Per maggiori dettagli, fai riferimento alle nostre [linee guida della community](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "Nuovo utente %{username} bloccato a causa delle segnalazioni"
     spam_post_blocked:
@@ -1166,18 +1142,46 @@ it:
     posted_by: "Pubblicato da %{username} il %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} ti invita al partecipare al messaggio '%{topic_title}'"
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} ti invita a partecipare all'argomento '%{topic_title}'"
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: "%{header_instructions} \n\n%{message}\n\n%{context}\n\n---\n%{respond_instructions}\n"
+    user_replied_pm:
+      subject_template: "[%{site_name}] [PM] %{topic_title}"
+      text_body_template: "%{header_instructions} \n\n%{message}\n\n%{context}\n\n---\n%{respond_instructions}\n"
     user_quoted:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: "%{header_instructions} \n\n%{message}\n\n%{context}\n\n---\n%{respond_instructions}\n"
+    user_linked:
+      subject_template: "[%{site_name}] %{topic_title} "
+      text_body_template: "%{header_instructions}\n \n%{message}\n\n%{context}\n\n---\n%{respond_instructions}\n"
     user_mentioned:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: "%{header_instructions}\n\n%{message}\n \n%{context}\n\n---\n%{respond_instructions}\n"
+    user_group_mentioned:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: "%{header_instructions}\n\n%{message}\n\n%{context}\n \n---\n%{respond_instructions}\n"
     user_posted:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: "%{header_instructions}\n\n%{message}\n \n%{context}\n\n---\n%{respond_instructions}\n"
     user_posted_pm:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
+    user_posted_pm_staged:
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+        %{message}
+
+        ---
+        %{respond_instructions}
     digest:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
       subject_template: "[%{site_name}] Riepilogo"
@@ -1211,12 +1215,6 @@ it:
 
         Fai clic sul seguente collegamento per scegliere una password per il tuo nuovo account:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Conferma il tuo nuovo indirizzo email"
-      text_body_template: |
-        Conferma il tuo nuovo indirizzo email per %{site_name} cliccando sul seguente collegamento:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Sei stato ammesso su %{site_name}!"
       text_body_template: "Benvenuto su %{site_name}! \n\nUn membro dello staff ha approvato il tuo account su %{site_name}. \n\nClicca sul seguente collegamento per confermare e attivare il tuo nuovo account:\n%{base_url}/users/activate-account/%{email_token} \n\nSe il collegamento qui sopra non è cliccabile, prova a copiarlo e incollarlo nella barra degli indirizzi del tuo browser. \n\n%{new_user_tips}\n\nNoi crediamo in un [comportamento comunitario civile](%{base_url}/guidelines), sempre.\n\nBuona permanenza!\n\nps: se vuoi comunicare privatamente con i [membri dello staff](%{base_url}/about) come nuovo utente, rispondi semplicemente a questo messaggio.\n"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index a9f279761a..81ce45a79b 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -216,7 +216,6 @@ ja:
       uncategorized_parent: "未分類カテゴリは親カテゴリに設定出来ません。"
       self_parent: "自分自身がサブカテゴリの親になることはできません"
       depth: "他のサブカテゴリの下にサブカテゴリを作成することはできません"
-      email_in_already_exist: "受信メールアドレス '%{email_in}' は '%{category_name}' カテゴリですでに使用されています。"
     cannot_delete:
       uncategorized: "未分類カテゴリは削除出来ません"
       has_subcategories: "サブカテゴリを持っているため、このカテゴリを削除できません。"
@@ -551,7 +550,6 @@ ja:
     min_private_message_title_length: "プライベートメッセージのタイトルとして許容する最小の文字数"
     min_search_term_length: "検索ワードとして有効にする最小の文字数"
     allow_uncategorized_topics: "カテゴリなしのトピック作成を許可するか。警告：未分類のトピックがある場合は、これをオフにする前に、再分類する必要があります。"
-    uncategorized_description: "未分類カテゴリについての説明。存在しない場合は空白のままにします"
     allow_duplicate_topic_titles: "トピックタイトルの重複を許可"
     unique_posts_mins: "同じ内容のポストを再投稿可能にする時間 (分)"
     educate_until_posts: "最初(または複数)の投稿でタイピングを開始したら、ポップアップでガイダンスを表示させるか"
@@ -725,15 +723,9 @@ ja:
     tl2_requires_likes_received: "トラストレベル2に昇格するためにもらわなければならない「いいね!」の数"
     tl2_requires_likes_given: "トラストレベル2に昇格するためにしなければならない「いいね!」の数"
     tl2_requires_topic_reply_count: "トラストレベル2に昇格するために回答しなければいけないトピックの数"
-    tl3_requires_topics_replied_to: "トラストレベル3に昇格するために必要な最後の100日の間に返信したトピックの数(0 or higher)"
-    tl3_requires_topics_viewed: "トラストレベル3に昇格するために必要な、最後の100日の間に作成されたトピックを閲覧した割合(0 to 100)"
-    tl3_requires_posts_read: "トラストレベル3に昇格するために必要な、最後の100日の間に作成されたポストを閲覧した割合(0 to 100)"
     tl3_requires_topics_viewed_all_time: "トラストレベル3に昇格するために必要な、トピックを閲覧した合計"
     tl3_requires_posts_read_all_time: "トラストレベル3に昇格するために必要なユーザが閲覧したポストの合計"
-    tl3_requires_max_flagged: "トラストレベル3に昇格するためには、 最後の100日の間に投稿がx個以上x人の違うユーザにフラグを立てられてはいけない。xが設定値です(0 or higher)"
     tl3_promotion_min_duration: "トラストレベル3に昇格したユーザが、トラストレベル2に降格しない日数"
-    tl3_requires_likes_given: "トラストレベル3に昇格するために、最後の100日の間にしなければならない「いいね!」の数"
-    tl3_requires_likes_received: "トラストレベル3に昇格するために、最後の100日の間にもらわなければならない「いいね!」の数"
     tl3_links_no_follow: "トラストレベル3のユーザのポスト内のrel=nofolowを削除しない"
     min_trust_to_create_topic: "新規にトピックを作成するために必要な最低トラストレベル。"
     min_trust_to_edit_wiki_post: "ポストをwikiにするために必要な最低トラストレベル"
@@ -821,7 +813,6 @@ ja:
     automatically_download_gravatars: "アカウントの生成時、メールアドレスの変更時にGravatarをダウンロード"
     digest_topics: "ダイジェストメールに表示されるトピックの最大数"
     digest_min_excerpt_length: "ダイジェストメール内の投稿の抜粋の最小文字数"
-    delete_digest_email_after_days: "(n)日以上ユーザが参照していなければダイジェストメールを抑制します"
     disable_digest_emails: "全てのユーザのダイジェストメールを無効にする"
     detect_custom_avatars: "ユーザがプロフィール画像をアップロードしたか確認する"
     max_daily_gravatar_crawls: "Discourseがプロフィール画像の確認をgravastarに行う回数の上限"
@@ -836,7 +827,6 @@ ja:
     dominating_topic_minimum_percent: "ユーザがトピックを占拠しているとリマインドを行う、ポスト投稿支配率 "
     daily_performance_report: "日別のNGINXのログを解析し、Staff Onlyトピックへ詳細を投稿する"
     suppress_uncategorized_badge: "トピック一覧でカテゴライズされていないトピックのバッジは表示しない"
-    permalink_normalizations: "パーマリンクをマッチングさせる前に正規表現を適用します。例えば、/(\\/topic.*)\\?.*/\\1  は、トピックURLのクエリ文字列を取り除きます。 フォーマットは、正規表現と \\1 のようなキャプチャにアクセスする文字列です"
     global_notice: "緊急の内容を表示します。全ての訪問者の緊急バナーで注意を行います。隠すには空白に変更してください(HTMLが許可されています)"
     disable_edit_notifications: "システムユーザが'download_remote_images_to_local' を有効にした場合、編集時の通知を無効にする"
     full_name_required: "ユーザープロフィールのフルネームを必須にする"
@@ -866,7 +856,6 @@ ja:
     enable_emoji: "絵文字を有効にする"
     emoji_set: "How would you like your emoji?"
     enforce_square_emoji: "絵文字のアスペクト比を強制的に揃える"
-    approve_post_count: "新規ユーザーの投稿に承認が必要になる投稿数"
     approve_unless_trust_level: "トラストレベル以下のユーザーの投稿には承認が必要"
     notify_about_queued_posts_after: "設定した時間よりも長い間レビュー待ちの状態になっている投稿があると、メールで通知します。0を設定するとこのメールは無効化されます"
     errors:
@@ -893,7 +882,6 @@ ja:
     moved_post: "%{display_username} があなたのポストを %{link} に移動しました"
     private_message: "%{display_username} があなたにメッセージを送信しました: %{link}"
     invited_to_private_message: "%{display_username} がメッセージにあなたを招待しました: %{link}"
-    invited_to_topic: "%{display_username} がトピックにあなたを招待しました: %{link}"
     invitee_accepted: "%{display_username} があなたの招待を受けました"
     linked: "%{display_username} は%{link}であなたをリンクしました"
     granted_badge: "あなたは%{link}を獲得しました"
@@ -903,11 +891,6 @@ ja:
       category: 'カテゴリ'
       topic: '結果'
       user: 'ユーザ'
-  sso:
-    not_found: "アカウントを検索、作成することができません。サイト管理者に連絡してください"
-    account_not_approved: "アカウントの承認は保留され、承認されると通知メールが届きます"
-    unknown_error: "情報の更新中にエラーが発生しました。サイト管理者に連絡してください"
-    timeout_expired: "ログインがタイムアウトしました。もう一度ログインを試してください"
   original_poster: "Original Poster"
   most_posts: "Most Posts"
   most_recent_poster: "Most Recent Poster"
@@ -1024,85 +1007,10 @@ ja:
     text_body_template: "%{site_name} へようこそ\n\nこのリンクをクリックしてパスワードを設定してください:\n%{base_url}/users/password-reset/%{email_token}\n\n(リンクの有効期限が切れていた場合は、\"パスワードを忘れたました\"を選択しメールアドレスを入力してください) \n"
   test_mailer:
     subject_template: "[%{site_name}] メール送信テスト"
-    text_body_template: |
-      This is a test email from
-
-      [**%{base_url}**][0]
-
-      Email deliverability is complicated. Here are a few important things you should check first:
-
-      - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**.
-
-      - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. in Gmail, it is the "show original" option in the drop-down menu at the top right of each mail.
-
-      - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered.
-
-      - Is your domain's [SPF record][8] correct? [Test your SPF record][1] here. Note that TXT is the correct official record type for SPF.
-
-      - Is your domain's [DKIM record][3] correct? This will significantly improve email deliverability. [Test your DKIM record][7] here.
-
-      - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services.
-
-      (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!)
-
-      We hope you received this email deliverability test OK!
-
-      Good luck,
-
-      Your friends at [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: http://dkimcore.org/tools/dkimrecordcheck.html
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [md]: http://mandrill.com
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
   new_version_mailer:
     subject_template: "[%{site_name}] New Discourse version, update available"
-    text_body_template: |
-      新しいバージョンの[Discourse](http://www.discourse.org)  が利用可能です。
-
-      あなたのバージョン: %{installed_version}
-      新しいバージョン: **%{new_version}**
-
-      You may want to:
-
-      - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
-
-      - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse.
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] update available"
-    text_body_template: |
-      新しいバージョンの[Discourse](http://www.discourse.org)  が利用可能です。
-
-      あなたのバージョン: %{installed_version}
-      新しいバージョン: **%{new_version}**
-
-      You may want to:
-
-      - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
-
-      - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse.
-
-      ### Release notes
-
-      %{notes}
-  flags_reminder:
-    flags_were_submitted:
-      other: "これらのフラグは%{count}時間以上前に作成されました"
-    please_review: "これを確認してください"
-    post_number: "投稿"
-    how_to_disable: ' "notify about flags after"設定でこのリマインダーを停止、頻度を変更することができます'
-    subject_template:
-      other: "%{count} 個のフラグが判断待ちです"
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} 件の投稿がレビュー待ちです"
@@ -1193,10 +1101,6 @@ ja:
       text_body_template: "申し訳ありません。データ出力に失敗しました。ログを確認するかスタッフメンバーに連絡してください"
     email_reject_no_account:
       subject_template: "[%{site_name}] Email issue -- 不明なアカウント"
-      text_body_template: |
-        申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした。
-
-        このメールアドレスを持つユーザーアカウントがありませんでした。違うメールアドレスから送信するか、スタッフメンバーに連絡してください。
     email_reject_empty:
       subject_template: "[%{site_name}] Email issue -- 本文なし"
     email_reject_parsing:
@@ -1206,7 +1110,6 @@ ja:
       subject_template: "[%{site_name}] Email issue -- 不正なアクセス"
     email_reject_reply_key:
       subject_template: "[%{site_name}] Email issue -- 不明なReply Key"
-      text_body_template: "申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした。 \n\n提供されたreply keyが無効または不明のため、このメールがどの返答なのかがわかりません。スタッフメンバーに連絡してください。\n"
     email_reject_topic_not_found:
       subject_template: "[%{site_name}]  Email issue -- 存在しないトピック"
     email_reject_topic_closed:
@@ -1215,10 +1118,6 @@ ja:
       subject_template: "[%{site_name}] Email issue -- 自動生成された返信"
     email_error_notification:
       subject_template: "[%{site_name}] Email issue -- POP認証エラー"
-      text_body_template: |
-        メールをポーリングするPOPサーバで認証エラーが発生しました。
-
-        [the site settings](%{base_url}/admin/site_settings/category/email)で、POP認証の設定を確認してください。
     too_many_spam_flags:
       subject_template: "新規アカウントのブロック"
       text_body_template: |
@@ -1231,12 +1130,6 @@ ja:
         詳細については[コミュニティガイドライン](%{base_url}/guidelines)を参照してください。
     blocked_by_staff:
       subject_template: "アカウントのブロック"
-      text_body_template: |
-        こんにちは
-
-        スタッフメンバーによってブロックされたことをお知らせするために、%{site_name} から自動的に送信されています。
-
-        詳細については[コミュニティガイドライン](%{base_url}/guidelines)を参照してください。
     user_automatically_blocked:
       subject_template: "コミュニティフラッグによって新たにブロックされたユーザ%{username}"
     spam_post_blocked:
@@ -1269,9 +1162,6 @@ ja:
     posted_by: "%{post_date} に %{username} が投稿"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} がメッセージにあなたを招待しました '%{topic_title}'"
-      text_body_template: "\n{username} があなたをメッセージに招待しました \n\n> '%{topic_title}' \n>\n> %{topic_excerpt}\n\n> %{site_title} -- %{site_description}\n\nこのリンクからメッセージを参照してください: %{base_url}%{url}\n"
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} がトピックにあなたを招待しました '%{topic_title}'"
     user_replied:
       subject_template: "[%{site_name}] '%{topic_title}' 内のあなたのポストに新たな回答が投稿されました"
     user_quoted:
@@ -1322,12 +1212,6 @@ ja:
 
         以下のリンクをクリックしてパスワードを設定してください:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] メールアドレスの確認"
-      text_body_template: |
-        次のリンクをクリックして %{site_name} 用のメールアドレスを確認してください:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "%{site_name} への参加承認完了!"
     signup:
@@ -1340,7 +1224,6 @@ ja:
 
         もし上記リンクがクリックできない場合は、ブラウザのアドレスバーにリンクアドレスをコピー&ペーストしてください。
   page_not_found:
-    title: "リクエストしたページは存在しないかモデレータによって削除されました。"
     popular_topics: "人気"
     recent_topics: "最新"
     see_more: "もっと見る"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 055850ef95..bcf02cbecd 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -134,7 +134,6 @@ ko:
       can_not_modify_automatic: "자동 그룹은 수정 하실 수 없습니다."
       member_already_exist: "'%{username}'은 이미 이 그룹의 멤버입니다."
       invalid_domain: "'%{domain}'은 유효한 도메인이 아닙니다."
-      invalid_incoming_email: "'%{incoming_email}'은 유효한 이메일 주소가 아닙니다."
     default_names:
       everyone: "모든 사람"
       admins: "관리자"
@@ -244,8 +243,6 @@ ko:
       uncategorized_parent: "Uncategorized 카테고리는 부모 카테고리를 가질 수 없습니다."
       self_parent: "하위 카테고리의 부모는 자신이 될 수 없습니다."
       depth: "하위 카테고리는 계층 구조로 사용할 수 없습니다."
-      email_in_already_exist: "'%{email_in}' 수신용 이메일 주소는 '%{category_name}' 카테고리 에서 사용 중입니다."
-      invalid_email_in: "'%{email_in}' 은 유효한 이메일 주소가 아닙니다."
     cannot_delete:
       uncategorized: "Uncategorized는 삭제할 수 없습니다."
       has_subcategories: "하위 카테고리가 있어, 삭제할 수 없습니다."
@@ -766,15 +763,9 @@ ko:
     tl2_requires_likes_received: "회원등급-2가 되기 위해 받아야 하는 좋아요 횟수"
     tl2_requires_likes_given: "회원등급-2가 되기 위해 눌러야하는 좋아요 횟수"
     tl2_requires_topic_reply_count: "기회원등급-2가 되기 위해 달아야 하는 댓글 갯수"
-    tl3_requires_topics_replied_to: "VIP 사용자-3 이 되기 위해 지난 100일 동안 답글을 달아야하는 최소 글타래수(0 ~ )"
-    tl3_requires_topics_viewed: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 글타래 중 본 글타래의 비율(%, 0 ~ 100)"
-    tl3_requires_posts_read: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 글 중 본 글의 비율(%, 0 ~ 100)"
     tl3_requires_topics_viewed_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수"
     tl3_requires_posts_read_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수"
-    tl3_requires_max_flagged: "사용자가 VIP 사용자-3 이 되기 위해 지난 100일동안 서로 다른 사용자에게 최소한으로 받지 말아야하는 신고된 글 수(0 ~ )"
     tl3_promotion_min_duration: "회원등급이 2로 떨어진 후 다시 VIP 사용자-3 이 될 수 있는 최소 일 수"
-    tl3_requires_likes_given: "VIP 사용자-3 이 되기 위해 지난 100일 동안 해야 할 좋아요 수"
-    tl3_requires_likes_received: "VIP 사용자-3 이 되기 위해 지난 100일 동안 받아야 할 좋아요 수"
     tl3_links_no_follow: "VIP 사용자-3 의 글에 있는 링크에서 rel=nofollow 를 제거하지 마시오."
     min_trust_to_create_topic: "새로운 글타래를 생성하기 위한 최소 회원등급"
     min_trust_to_edit_wiki_post: "위키로 설정된 글 수정할 수 있는 최소 회원등급"
@@ -897,7 +888,6 @@ ko:
     enable_emoji: "emoji 활성화"
     emoji_set: "어떤 emoji가 좋은가요?"
     enforce_square_emoji: "모든 emoji를 정사각형 비율로 강제로 바꿉니다."
-    approve_post_count: "신규가입자가 올릴 수 있는 글 수"
     approve_unless_trust_level: "허가 받고 글 올려야 하는 유저들 최저 회원등급"
     notify_about_queued_posts_after: "글이 리뷰가 되길 기다리면서 이 시간이 지나면 문의처 메일로 연락을 보냅니다. 0으로 두면 보내지 않습니다."
     errors:
@@ -933,11 +923,6 @@ ko:
       category: '카테고리'
       topic: '검색 결과'
       user: '사용자'
-  sso:
-    not_found: "계정 생성 또는 찾기 불가, 관리자에게 문의하세요"
-    account_not_approved: "계정이 승인을 기다리고 있습니다, 승인 후 완료 이메일이 보내집니다."
-    unknown_error: "업데이트 정보에 오류가 있습니다. 사이트 관리자에게 문의해주세요."
-    timeout_expired: "로그인 연결 시간이 초과되었습니다. 다시한번 시도해주세요"
   original_poster: "원본 게시자"
   most_posts: "최대 게시자"
   most_recent_poster: "최근 게시자"
@@ -1305,12 +1290,6 @@ ko:
         추가적인 조언은 [커뮤니티 가이드라인](%{base_url}/guidelines)에서 확인하실 수 있습니다.
     blocked_by_staff:
       subject_template: "계정이 블락"
-      text_body_template: |
-        안녕하세요,
-
-        %{site_name}에서 이 계정이 스태프에 의해 블락되었음을 알리는 자동 메세지 입니다.
-
-        추가적인 조언은 [community guidelines](%{base_url}/guidelines)에서 확인하실 수 있습니다.
     user_automatically_blocked:
       subject_template: "%{username} 신규가입자가 커뮤니티 신고로 블락됨"
     spam_post_blocked:
@@ -1343,33 +1322,6 @@ ko:
     posted_by: "%{username} 사용자가 %{post_date}에 게시하였습니다."
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 글타래에 초대했습니다"
-      text_body_template: |2
-
-        %{username} 회원님이 메세지에 초대했습니다.
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        사이트:
-
-        > %{site_title} -- %{site_description}
-
-        %{base_url}%{url} 로 들어가서 메세지를 확인하기
-    user_invited_to_topic:
-      text_body_template: |2
-
-        %{username} 회원님이 토의에 초대하였습니다.
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        사이트:
-
-        > %{site_title} -- %{site_description}
-
-        메세지 링크: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] '%{topic_title}'에 답글이 달렸습니다"
     user_quoted:
@@ -1424,12 +1376,6 @@ ko:
 
         비밀번호 설정 페이지:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] 이메일 확인"
-      text_body_template: |
-        %{site_name} 사이트에서 사용할 새로운 이메일을 아래 링크를 클릭하여 확인하세요:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "당신은 %{site_name} 가입이 승인되었습니다!"
       text_body_template: |
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 62a0449f43..a9527735a4 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -697,9 +697,6 @@ nb_NO:
       blank: "Må være til stede"
     email:
       blocked: "er ikke tillatt."
-  flags_reminder:
-    please_review: "Vennligst vurder dem."
-    post_number: "innlegg"
   flags_dispositions:
     agreed: "Takk for at du sier ifra. Vi er enig at det er et problem her og vi ser på saken."
     disagreed: "Takk for at du sier ifra. Vi skal se på det. "
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 812ecaee9c..88e54a0aab 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -177,7 +177,6 @@ nl:
       can_not_modify_automatic: "Je kunt automatische groepen niet wijzigen"
       member_already_exist: "'%{username}' is al lid van deze groep."
       invalid_domain: "%{domain}' is geen geldig domein."
-      invalid_incoming_email: "%{incoming_email}' is geen geldig E-mail adres."
     default_names:
       everyone: "iedereen"
       admins: "admins"
@@ -310,8 +309,6 @@ nl:
       uncategorized_parent: "Ongecategoriseerd kan geen bovenliggende categorie hebben"
       self_parent: "Een categorie kan niet zijn eigen bovenliggende categorie zijn"
       depth: "Je kan een subcategorie niet onder een andere subcategorie plaatsen"
-      email_in_already_exist: "Inkomend e-mailadres '%{email_in}' is al in gebruik voor '%{category_name}' categorie."
-      invalid_email_in: "%{email_in}' is geen geldig E-mail adres."
     cannot_delete:
       uncategorized: "De categorie Ongecategoriseerd kan niet verwijderd worden"
       has_subcategories: "Deze categorie kan niet verwijderd worden, omdat deze subcategorieën bevat"
@@ -901,17 +898,9 @@ nl:
     tl2_requires_likes_received: "Hoeveel likes een lid moet ontvangen voordat deze naar trustlevel 2 gepromoveerd wordt."
     tl2_requires_likes_given: "Hoeveel likes een lid moet geven voordat deze naar trustlevel 2 gepromoveerd wordt."
     tl2_requires_topic_reply_count: "Op hoeveel topics een lid moet reageren voordat deze naar trustlevel 2 gepromoveerd wordt."
-    tl3_time_period: "Benodigde periode voor Vertrouwensniveau 3"
-    tl3_requires_days_visited: "Het minimum aantal dagen waarop een gebruiker de site in de afgelopen 100 dagen heeft bezocht om in aanmerking te komen voor promotie naar Vertrouwensniveau 3. Om promoties naar dit niveau uit te schakelen, kan je het aantal dagen hoger zetten dan de periode voor vertrouwensniveau 3."
-    tl3_requires_topics_replied_to: "Minimum aantal topics waarop een lid moet hebben gereageerd in de laatste 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3 (0 of hoger)"
-    tl3_requires_topics_viewed: "Het percentage van topics gemaakt in de afgelopen 100 dagen dat een lid bekeken moet hebben om in aanmerking te komen voor promotie naar trustlevel 3. (0 to 100)"
-    tl3_requires_posts_read: "Het percentage van berichten gemaakt in de afgelopen 100 dagen dat een lid bekeken moet hebben om in aanmerking te komen voor promotie naar trustlevel 3. (0 to 100)"
     tl3_requires_topics_viewed_all_time: "Het minimum totaal aantal topics dat een lid moet hebben bekeken om te kwalificeren voor trustlevel 3."
     tl3_requires_posts_read_all_time: "Het minimum totaal aantal berichten dat een lid moet hebben bekeken om te kwalificeren voor trustlevel 3."
-    tl3_requires_max_flagged: "Van leden moeten minder dan x berichten gemarkeerd zijn door x verschillende leden in de afgelopen 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3, waarbij x de waarde van deze instelling is. (0 of hoger)"
     tl3_promotion_min_duration: "Het minimum aantal dagen van de duur van een promotie naar trustlevel 3 voordat een lid kan worden gedegradeerd naar trustlevel 2."
-    tl3_requires_likes_given: "Het minimum aantal likes dat een lid moet hebben gegeven in de afgelopen 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3."
-    tl3_requires_likes_received: "Het minimum aantal likes dat een lid moet hebben gekregen in de afgelopen 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3."
     tl3_links_no_follow: "rel=nofollow niet verwijderen van links geplaatst door leden met trustlevel 3."
     min_trust_to_create_topic: "Het minimale trust level dat nodig is om een topic te mogen maken."
     min_trust_to_edit_wiki_post: "Het minimale trust level dat nodig is om een bericht te wijzigen dat als wiki gemarkeerd is."
@@ -925,7 +914,6 @@ nl:
     max_users_notified_per_group_mention: "Maximum aantal gebruikers dat een notificatie kan krijgen als een groep genoemd wordt (boven dit aantal worden er geen notificaties verstuurd)."
     create_thumbnails: "Maak miniaturen en lightbox afbeeldingen die te groot zijn en niet in een post passen."
     email_time_window_mins: "Wacht (n) minuten met verzenden van notificaties, geef gebruikers de kans om hun berichten te bewerken en af te ronden."
-    private_email_time_window_seconds: "Wacht (n) minuten met het verzenden van e-mails met notificaties, om gebruikers de kans te geven om hun berichten te bewerken en af te ronden."
     email_posts_context: "Hoeveel voorgaande antwoorden bijvoegen als context in de notificatie e-mails."
     flush_timings_secs: "Hoe frequent we de timing data naar de server sturen, in seconden. "
     title_max_word_length: "De maximum toegestane woordlengte, in letters, in een topic titel."
@@ -1024,7 +1012,6 @@ nl:
     dominating_topic_minimum_percent: "Welk percentage van de berichten een gebruiker moet maken in een onderwerp voordat ze worden herinnerd aan het te veel domineren van een topic."
     daily_performance_report: "Analyseer elke dag NGINX logs en post een Alleen Voor Medewerkers topic met de details"
     suppress_uncategorized_badge: "Laat de badge niet zien voor topics zonder categorie in de topiclijsten."
-    permalink_normalizations: "Pas de volgende reguliere expressie toe voordat permalinks worden gematched, bijvoorbeeld: /(\\/topic.*)\\?.*/\\1 zal queryreeksen verwijderen uit de onderwerp routes. Het formaat is regex+strings gebruik \\1 etc. voor toegang tot de resultaten."
     global_notice: "Laat een LET OP, BELANGRIJK-banner zien aan alle gebruikers. Laat leeg om niet te tonen (HTML is toegestaan)."
     disable_edit_notifications: "Schakelt bewerkingsnotificaties van de systeemgebruiker uit als 'download_remote_images_to_local' actief is."
     automatically_unpin_topics: "Automatisch ont-pinnen van topics als de gebruiker onderaan de pagina komt."
@@ -1109,11 +1096,6 @@ nl:
       category: 'Categorieën'
       topic: 'Resultaten'
       user: 'Leden'
-  sso:
-    not_found: "Kan het account niet vinden of aanmaken, neem contact op met site admin"
-    account_not_approved: "Account is in afwachting van goedkeuring, je ontvangt een e-mailbericht na goedkeuring."
-    unknown_error: "Fout bij informatie bijwerken, neem contact op met website admin"
-    timeout_expired: "Account login time-out, probeer opnieuw in te loggen"
   original_poster: "Oorspronkelijk geplaatst door"
   most_posts: "Meer berichten"
   most_recent_poster: "Meest recente schrijver"
@@ -1384,12 +1366,6 @@ nl:
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
 
         Je reactie werd verstuurd van een ander e-mailadres dan we verwacht hadden, dus we weten niet zeker of dit dezelfde persoon is. Probeer de e-mail vanaf een ander adres te sturen, of neem contact op met de staf.
-    email_reject_no_message_id:
-      subject_template: "[%{site_name}] E-mailprobleem -- Geen message-id"
-      text_body_template: |
-        Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
-        We konden geen ‘message-id’ in de e-mail vinden. Probeer de e-mail vanaf een ander adres te sturen, of neem contact op met de staf.
     email_reject_no_account:
       subject_template: "[%{site_name}] E-mailprobleem -- Onbekende account"
       text_body_template: |
@@ -1496,12 +1472,6 @@ nl:
         Kijk voor verdere uitleg in de [community richtlijnen](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Account geblokkeerd"
-      text_body_template: |
-        Hallo,
-
-        Dit is een automatisch bericht van %{site_name} om je te informeren dat je account geblokkeerd is door de staf.
-
-        Kijk voor verdere uitleg in de [regels](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "Nieuwe gebruiker %{username} geblokkeerd wegens meldingen van andere gebruikers"
     spam_post_blocked:
@@ -1591,12 +1561,6 @@ nl:
 
         Klik op deze link om een wachtwoord in te stellen voor je nieuwe account:
         %{base_url}/users/password-reset/%{email_token}
-    authorize_email:
-      subject_template: "[%{site_name}] Bevestig je nieuwe e-mailadres"
-      text_body_template: |
-        Bevestig je nieuwe e-mailadres voor %{site_name} door op de volgende link te klikken:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Je inschrijving op %{site_name} is geaccepteerd!"
       text_body_template: |
@@ -1688,28 +1652,6 @@ nl:
     title: "Algemene Voorwaarden"
   privacy_topic:
     title: "Privacy Voorwaarden"
-  badges:
-    long_descriptions:
-      nice_post: |
-        Deze badge wordt toegekend voor het gevn van een antwoord dat 10 likes krijgt. Mooi gedaan!
-      nice_topic: |
-        Deze badge wordt toegekend voor het aanmaken van topic dat 10 likes krijgt. Mooi gedaan!
-      good_post: |
-        Deze badge wordt toegekend voor het geven van een antwoord dat 25 likes krijgt. Goed bezig!
-      good_topic: |
-        Deze badge wordt toegekend voor het plaatsen van een topic dat 25 likes krijgt. Goed bezig!
-      great_post: |
-        Deze badge wordt toegekend voor het aanmaken van post die 50 likes krijgt. Wow!
-      great_topic: |
-        Deze badge wordt toegekend voor het geven van een antwoord dat 50 likes krijgt. Wow!
-      basic: |
-        Deze badge is aan je toegekend met het bereiken van trustlevel 1. Bedankt dat je een tijdje hebt rondgekeken, wat topics hebt gelezen en wat meer te weten bent gekomen over bedoeling van dit forum. De restricties voor nieuwe gebruikers gelden nu niet meer voor jou, en je kunt nu gebruik maken van alle basis communicatie mogelijkheden, zoals persoonlijke berichten, markeren, wijzigen van wiki's en de mogelijkheid om afbeeldingen en meerdere links in één bericht te plaatsen.
-      member: |
-        Deze badge is aan je toegekend met het bereiken van trustlevel 2. Bedankt voor je deelname gedurende enkele weken om op het forum actief te zijn. Je kunt nu persoonlijke uitnodigingen versturen vanuit je gebruikerspagina of een bepaalde topic, groepsberichten versturen en je hebt per dag meer likes tot je beschikking.
-      regular: |
-        Deze badge is aan je toegekend met het bereiken van trustlevel 3. Bedankt dat je al meerdere maanden deel uit maakt van ons forum, behoort tot de meest actieve lezers en regelmatig bijdraagt aan wat dit forum zo goed maakt. Je kunt nu de naam en categorie van topics aanpassen en gebruik maken van een speciale "lounge",  krachtiger spam markeringen en nog veel meer likes per dag.
-      leader: |
-        Deze badge is aan je toegekend met het bereiken van trustlevel 4. Je bent door de staf uitgekozen voor een voortrekkersrol, om op dit forum een positief voorbeeld te geven in woord en gedrag. Je kunt nu alle berichten aanpassen, topics modereren door bijvoorbeeld pinnen, sluiten, verbergen, archiveren, splitsen en samenvoegen en je hebt een  vrijwel onbeperkt aantal likes per dag.
   admin_login:
     success: "E-mail verstuurd"
     error: "Fout!"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index e837906227..e92c100220 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -265,7 +265,6 @@ pl_PL:
       uncategorized_parent: "Inne nie mogą być podkategorią innej kategorii."
       self_parent: "Podkategoria nie może być swoim rodzicem"
       depth: "Nie możesz umieścić subkategorii w innej subkategorii"
-      email_in_already_exist: "Przychodzący adres email '%{email_in}' jest teraz używany w tej '%{category_name}' kategorii. "
     cannot_delete:
       uncategorized: "Nie można usunąć kategorii Inne"
       has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. "
@@ -784,8 +783,6 @@ pl_PL:
     tl2_requires_likes_received: "Ile lajków musi otrzymać użytkownik, zanim otrzyma promocję na 2 poziom zaufania."
     tl2_requires_likes_given: "Ile lajków musi dać użytkownik, zanim otrzyma promocję na 2 poziom zaufania."
     tl2_requires_topic_reply_count: "Na ile tematów musi odpowiedzieć użytkownik, zanim otrzyma promocję na 2 poziom zaufania."
-    tl3_requires_topics_replied_to: "Minimalna liczba tematów, na które użytkownik musiał odpowiedzieć w ciągu ostatnich 100 dni, aby kwalifikować się do promocji na 3 poziom zaufania. (0 albo więcej)"
-    tl3_requires_likes_received: "Minimalna liczba lajków, jakie należało otrzymać w ciągu ostatnich 100 dni, by kwalifikować się do promocji na 3 stopień zaufania."
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     newuser_max_links: "Ile linków może dodać nowy użytkownik do posta."
     newuser_max_images: "Ile obrazów może dodać nowy użytkownik do posta."
@@ -822,7 +819,6 @@ pl_PL:
     display_name_on_posts: "Pokazuj imię i nazwisko użytkownika przy jego postach, a także jego @nazwę użytkownika."
     enable_emoji: "Włącz obsługę emoji"
     emoji_set: "Jaki jest twój preferowany styl emoji?"
-    approve_post_count: "Liczba postów nowego użytkownika, które muszą być zatwierdzone"
     approve_unless_trust_level: "Posty użytkowników poniżej tego poziomu zaufania muszą być zatwierdzane"
     default_categories_watching: "Lista kategorii obserwowanych domyślnie."
     default_categories_tracking: "Lista kategorii śledzonych domyślnie."
@@ -859,11 +855,6 @@ pl_PL:
       category: 'Kategorie'
       topic: 'Wyniki'
       user: 'Użytkownicy'
-  sso:
-    not_found: "Sprawdzenie lub stworzenie konta jest niemożliwe, skontaktuj się z administracją strony"
-    account_not_approved: "Konto czeka na zatwierdzenie. Dostaniesz powiadomienie emailem, kiedy to się stanie."
-    unknown_error: "Błąd aktualizowania informacji, skontaktuj się z administracją strony"
-    timeout_expired: "Zbyt długi czas logowania, spróbuj zalogować się ponownie"
   original_poster: "Autor pierwszego wpisu"
   most_posts: "Większość postów"
   most_recent_poster: "Autor najnowszego wpisu"
@@ -1143,12 +1134,6 @@ pl_PL:
 
         Kliknij na linku poniżej, aby ustawić swoje hasło:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Potwierdź nowy adres email"
-      text_body_template: |
-        Potwierdź Twój nowy adres email na forum %{site_name} przez kliknięcie na poniższy link:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Zostałeś zaakceptowany na forum %{site_name}!"
       text_body_template: |+
@@ -1217,56 +1202,6 @@ pl_PL:
     title: "Warunki użytkowania"
   privacy_topic:
     title: "Polityka prywatności"
-  badges:
-    long_descriptions:
-      autobiographer: |
-        Ta odznaka jest przyznawana za wypełnienie <a href="/my/preferences">w twoim profilu i za wybranie zdjęcia profilowego. Pozwól lepiej się poznać i pokaż swoje zainteresowania, aby społeczność była jeszcze lepsza i silniej związana.
-      first_like: |+
-        Ta odznaka jest przyznawana, kiedy po raz pierwszy polubisz posta, posługując się przyciskiem :heart:. Dzięki lajkowaniu postów członkowie społeczności wiedzą, że ich wpisy były interesujące, użyteczne, fajne i zabawne. Dziel się miłością!
-
-      first_link: |
-        Ta odznaka jest przyznawana, kiedy po raz pierwszy podajesz link do innego tematu w odpowiedzi. Lajkowanie tematów pomaga innym czytającym w odnalezieniu powiązanych interesujących dyskusji, pokazując związki między tematami w obydwu kierunkach.
-      first_quote: |+
-        Ta odznaka jest przyznawana, kiedy po raz pierwszy cytujesz jakiś post w swojej odpowiedzi. Cytowanie powiązanych fragmentów wcześniejszych postów w odpowiedziach pozwala na prowadzenie dyskusji na temat.
-
-      first_share: |
-        Ta odznaka jest przyznawana, kiedy po raz pierwszy dzielisz się linkiem odpowiedzi albo tematu, posługując się przyciskiem "Prześlij". Dzielenie się linkami to znakomity sposób na pokazanie ciekawej dyskusji innym i na powiększenie grona znajomych.
-      read_guidelines: |
-        Ta odznaka jest przyznawana za <a href="/guidelines">przeczytanie przewodników społeczności</a>. Obserwowanie tych prostych przewodników i dzielenie się nimi pomaga zbudować bezpieczną, wesołą i trwałą społeczność.
-      reader: |
-        Ta odznaka jest przyznawana za przeczytanie długiego tematu. Czytanie jest podstawą. Uważne czytanie pozwoli ci śledzić dyskusję i komentować w lepszy, bardziej kompleksowy sposób.
-      editor: |
-        Ta odznaka jest przyznawana za edytowanie swojego postu. Nie wahaj się i edytuj swoje posty, by je ulepszać, poprawiać błędy oraz dodawać to, o czym wcześniej zapomniałeś.
-      first_flag: |
-        Ta odznaka jest przyznawana za oflagowanie posta. Flagowanie jest kluczowe dla dobrostanu naszej społeczności. Jeśli zauważysz post, który wymaga uwagi moderatora, prosimy,
-        oflaguj go bez wahania. Możesz także posłużyć się flagowaniem rozmowy, by wysłać </b>wiadomości</b> do innych użytkowników.
-      nice_share: |+
-        Ta odznaka jest przyznawana za podzielenie się linkiem do posta odwiedzonego przez 25 gości z zewnątrz. Dobra robota! Dzielenie się linkami do ciekawych rozmów z przyjaciółmi to wspaniały sposób na powiększenie naszej społeczności.
-
-      welcome: |
-        Ta odznaka jest przyznawana, kiedy dostajesz pierwszego lajka przy poście. Gratulacje, napisałeś coś, co inni użytkownicy uznali za interesujące, fajne lub użyteczne!
-      anniversary: |
-        Ta odznaka jest przyznawana, kiedy jesteś członkiem społeczności od roku z co najmniej jednym postem napisanym w tym roku. Dziękujemy, że się udzielasz w naszej społeczności!
-      good_share: |
-        Ta odznaka jest przyznawana za podzielenie się linkiem do posta odwiedzonego przez 300 gości z zewnątrz. Dobra robota! Pokazałeś interesującą dyskusję <i>wielu</i> nowym osobom i pomogłeś nam się rozwinąć.
-      great_share: |
-        Ta odznaka jest przyznawana za podzielenie się linkiem do posta odwiedzonego przez 100 gości z zewnątrz. Super! Pokazałeś interesującą dyskusję ogromnej ilości nowych osób i pomogłeś nam bardzo w rozwoju.
-      nice_post: |
-        Ta odznaka jest przyznawana za napisanie odpowiedzi, która otrzymała 10 lajków. Dobra robota!
-      nice_topic: "Ta odznaka jest przyznawana za utworzenie tematu, który otrzymał 10 lajków. Dobra robota! \n"
-      good_post: |
-        Ta odznaka jest przyznawana za napisanie odpowiedzi, która otrzymała 25 lajków. Wspaniała robota!
-      good_topic: "Ta odznaka jest przyznawana za utworzenie tematu, który otrzymał 25 lajków. Wspaniała robota! \n"
-      great_post: "Ta odznaka jest przyznawana za napisanie posta, który otrzymał 50 lajków. Super! \n"
-      great_topic: "Ta odznaka jest przyznawana za napisanie odpowiedzi, która otrzymała 50 lajków. Super! \n"
-      basic: |
-        Ta odznaka jest przyznawana, kiedy otrzymujesz 1 poziom zaufania. Dziękujemy, że tutaj jesteś i myszkujesz w tematach, by dowiedzieć się, o co nam chodzi. Zniesiono ograniczenia nałożone na ciebie jako na nowego użytkownika. Przyznano ci wszystkie podstawowe możliwości, takie jak pisanie prywatnych wiadomości, flagowanie, edytowanie Wikipedii, a także możliwość umieszczania zdjęć i linków.
-      member: |
-        Ta odznaka jest przyznawana, kiedy osiągasz 2 poziom zaufania. Dziękujemy, że od kilku tygodni udzielasz się w naszej społeczności. Możesz teraz wysyłać osobiste zaproszenia ze swojej strony użytkownika, tworzyć indywidualne tematy i wiadomości grupowe, a także masz kilka lajków na dzień więcej.
-      regular: |
-        Ta odznaka jest przyznawana, kiedy osiągasz 3 poziom zaufania. Dziękujemy, że od miesięcy udzielasz się tutaj regularnie, jesteś jednym z najaktywniejszych czytelników i rzetelnie przyczyniasz się do tego, że nasza społeczność jest wspaniała. Możesz teraz zmieniać kategorie i nazwy tematów, masz dostęp do prywatnego salonu, silniejsze flagi do oznaczania spamu oraz o wiele więcej lajków dziennie.
-      leader: |
-        Ta odznaka jest przyznawana, kiedy osiągasz 4 poziom zaufania. Jesteś liderem w tej społeczności, wybranym przez zespół, a twoje czyny i słowa dają pozytywny przykład. Możesz edytować wszystkie posty i zajmować się tematami z pozycji moderatora, tzn. przypinać, zamykać, odznaczać, archiwizować, dzielić, łączyć. Masz także setki lajków dziennie.
   admin_login:
     success: "Email wysłany"
     error: "Błąd!"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 7bcff1cb8f..a7a763a16d 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -169,6 +169,9 @@ pt:
     hot: "Tópicos quentes"
     top: "Melhores tópicos"
     posts: "Últimas mensagens"
+    private_posts: "Últimas mensagens privadas"
+    group_posts: "Últimas mensagens em %{group_name}"
+    group_mentions: "Últimas menções em %{group_name}"
   too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada."
   revert_version_same: "A versão atual é o mesma versão para a qual você está tentando reverter."
   excerpt_image: "imagem"
@@ -458,6 +461,7 @@ pt:
     confirmed: "O seu email foi atualizado."
     please_continue: "Continuar para %{site_name}"
     error: "Ocorreu um erro ao alterar o seu endereço de email. Talvez o endereço já esteja a ser utilizado?"
+    error_staged: "Ocorreu um erro ao alterar o seu endereço de email. O endereço de email já está a ser utilizado por um utilizador temporário."
     already_done: "Pedimos desculpa, esta hiperligação de confirmação já não é valida. Talvez o seu email já foi alterado?"
     authorizing_old:
       title: "Obrigado por confirmar o seu endereço de email atual."
@@ -712,11 +716,15 @@ pt:
     site_contact_username_warning: "Introduza o nome de uma conta de utilizador de um membro do pessoal de onde possam ser enviadas mensagens importantes automatizadas. Atualize sítio_contacto_nomedeutilizador nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
     notification_email_warning: "Não estão a ser enviados emails de notificação a partir de um endereço de email válido no seu domínio; a entrega do email será errática e não fiável. Por favor configure notificaçao_email para um endereço de email local válido nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
     subfolder_ends_in_slash: "A configuração da sua sub-página está incorreta; o DISCOURSE_RELATIVE_URL_ROOT termina com um traço."
+    email_polling_errored_recently:
+      one: "A consulta automática de emails gerou um erro nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes."
+      other: "A consulta automática de emails gerou %{count} erros nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes."
   site_settings:
     censored_words: "Palavras que serão automaticamente substituídas por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Eliminar automaticamente quaisquer mensagens ocultas que permaneçam escondidas por mais de 30 dias."
     default_locale: "Idioma padrão para esta instância do Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permitir aos utilizadores escolherem a sua própria língua preferencial para a interface."
+    set_locale_from_accept_language_header: "defina a língua de interface para utilizadores anónimos com base nos cabeçalhos de língua dos seus navegadores. (EXPERIMENTAL, não funciona com cache anónima)"
     min_post_length: "Tamanho mínimo permitido por mensagem, em caracteres"
     min_first_post_length: "Tamanho mínimo permitido para a primeira mensagem (corpo do tópico), em caracteres"
     min_private_message_post_length: "Tamanho mínimo permitido para mensagens, em caracteres"
@@ -928,17 +936,17 @@ pt:
     tl2_requires_likes_received: "Quantos gostos um utilizador deve receber antes de ser promovido para o Nível de Confiança 2."
     tl2_requires_likes_given: "Quantos gostos um utilizador deve atribuir antes de ser promovido para o Nível de Confiança 2."
     tl2_requires_topic_reply_count: "Quantos tópicos um utilizador deve responder antes de ser promovido para o Nível de Confiança 2."
-    tl3_time_period: "Período de tempo de requisitos do Nível de Confiança 3"
-    tl3_requires_days_visited: "Número mínimo de dias que o utilizador necessita de ter visitado o sítio nos últimos 100 dias para se qualificar à promoção para o Nível de Confiança 3. Configurar um período de tempo maior que nc3 para desativar promoções para nc3. (0 ou maior)"
-    tl3_requires_topics_replied_to: "Número mínimo de tópicos que o utilizador necessita de ter respondido nos últimos 100 dias para se qualificar à promoção para o Nível de Confiança 3. (0 ou mais)"
-    tl3_requires_topics_viewed: "Percentagem de tópicos criados nos últimos 100 dias que o utilizador precisa de ter visto para se qualificar à promoção para o Nível de Confiança 3. (0 a 100)"
-    tl3_requires_posts_read: "Percentagem de mensagens criadas nos últimos 100 dias que o utilizador precisa de ter visto para se qualificar à promoção para o Nível de Confiança 3. (0 a 100)"
+    tl3_time_period: "Período de tempo (em dias) dos requisitos do nível de confiança 3"
+    tl3_requires_days_visited: "Número mínimo de dias que o utilizador necessita de ter visitado o sítio nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3. Configure um período de tempo maior que nc3 para desativar promoções para nc3. (0 ou maior)"
+    tl3_requires_topics_replied_to: "Número mínimo de tópicos que o utilizador necessita de ter respondido nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3. (0 ou mais)"
+    tl3_requires_topics_viewed: "Percentagem de tópicos criados nos últimos dias (perídio nc3) que o utilizador precisa de ter visto para se qualificar à promoção para o Nível de Confiança 3. (0 a 100)"
+    tl3_requires_posts_read: "Percentagem de mensagens criadas nos últimos dias (perídio nc3) que o utilizador precisa de ter visto para se qualificar à promoção para o Nível de Confiança 3. (0 a 100)"
     tl3_requires_topics_viewed_all_time: "Número mínimo total de tópicos que o utilizador deve ter visto para se qualificar ao Nível de Confiança 3."
     tl3_requires_posts_read_all_time: "Número mínimo total de mensagens que o utilizador deve ter lido para se qualificar ao Nível de Confiança 3."
-    tl3_requires_max_flagged: "O utilizador não deverá ter mais do que x mensagens marcadas por x diferentes utilizadores nos últimos 100 dias para se qualificar à promoção para o nível de confiança 3, onde x é o valor definido. (0 ou superior)"
+    tl3_requires_max_flagged: "O utilizador não deverá ter mais do que x mensagens marcadas por x diferentes utilizadores nos últimos dias (período nc3) para se qualificar à promoção para o nível de confiança 3, onde x é o valor definido. (0 ou superior)"
     tl3_promotion_min_duration: "Número mínimo de dias em que a promoção para Nível de Confiança 3 dura antes que o utilizador possa ser despromovido para o Nível de Confiança 2."
-    tl3_requires_likes_given: "Número mínimo de gostos que o utilizador deve ter atribuído nos últimos 100 dias para se qualificar à promoção para o Nível de Confiança 3."
-    tl3_requires_likes_received: "Número mínimo de gostos que o utilizador deve ter recebido nos últimos 100 dias para se qualificar à promoção para o Nível de Confiança 3."
+    tl3_requires_likes_given: "Número mínimo de gostos que o utilizador deve ter atribuído nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3."
+    tl3_requires_likes_received: "Número mínimo de gostos que o utilizador deve ter recebido nos últimos dias (período nc3) para se qualificar à promoção para o Nível de Confiança 3."
     tl3_links_no_follow: "Não remover rel=nofollow das hiperligações publicadas por utilizadores com Nível de Confiança 3."
     min_trust_to_create_topic: "O Nível de Confiança mínimo necessário para criar um novo tópico."
     min_trust_to_edit_wiki_post: "O nível mínimo de confiança necessário para editar mensagens marcadas como wiki."
@@ -1011,6 +1019,8 @@ pt:
     unsubscribe_via_email: "Permitir aos utilizadores cancelar a subscrição de emails enviando um email com \"unsubscribe\" no assunto ou no corpo do email"
     unsubscribe_via_email_footer: "Adicionar uma hiperligação de cancelamento de subscrição ao rodapé de emails enviados"
     delete_email_logs_after_days: "Apagar registos de email após (N) dias. 0 para os manter indefinidamente"
+    max_emails_per_day_per_user: "Número máximo de emails para enviar aos utilizadores. 0 para desligar o limite"
+    manual_polling_enabled: "Enviar emails utilizando a API de resposta por email."
     pop3_polling_enabled: "Solicitação através de POP3 para respostas de emails"
     pop3_polling_ssl: "Utilize SSL ao ligar a um servidor POP3. (Recomendado)"
     pop3_polling_period_mins: "Período em minutos entre a verificação da conta POP3 para o email. NOTA: requer reinicialização."
@@ -1055,7 +1065,7 @@ pt:
     disable_avatar_education_message: "Desativar mensagem educativa para alteração de avatar."
     daily_performance_report: "Analise os logs diários NGINX e publique um tópico visível apenas para o pessoal com detalhes"
     suppress_uncategorized_badge: "Não mostrar distintivos para tópicos sem categoria nas listagens de tópicos."
-    permalink_normalizations: "Utilize a seguinte expressão regular antes de combinar hiperligações permanentes, por exemplo: /(\\/topic.*)\\?.*/\\1 irá retirar sequências de consulta de rotas de tópicos. O formato é regex+sequência utilize \\1 etc. para aceder a capturas."
+    permalink_normalizations: "Aplicar a seguinte expressão regular antes de igualar hiperligações permanentes, por exemplo: /(topic.*)\\?.*/\\1 irá remover parâmetros de roteamento para tópicos. O formato é regex+sequência utilize \\1 etc. para aceder a capturas.O formato é regex+string utilize \\1 etc. para aceder a capturas."
     global_notice: "Exibir um banner global URGENTE, EMERGÊNCIA a todos os visitantes, mudar para branco para esconder (HTML permitido)."
     disable_edit_notifications: "Desativa notificações de edição do sistema quando 'download_remote_images_to_local' está ativo."
     automatically_unpin_topics: "Desafixar tópicos automaticamente quando um utilizador chega ao final."
@@ -1093,6 +1103,7 @@ pt:
     approve_unless_trust_level: "Mensagens para utilizadores abaixo deste nível de confiança devem ser aprovados"
     notify_about_queued_posts_after: "Se não houver mensagens que estiveram à espera de revisão por mais do que estas horas, um email será enviado para o email de contacto. Configure para 0 para desativar estes emails."
     default_email_digest_frequency: "Por defeito, quantas vezes os utilizadores recebem emails de resumo."
+    default_include_tl0_in_digests: "Incluir mensagens de novos utilizadores nos emails de resumo por defeito. Utilizadores podem alterar isto nas suas preferências."
     default_email_private_messages: "Por defeito, enviar um email quando alguém envia mensagens ao utilizador."
     default_email_direct: "Por defeito, enviar um email quando alguém cita/responde a/menciona ou convida o utilizador."
     default_email_mailing_list_mode: "Por defeito, enviar um email por cada nova mensagem."
@@ -1131,7 +1142,8 @@ pt:
       pop3_polling_password_is_empty: "Deve configurar uma 'palavra-passe de polling pop3' antes de ativar o polling POP3."
       pop3_polling_authentication_failed: "Autenticação POP3 falhada. Por favor verifique as suas credenciais pop3."
       reply_by_email_address_is_empty: "Tem que definir um 'respostas por endereço de email' antes de habilitar a reposta por email."
-      pop3_polling_disabled: "Tem de habilitar o polling POP3 antes de habilitar a reposta por email."
+      email_polling_disabled: "Tem de habilitar a consulta manual ou automática de emails via POP antes de habilitar a reposta por email."
+      user_locale_not_enabled: "Tem de habilitar 'permitir definições regionais do utilizador' antes de habilitar esta configuração."
   notification_types:
     group_mentioned: "%{group_name} foi mencionado em %{link}"
     mentioned: "%{display_username} mencionou-o em %{link}"
@@ -1153,11 +1165,6 @@ pt:
       category: 'Categorias'
       topic: 'Resultados'
       user: 'Utilizadores'
-  sso:
-    not_found: "Não foi possível encontrar ou criar uma conta, contacte a administração do sítio"
-    account_not_approved: "A conta está pendente de aprovação, irá receber uma notificação por email assim que for aprovada."
-    unknown_error: "Erro ao atualizar a informação, contacte a administração do sítio"
-    timeout_expired: "Tempo para início de sessão de conta expirado, por favor tente entrar novamente"
   original_poster: "Participante Original"
   most_posts: "Maior parte das mensagens"
   most_recent_poster: "Participante Mais Recente"
@@ -1478,12 +1485,6 @@ pt:
 
         A sua resposta foi enviada de um email diferente daquele que esperávamos, por esta razão não temos a certeza que seja a mesma pessoa. Tente enviar de outro endereço de email ou contacte um membro do pessoal.
 
-    email_reject_no_message_id:
-      subject_template: "[%{site_name}]  Problema de email -- Sem identificador de mensagem"
-      text_body_template: |
-        Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou.
-
-        Não conseguimos encontrar o `Message-Id` nos cabeçalhos do email. Tente enviar através de outro endereço de email ou contacte um membro do pessoal.
     email_reject_no_account:
       subject_template: "[%{site_name}] Problema de email -- Conta Desconhecida"
       text_body_template: |+
@@ -1601,6 +1602,10 @@ pt:
 
         Esta é uma mensagem automática de %{site_name} para informá-lo de que a sua conta foi bloqueada por um membro do pessoal.
 
+        Por favor tome atenção que não poderá criar novas respostas ou tópicos até um membro do pessoal desbloquear a sua conta.
+
+        Se tem questões sobre este bloqueio, por favor contacte um [membro do pessoal](%{base_url}/about)
+
         Para orientação adicional, por favor consulte as [diretrizes da comunidade](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "Novo utilizador %{username}  bloqueado devido a sinalizações da comunidade."
@@ -1642,6 +1647,9 @@ pt:
   subject_pm: "[MP]"
   user_notifications:
     previous_discussion: "Respostas Anteriores"
+    reached_limit:
+      one: "AVISO: atingiu o número máximo de emails por dia. Próximas notificações será suprimidas."
+      other: "AVISO: atingiu o número máximo de %{count} emails por dia. Próximas notificações será suprimidas."
     in_reply_to: "Em Resposta A"
     unsubscribe:
       title: "Cancelar a Subscrição"
@@ -1654,50 +1662,10 @@ pt:
     posted_by: "Publicado por %{username} em %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} convidou-o para uma mensagem '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} convidou-o para uma mensagem
-
-        >%{username}
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        Por favor visite esta hiperligação para visualizar a mensagem: %{base_url}%{url}
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} convidou-o para uma mensagem '%{topic_title}'"
-      text_body_template: |2+
-
-        %{username} convidou-o para uma mensagem
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        em
-
-        > %{site_title} -- %{site_description}
-
-        Por favor visite esta hiperligação para ver a mensagem: %{base_url}%{url}
-
     user_invited_to_topic:
       subject_template: "[%{site_name}] %{username} convidou-o para '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} convidou-o para uma discussão
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        em
-
-        > %{site_title} -- %{site_description}
-
-        Por favor visite esta hiperligação para visualizar a mensagem: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
@@ -1936,6 +1904,7 @@ pt:
     post_deleted: "a mensagem foi eliminada pelo autor"
     user_suspended: "o utilizador foi suspenso"
     already_read: "o utilizador já leu esta mensagem"
+    exceeded_limit: "Excedeu max_emails_per_day_per_user"
     message_blank: "a mensagem está em branco"
     message_to_blank: "message.to está em branco"
     text_part_body_blank: "text_part.body está em branco"
@@ -1965,7 +1934,7 @@ pt:
       <h3>Dicas</h3>
       <p>
       <ul>
-        <li>A correspondência de títulos está priorizada &ndash; em caso de dúvida, pesquise por títulos</li> <li> Palavras únicas e incomuns irão sempre produzir os melhores resultados</li>
+        <li>A correspondência de títulos está priorizada &ndash; em caso de dúvida, pesquise por títulos</li>
         <li>Palavras únicas e incomuns irão sempre produzir os melhores resultados</li>
         <li>Tente pesquisar dentro de uma categoria, utilizador ou tópico em particular</li>
       </ul>
@@ -1977,7 +1946,7 @@ pt:
         <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:single_user</code></td></tr>
         <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td><code>group:foo</code></td><td><code>badge:foo</code></td><td></td></tr>
         <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
-        <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td colspan=3></td></tr>
+        <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td><code>in:pinned</code></td><td><code>in:unpinned</code></td><td></td></tr>
         <tr><td><code>posts_count:num</code></td><td><code>before:days or date</code></td><td><code>after:days or date</code></td> <td colspan=2></td></tr>
         </table>
       </p>
@@ -1988,58 +1957,6 @@ pt:
           <li><code>rainbows category:"parks and gardens" in:bookmarks</code> irá retornar uma pesquisa de tópicos que contêm a palavra “rainbows” na categoria “parks and gardens” e que estão marcados por si.</li>
         </ul>
       </p>
-  badges:
-    long_descriptions:
-      autobiographer: |
-        Este distintivo é concedido por preencher <a href="/my/preferences">o seu perfil de utilizador</a> e por selecionar uma imagem de perfil. Deixar a comunidade saber mais sobre quem você é e no que está interessado torna a comunidade melhor e mais ligada.
-      first_like: |
-        Este distintivo é concedido na primeira vez que gosta de uma mensagem utilizando o botão :heart:. Gostar de mensagens é uma excelente maneira de deixar os seus companheiros membros da comunidade saberem que o que eles postaram foi interessante, útil, giro, ou divertido. Partilhe o amor!
-      first_link: |
-        Este distintivo é concedido na primeira vez que coloca uma hiperligação para outro tópico numa resposta. Ligar tópicos ajuda os leitores a encontrarem conversas relacionadas interessantes, ao exibir ligação entre tópicos em ambas as direções.
-      first_quote: |
-        Este distintivo é concedido na primeira vez que cita uma mensagem na sua resposta. Citar secções relevantes de mensagens anteriores na sua resposta ajuda a manter as discussões focadas e no tópico.
-      first_share: |
-        Este distintivo é concedido na primeira vez que partilha uma hiperligação para uma mensagem ou tópico utilizando o botão de partilha. Partilhar hiperligações é uma excelente maneira de mostrar discussões interessantes com o resto do mundo e de fazer crescer a sua comunidade.
-      read_guidelines: |
-        Este distintivo é concedido por <a href="/guidelines">ler as diretrizes da comunidade</a>. Seguir e partilhar estas simples diretrizes ajuda a construir uma comunidade segura, divertida e sustentável.
-      reader: |
-        Este distintivo é concedido ao ler um tópico longo. Ler é fundamental. Ler atentamente ajuda-o a seguir a conversação e leva-o a respostas melhores e mais completas.
-      editor: |
-        Este distintivo é concedido ao editar a sua mensagem. Não hesite em editar as suas mensagens em qualquer altura para melhorá-las, corrigir pequenos erros, ou adicionar algo que se tenha esquecido.
-      first_flag: |
-        Este distintivo é concedido ao sinalizar uma mensagem. Sinalizar é  crítico para a saúde da sua comunidade. Se notar em alguma mensagem que necessite de atenção do moderador por favor
-        não hesite em sinalizá-la. Pode também utilizar o diálogo de sinalização para enviar <b>mensagens</b> para colegas utilizadores.
-      nice_share: |
-        Este distintivo é concedido ao partilhar uma hiperligação para uma mensagem que seja visitada por 25 visitantes externos. Bom trabalho! Partilhar hiperligações para discussões interessantes com amigos é uma excelente maneira de fazer crescer a nossa comunidade.
-      welcome: |
-        Este distintivo é concedido quando recebe o seu primeiro gosto numa mensagem. Parabéns, publicou algo que os colegas membros da comunidade acham interessante, giro, ou útil!
-      anniversary: |
-        Este distintivo é concedido quando tiver sido membro por um ano com pelo menos uma mensagem nesse ano. Obrigado por ficar por cá e por contribuir para a nossa comunidade!
-      good_share: |
-        Este distintivo é concedido por partilhar uma hiperligação para uma mensagem que seja visitada por 300 visitantes externos. Bom trabalho! Mostrou uma discussão interessante a <i>lot</i>novas pessoas e ajudou-nos a crescer.
-      great_share: |
-        Este distintivo é concedido por partilhar uma hiperligação para uma mensagem que seja visitada por 100 visitantes externos. Uau! Promoveu uma discussão interessante junto de uma enorme nova audiência para esta comunidade, e ajudou-nos a crescer de uma forma exponencial.
-      nice_post: |
-        Este distintivo é concedido ao criar uma resposta que obtém 10 gostos. Bom trabalho!
-      nice_topic: |
-        Este distintivo é concedido ao criar um tópico que obtém 10 gostos. Bom trabalho!
-      good_post: |
-        Este distintivo é concedido ao criar uma resposta que obtém 25 gostos. Bom trabalho!
-      good_topic: |+
-        Este distintivo é concedido ao criar um tópico que obtém 25 gostos. Bom trabalho!
-
-      great_post: |
-        Este distintivo é concedido ao criar uma mensagem que obtém 50 gostos. Uau!
-      great_topic: |
-        Este distintivo é concedido ao criar uma resposta que obtém 50 gostos. Uau!
-      basic: |
-        Este distintivo é concedido quando atinge o nível de confiança 1. Obrigado por ficar por cá durante algum tempo e por ler alguns tópicos para aprender do que se trata a nossa comunidade. As suas restrições de novo utilizador foram removidas, e foram-lhe atribuídas habilidades essenciais da comunidade, tais como mensagens pessoais, sinalização, edição da wiki, e a habilidade de publicar imagens e múltiplas hiperligações.
-      member: |
-        Este distintivo é concedido quando atinge o nível de confiança 2. Obrigado por participar durante um período de semanas para se juntar à nossa comunidade. Agora pode enviar convites pessoais da sua página de utilizador ou tópicos individuais, criar mensagens de grupo, e mais alguns gostos por dia!
-      regular: |
-        Este distintivo é concedido quando atingir o nível de confiança 3. Obrigado por ser uma parte regular da nossa comunidade por um período de meses, um dos leitores mais ativos e um contribuinte fiável no que torna a comunidade fantástica. Agora pode recategorizar e renomear tópicos, aceder à área do salão privado, sinalizações de spam mais poderosas, e muitos mais gostos por dia.
-      leader: |
-        Este distintivo é concedido quando atinge o nível de confiança 4. É um líder nesta comunidade, selecionado pelo pessoal, e define um exemplo positivo para a comunidade nos seus trabalhos e palavras. Tem a habilidade de editar todas as mensagens, realizar ações de moderador de tópicos tais como fixar, fechar, arquivar, dividir e unir, e toneladas de gostos por dia.
   admin_login:
     success: "Email Enviado"
     error: "Erro!"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 9693df9c36..8ee0083147 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -39,7 +39,6 @@ pt_BR:
         blocked_user_error: "Ocorre quando o remetente foi bloqueado."
         bad_destination_address: "Ocorre quando nenhum dos endereços de email nos campos Para/Cc/Cco era correspondente ao endereço de email recebido."
         strangers_not_allowed_error: "Ocorre quando um usuário tentou criar um novo tópico em uma categoria da qual não é membro."
-        insufficient_trust_level_error: "Ocorre quando um usuário tenta criar um novo tópico em uma categoria de que não possui o nível de confiança necessário."
         reply_user_not_matching_error: "Ocorre quando uma resposta chega em um endereço de email diferente ao da notificação enviada."
         topic_not_found_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi excluído."
         topic_closed_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi fechado."
@@ -177,7 +176,6 @@ pt_BR:
       can_not_modify_automatic: "Você não pode modificar um grupo automático"
       member_already_exist: "'%{username}' já é um membro deste grupo."
       invalid_domain: "'%{domain}' não é um domínio válido."
-      invalid_incoming_email: "'%{incoming_email}' não é um endereço de email válido."
     default_names:
       everyone: "todos"
       admins: "admins"
@@ -306,7 +304,6 @@ pt_BR:
       uncategorized_parent: "Sem categoria não pode ter uma categoria pai"
       self_parent: "A subcategoria mãe não pode ser ela mesma"
       depth: "Você não pode aninhar uma subcategoria sob outra"
-      email_in_already_exist: "Endereço de email de entrada '%{email_in}' já está em uso para categoria '%{category_name}'."
     cannot_delete:
       uncategorized: "Não é possível excluir Sem categoria"
       has_subcategories: "Não é possível excluir essa categoria porque tem subcategorias."
@@ -864,15 +861,9 @@ pt_BR:
     tl2_requires_likes_received: "Quantos likes um usuário deve receber antes de ser promovido a nível de confiança 2."
     tl2_requires_likes_given: "Quantos likes um usuário deve dar antes de ser promovido a nível de confiança 2."
     tl2_requires_topic_reply_count: "Quantos tópicos um usuário deve responder antes de ser promovido a nível de confiança 2."
-    tl3_requires_topics_replied_to: "Número mínimo de tópicos que um usuário precisa ter respondido o site nos últimos 100 dias para se qualificar a promoção ao nível de confiança 3. (0 ou mais)"
-    tl3_requires_topics_viewed: "O percentual de tópicos criados nos últimos 100 dias que um usuário precisa ter visto para se qualificar a promoção ao nível de confiança 3. (0 até 100)"
-    tl3_requires_posts_read: "O percentual de posts criados nos últimos 100 dias que um usuário precisa ter visto para se qualificar a promoção ao nível de confiança 3. (0 até 100)"
     tl3_requires_topics_viewed_all_time: "O mínimo total de tópicos que um usuário precisa ter visto para se qualificar a promoção ao nível de confiança 3."
     tl3_requires_posts_read_all_time: "O mínimo total de postagens que um usuário precisa ter lido para se qualificar a promoção ao nível de confiança 3."
-    tl3_requires_max_flagged: "Usuário precisa não ter mais que x postagens sinalizadas por x usuários diferentes nos últimos 100 dias para se qualificar à promoção ao nível de confiança 3, onde x é o valor dessa configuração. (0 ou mais)"
     tl3_promotion_min_duration: "O número mínimo de dias que uma promoção ao nível 3 dura antes que um usuário possa ser rebaixado novamente ao nível de confiança 2."
-    tl3_requires_likes_given: "O número mínimo de likes que devem ser dados nos últimos 100 dias para qualificar para promoção ao nível de confiança 3."
-    tl3_requires_likes_received: "O número mínimo de likes que devem ser recebidos nos últimos 100 dias para se qualificar para promoção ao nível de confiança 3."
     tl3_links_no_follow: "Não remover rel=nofollow de links postados por usuários do nível de confiança 3."
     min_trust_to_create_topic: "O nível de confiança mínimo necessário para criar um novo tópico."
     min_trust_to_edit_wiki_post: "O nível de confiança mínimo necessário para editar uma postagem marcada como wiki."
@@ -999,7 +990,6 @@ pt_BR:
     enable_emoji: "Habilitar emoji"
     emoji_set: "Como você gostaria do seu emoji?"
     enforce_square_emoji: "Forçar proporção quadrangular para todos emojis."
-    approve_post_count: "Quantidade de mensagens de novos usuários que devem ser aprovadas"
     approve_unless_trust_level: "Mensagens para os usuários abaixo deste nível de confiança devem ser aprovados"
     notify_about_queued_posts_after: "Se existirem tópicos aguardando revisão a mais de N horas, um e-mail será enviado para o e-mail de contato. Coloque 0 para cancelar estes e-mails."
     errors:
@@ -1035,11 +1025,6 @@ pt_BR:
       category: 'Categorias'
       topic: 'Resultados'
       user: 'Utilizadores'
-  sso:
-    not_found: "Não foi possível procurar ou criar conta, contate o administrador do site"
-    account_not_approved: "A conta está pendente de aprovação, você receberá uma notificação por email assim que for aprovada"
-    unknown_error: "Erro ao fazer update de informação, contate o administrador do site"
-    timeout_expired: "O tempo de login ultrapassou o limite, por favor tente logar de novo"
   original_poster: "Postador original"
   most_posts: "Maior parte das postagens"
   most_recent_poster: "Maior parte das Postagens Recentes"
@@ -1314,7 +1299,6 @@ pt_BR:
         Para informações adicionais, por favor consulte as nossas [diretrizes da comunidade](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Conta bloqueada"
-      text_body_template: "Olá, \n\nEsta é uma mensagem automática do %{site_name} para informá-lo de que a sua conta foi bloqueada por um membro da administração. \n\nPara informações adicionais, por favor consulte as nossas [diretrizes da comunidade](%{base_url}/guidelines).\n"
     user_automatically_blocked:
       subject_template: "Novo usuário %{username} foi bloqueado devido a denúncias da comunidade"
     spam_post_blocked:
@@ -1345,33 +1329,6 @@ pt_BR:
     posted_by: "Postado por %{username} em %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} convidou você para uma mensagem '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} convidou você para uma mensagem
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        a
-
-        > %{site_title} -- %{site_description}
-
-        Por favor visitar este link para visualizar a mensagem: %{base_url}%{url}
-    user_invited_to_topic:
-      text_body_template: |2
-
-        %{username} convidou você para uma discussão
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        em
-
-        > %{site_title} -- %{site_description}
-
-        Por favor visitar o link para visualizar a mensagem: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
     user_quoted:
@@ -1417,12 +1374,6 @@ pt_BR:
 
         Clique no link a seguir para escolher uma senha para a sua nova conta:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Confirma o seu novo endereço de email"
-      text_body_template: |
-        Confirma o seu endereço de email novo para %{site_name} clicando no seguinte link:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Você foi aprovado no %{site_name}!"
       text_body_template: |
@@ -1512,57 +1463,6 @@ pt_BR:
     title: "Termos de Serviço"
   privacy_topic:
     title: "Política de Privacidade"
-  badges:
-    long_descriptions:
-      autobiographer: |
-        Este emblema é concedido por preencher <a href="/my/preferences">seu perfil</a> e selecionar uma foto de perfil. Deixar a comunidade conhecer mais sobre quem você é, e, quais são seus interesses, a torna melhor e mais conectada.
-      first_like: |
-        Este emblema é concedito na primeira vez que você curtir uma m,ensagem usando o botão :heart: . Curtir mensagens é uma ótima maneira de dizer aos membros da sua comunidade que suas mensagens foram interessantes, úteis, legais ou divertidas. Compatilhe o amor!
-      first_link: |
-        Este emblema é concedido na primeira vez que você põe um link para outro tópico numa mensagem. Linkar tópicos ajuda outros leitores a encontrar conversas interessantes relacionadas, monstrando ligações entre tópicos em ambas direções.
-      first_quote: |
-        Este emblema é concedido na primeira vez que você cita uma mensagem na sua resposta. Citar seções relevantes de mensagens anteriories na sua resposta ajuda a manter a discussão focada e no assunto original.
-      first_share: |
-        Este emblema é concedido na primeira vez que você compartilha um link para uma mensagem ou tópico usando o botão compartilhar. Compartilhar links é uma ótima maneira de mostrar discussões interessantes com o resto do mundo e assim, crescer sua comunidade.
-      read_guidelines: |
-        Este emblema é concedido por <a href="/guidelines">ler o guia da comunidade</a>. Seguir e compartilhar estas simples regras ajuda a construir uma segura, divertida e sustentável comunidade.
-      reader: |
-        Este emblema é concedido por ler um tópico longo. Ler é fundamental. Ler atentamente ajuda a seguir a conversa e leva a melhores, e mais completas, respostas.
-      editor: |
-        Este emblema é concedido por editar sua mensagem. Não exite em editar sua mensagem a qualquer tempo para melhora-la , consertar pequenos enganos, ou adicionar qualquer coisa que você tenha esquecido.
-      first_flag: |
-        Este emblema é concedido por sinalizar uma mensagem. Sinalizar é critico para saúde da comunidade. Se você notar qualquer mensagem que necessita de atenção da moderação, por favor, não exite em sinalizar. Você pode também usar o diálogo de sinalização para enviar mensagem para outros usuários.
-      nice_share: |
-        Este emblema é concedido por compartilhar um link para uma mensagem que foi visitada por 25 visitantes externos. Bom trabalho! Compartilhar links para discussões interessantes é uma excelente forma de crescer sua comunidade.
-      welcome: |
-        Este emblema é concedido quando você recebe sua primeira curtida numa mensagem. Parabéns, você postou algo que sua comunidade achou interessante, legal ou divertido!
-      anniversary: |
-        Este emblema é concedido quanto você é membro por um ano com pelo menos uma mensagem nesse ano. Obrigado por fica por aqui e contribuir com nossa comunidade!
-      good_share: |
-        Este emblema é concedido por compartilhar um link de uma mensagem que foi visitada por 300 visitantes externos. Bom Trabalho! Você mostrou uma discussão interessante para um <i>monte</i> de novas pessoas e nos ajudou a crescer.
-      great_share: |
-        Este emblema é concedido por compartilhar um link de uma mensagem que foi visitada por 100 visitantes externos. Nossa! Você promoveu uma discussão interessante para uma grande nova audiência para esta comunidade, e nos ajudou a crescer bastante.
-      nice_post: |
-        Este emblema é concedido por criar uma resposta que conseguiu 10 curtidas. Bom trabalho!
-      nice_topic: |
-        Este emblema é concedido por criar um tópico que conseguiu 10 curtidas. Bom trabalho!
-      good_post: |
-        Este emblema é concedido por criar uma resposta que conseguiu 25 curtidas. Bom trabalho!
-      good_topic: |
-        Este emblema é concedido por criar um tópico que conseguiu 25 curtidas. Bom trabalho!
-      great_post: |
-        Este emblema é concedido por criar um tópico que conseguiu 50 curtidas. Uau!
-      great_topic: |
-        Este emblema é concedido por criar uma resposta que conseguiu 50 curtidas. Uau!
-      basic: |
-        Este emblema é concedido quando você alcança o nível de confiança 1. Obrigado por permanecer por aqui e ler alguns tópicos para aprender sobre o que é nossa comunidade. Suas restrições de novo usuário foram suspensas, e você ganhou todas habilidades essenciais de comunidade, como mensagens pessoais, sinalizações, edições de wiki, e habilidade de postar imagens e múltiplos links.
-      member: |
-        Este emblema é concedido quando você alcança o nível de confiança 2. Obrigado por participar durante essas semanas da nossa comuniadde. Você pode agora enviar convites pessoais da sua página de usuário ou de tópocos individuais, criar mensagens de grupo, e algumas curtidas a mais por dia.
-      regular: |+
-        Este emblema é concedido quando você alcança o nível de confiança 3. Obrigado por ser parte regular da nossa comunidade durante todos esses meses, um dos mais ativos leitores e colaborador confiável para o que faz essa comunidade grande. Você pode agora recategorizar e renomear tópicos, acessar a área privada do lounge, sinalizações mais fortes de spam, e muito mais curtidas por dia.
-
-      leader: |
-        Este emblema é concedido quando você alcança o nível de confiança 4. Você é um líder desta comunidade selecionado pela equipe, e define um exemplo positivo em suas ações e palavras. Você tem habilidade de editar todos tópicos, agir como moderador nas ações como fixar, fechar, delistar, arquivar, separar, agrupar e vários curtidas a mais por dia.
   admin_login:
     success: "Email Enviado"
     error: "Erro!"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 1ccbc6ec44..0337cb7d42 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -73,6 +73,7 @@ ro:
   not_found: "Adresa URL sau resursă cerută nu pot fi găsite."
   invalid_access: "Nu aveţi permisiunea să vedeţi această resursă."
   read_only_mode_enabled: "Site-ul este în modul doar-citire. Interacțiunile sunt dezactivate."
+  likes: "Aprecieri"
   too_many_replies:
     one: "Ne pare rău, dar utilizatori noi sunt limitaţi la 1 răspuns pe discuţie."
     few: "Ne pare rău, dar utilizatori noi sunt limitaţi la %{count} răspunsuri pe discuţie."
@@ -657,7 +658,7 @@ ro:
     newuser_max_mentions_per_post: "Numărul maxim de notificări de @nume poate folosii un utilizator nou într-o postare."
     newuser_max_replies_per_topic: "Numărul maxim de răspunsuri un utilizator nou poate adăuga într-o singură discuție până când cineva le răspunde."
     max_mentions_per_post: "Numărul maxim de notificări de @nume oricine poate folosii într-o postare."
-    create_thumbnails: "Crează previzualizari de tipul thumbnail și lightbox ale imaginilor ce sunt prea mari să încapă într-o postare."
+    create_thumbnails: "Creează previzualizari de tipul thumbnail și lightbox ale imaginilor ce sunt prea mari să încapă într-o postare."
     email_time_window_mins: "Așteaptă (n) minute până să trimiți orice email de notificare, pentru a da utilizatorilor șansa să-și editeze și să-și finalizeze postările."
     email_posts_context: "Câte răspunsuri precedente să fie incluse ca context în email-urile de notificare."
     flush_timings_secs: "Cât de frecvent se resetează timpul de pe server, în secunde."
@@ -710,7 +711,7 @@ ro:
     autohighlight_all_code: "Forțează aplicarea de iluminat cod către toate preformatările de blocări de cod chiar când este explicit specificată limba."
     feed_polling_enabled: "DOAR ÎNCORPOREAZĂ: Să încorporeze un RSS/ATOM ca postare."
     feed_polling_url: "DOAR ÎNCORPOREAZĂ: URL de RSS/ATOM să încorporeze."
-    embed_by_username: "Numele de utilizator Discourse al utilizatorului ce crează discuții încorporate."
+    embed_by_username: "Numele de utilizator Discourse al utilizatorului ce creează discuții încorporate."
     embed_username_key_from_feed: "Discourse username of the user who creates the embedded topics.."
     embed_truncate: "Truncate the embedded posts."
     embed_post_limit: "Numărul maxim de postări de încorporat."
@@ -830,10 +831,6 @@ ro:
     subject_template: "[%{site_name}] O nouă versiune de Discourse, reactializare valabilă"
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] update Actualizare valabilă"
-  flags_reminder:
-    please_review: "Vă rugăm revizionați-le."
-    post_number: "postarea"
-    how_to_disable: 'Arata acest email schimbând setarea notify_about_flags_after la valoarea 0.'
   flags_dispositions:
     agreed: "Mulțumim pentru avertizare. Suntem de acord că există o problemă și ne vom interesa."
     agreed_and_deleted: "Mulțumim pentru avertizare. Suntem de acord că este o problemă și postarea v-a fi eliminată."
@@ -874,12 +871,6 @@ ro:
         Pentru ajutor adițional, faceți referie la [regulile de comunitate](%{base_url}/).
     blocked_by_staff:
       subject_template: "Cont blocat"
-      text_body_template: |
-        Salut,
-
-        Acesta e un mesaj automat din partea %{site_name} pentru a vă informa de blocarea contului dvs de către un membru al personalului.
-
-        Pentru ajutor adițional, faceți referie la [regulile de comunitate](%{base_url})..
     user_automatically_blocked:
       subject_template: "Noul utilizator %{username} a fost blocat datorită marcajelor date de comunitate"
     spam_post_blocked:
@@ -950,12 +941,6 @@ ro:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Autentificare"
-    confirm_new_email:
-      subject_template: "[%{site_name}] Confirmă noua adresă de email"
-      text_body_template: |
-        Confirmă noua adresă de email pentru %{site_name} făcând click pe următoarea adresă:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Ați fost aprobat pe site-ul %{site_name}!"
     signup:
@@ -967,7 +952,6 @@ ro:
 
         Dacă adresa de mai sus nu e accesibilă, încercați să o copiați și să o lipiți în bară de adrese a propriului browser.
   page_not_found:
-    title: "Pagina cerută nu există sau este privată."
     popular_topics: "Populare"
     recent_topics: "Recente"
     see_more: "Mai multe"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 0a1422a8e5..708dbc1310 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -29,6 +29,11 @@ ru:
     incoming:
       default_subject: "Входящее письмо от %{email}"
       show_trimmed_content: "Показывать урезанное содержимое"
+      errors:
+        empty_email_error: "Происходит, когда мы получаем пустое письмо."
+        no_message_id_error: "Происходит, когда письмо не имеет заголовка 'Message-Id'."
+        inactive_user_error: "Происходит, когда отправитель неактивен."
+        blocked_user_error: "Происходит, когда отправитель заблокирован."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -182,7 +187,6 @@ ru:
       can_not_modify_automatic: "Нельзя изменять автоматическую группу."
       member_already_exist: "'%{username}' уже является членом этой группы."
       invalid_domain: "'%{domain}' является некорректным доменом."
-      invalid_incoming_email: "'%{incoming_email}' является некорректным адресом электронной почты."
     default_names:
       everyone: "все"
       admins: "администраторы"
@@ -306,7 +310,6 @@ ru:
       uncategorized_parent: "Разделу для тем вне разделов нельзя назначать родительский раздел."
       self_parent: "Подраздел не может быть родительским для самого себя."
       depth: "Подраздел не может быть родительским, т.к. допустим только один уровень вложенности разделов. "
-      email_in_already_exist: "Данный имейл адрес  '%{email_in}'  уже используется для уведомлений в категории '%{category_name}'"
     cannot_delete:
       uncategorized: "Нельзя удалить раздел, предназначенный для тем вне разделов"
       has_subcategories: "Невозможно удалить этот раздел, т.к. в нем есть подразделы."
@@ -333,6 +336,7 @@ ru:
     by_type:
       first_day_replies_per_day: "Вы достигли лимита на создание ответов для нового пользователя в первый день на сайте. Пожалуйста, попробуйте через %{time_left}."
       first_day_topics_per_day: "Вы достигли лимита на создание тем для нового пользователя в первый день на сайте. Пожалуйста, попробуйте через %{time_left}."
+      edit_post: "Вы достигли лимита редактирования сообщений на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
     hours:
       one: "1 час"
       few: "1 часа"
@@ -477,6 +481,10 @@ ru:
     confirmed: "Ваш адрес электронной почты обновлен."
     please_continue: "Перейти на %{site_name}"
     error: "При смене электронного адреса произошла ошибка. Возможно, этот адрес уже используется?"
+    already_done: "Извините, ссылка для подтверждения устарела. Возможно, ваш email уже изменен?"
+    authorizing_old:
+      title: "Спасибо за подтверждение вашего email-адреса"
+      description: "Мы отправили сообщение с ссылкой для подтверждения вашего нового адреса."
   activation:
     action: "Нажмите сюда, чтобы активировать вашу учетную запись"
     already_done: "Извините, ссылка на активацию учетной записи устарела. Возможно, ваша учетная запись уже активирована?"
@@ -790,6 +798,7 @@ ru:
     traditional_markdown_linebreaks: "Использовать стандартный способ переноса строки в Markdown: строка должна заканчиваться двумя пробелами, чтобы перенос строки после нее сработал."
     post_undo_action_window_mins: "Количество минут, в течение которых пользователь может отменить действия, связанные с сообщениями: 'Мне нравится', 'Жалоба' и др."
     must_approve_users: "Персонал должен подтвердить регистрации новых пользователей перед тем, как им будет разрешен доступ к сайту.\nВНИМАНИЕ: включая данную функцию на существуещем сайте будет закрыт доступ к сайту для всех пользователей, кроме персонала."
+    pending_users_reminder_delay: "Уведомлять модераторов, если новые пользователи ждут одобрения больше чем столько часов. Установите в -1 для отключения уведомлений."
     ga_tracking_code: "Google analytics (ga.js) tracking code код, например: UA-12345678-9; смотрите http://google.com/analytics"
     ga_domain_name: "Google analytics (ga.js) доменное имя, например: mysite.com; смотрите http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code код, например: UA-12345678-9; больше информации можно узнать на странице http://google.com/analytics"
@@ -833,11 +842,13 @@ ru:
     max_username_length: "Максимально допустимая длина псевдонима, символов."
     reserved_usernames: "Псевдонимы, запрещенные для регистрации"
     min_password_length: "Минимальная длина пароля"
+    min_admin_password_length: "Минимальная длина пароля для Администратора."
     block_common_passwords: "Не позволять использовать пароли из списка 10 000 самых частоиспользуемых паролей."
     enable_sso_provider: "Реализация протокола SSO провайдера через /session/sso_provider , необходимо установить sso_secret"
     sso_url: "URL точки единого входа"
     sso_secret: "Секретный набор символов, используемый для проверки подлинности  зашиврованного входа с помощью SSO, убедитесь, что это 10 или более символов"
     sso_overrides_avatar: "Использовать аватары предоставляемые внешним SSO провайдером. При этом настоятельно рекомендуется отключить функцию: разрешить закгрузку аватаров."
+    sso_not_approved_url: "Перенаправлять неподтвержденные SSO-аккаунты на этот URL"
     enable_local_logins: "Включить внутреннюю систему учетных записей пользователей по логину и паролю. (Требуется для работы системы приглашений.)"
     allow_new_registrations: "Разрешить регистрацию новых пользователей. Выключите, чтобы запретить посетителям создавать новые учетные записи."
     enable_yahoo_logins: "Разрешить идентификацию с Yahoo"
@@ -886,6 +897,7 @@ ru:
     s3_secret_access_key: "Amazon S3 secret key для загрузки и хранения изображений"
     s3_region: "Географический регион Amazon S3, который будет использоваться для хранения изображений"
     avatar_sizes: "Список автоматически сгенерированных размеров аватар."
+    default_opengraph_image_url: "URL картинки opengraph по-умолчанию."
     enable_flash_video_onebox: "Разрешить умную вставку ссылок sqf и flv (Adobe Flash). ВНИМАНИЕ: повышает риски безопасности сайта."
     default_invitee_trust_level: "Уровень доверия приглашенных пользователей по-умолчанию (от 0 до 4)."
     default_trust_level: "Уровень доверия по умолчанию для всех новых пользователей (0-4). ВНИМАНИЕ! Повышая уровень доверия для новых пользователей, Вы можете столкнуться с большим колличеством спама."
@@ -899,15 +911,9 @@ ru:
     tl2_requires_likes_received: "Сколько симпатий пользователь должен получить для продвижения до уровня доверия 2."
     tl2_requires_likes_given: "Сколько симпатий пользователь должен выразить для продвижения до уровня доверия 2."
     tl2_requires_topic_reply_count: "В скольких темах пользователь должен ответить для продвижения до уровня доверия 2."
-    tl3_requires_topics_replied_to: "Минимальное количество тем, в которых пользователь должен ответить за последние 100 дней, для возможности продвижения до уровня доверия 3. (0 и больше)"
-    tl3_requires_topics_viewed: "Какой процент тем созданных за последние 100 дней, должен просмотреть пользовательзователь для повышения уровня доверия до 3. (0 to 100)"
-    tl3_requires_posts_read: "Какой процент сообщений написанных за последние 100 дней, должен просмотреть пользовательзователь для повышения уровня доверия до 3. (0 to 100)"
     tl3_requires_topics_viewed_all_time: "Сколько сообщений пользователь должен прочитать для поднятия уровня доверия до 3."
     tl3_requires_posts_read_all_time: "Сколько сообщений пользователь должен прочитать для поднятия уровня доверия до 3."
-    tl3_requires_max_flagged: "Допустимое колличество сообщений пользователя, на которые пожаловалось x разных пользователей за последние 100 дней, для того чтобы была возможность поднять уровень доверия до 3, где x это значение (от 0 и выше)"
     tl3_promotion_min_duration: "Минимальное количество дней , в течении которых пользователь с уровнем доверия 3 не может быть понижен до урованя доверия 2."
-    tl3_requires_likes_given: "Минимальное количество лайков, которое должен получить пользователь за последние 100 дней, для возможности продвижения до уровня доверия 3."
-    tl3_requires_likes_received: "Минимальное количество лайков, которое должен получить пользователь за последние 100 дней, для возможности продвижения до уровня доверия 3."
     tl3_links_no_follow: "Не удалять rel=nofollow из ссылок от пользователей с уровнем доверия 3."
     min_trust_to_create_topic: "Минимальный уровень доверия для создания новой темы."
     min_trust_to_edit_wiki_post: "Минимальный уровень доверия, требуемый для редактирования вики-сообщения."
@@ -965,6 +971,7 @@ ru:
     disable_emails: "Запретить форуму отсылать какие-либо письма."
     strip_images_from_short_emails: "Удалять картинки из писем размером менее 2800 байт"
     short_email_length: "Какие письма считать короткими,  в байтах"
+    unsubscribe_via_email_footer: "Прикреплять ссылку для отписки от рассылки в футер отправляемых email'ов"
     pop3_polling_enabled: "Загружать ответы в форум в виде писем с учетной записи POP3."
     pop3_polling_ssl: "Использовать SSL при подключениик POP3 серверу. (Рекомендовано)"
     pop3_polling_period_mins: "Периодичность загрузки e-mail учетной записи POP3. ВНИМАНИЕ: требует перезапуска."
@@ -1001,6 +1008,7 @@ ru:
     allow_profile_backgrounds: "Разрешить пользователям загружать фоновые картинки для своих страниц профиля."
     enable_mobile_theme: "Мобильные устройства используют адаптированную тему с возможностью переключения в обычный вид. Отключите данную настройку если вы хотите использовать собственный стиль для мобильных устройств."
     dominating_topic_minimum_percent: "Количество сообщений, отправленных пользователем подряд в одной теме, прежде чем ему будет показано предупреждение о слишком частых ответах."
+    disable_avatar_education_message: "Отключить обучающее сообщение при смене аватара."
     daily_performance_report: "Ежедневно анализировать логи сервера NGINX и отправлять сообщение с результатами анализа в тему, видимую только персоналу."
     suppress_uncategorized_badge: "Не показывать награду в списках тем для тех тем, которые вне разделов."
     global_notice: "Показать СРОЧНОЕ ВАЖНОЕ объявление на сайте всем пользователям и посетителям. Удалите содержание, чтобы отменить объявление. Разрешено использование HTML."
@@ -1032,7 +1040,6 @@ ru:
     enable_emoji: "Активировать смайлы Emoji"
     emoji_set: "Какую коллекцию Emoji использовать?"
     enforce_square_emoji: "Принудительно использовать квадратные пропорции для смайликов."
-    approve_post_count: "Колличество постов от новых пользователей, которые должны быть проверены и одобрены."
     approve_unless_trust_level: "Сообщения для пользователей ниже этого уровня доверия подлежат проверки"
     errors:
       invalid_email: "Неправильный адрес электронной почты."
@@ -1067,11 +1074,6 @@ ru:
       category: 'Разделы'
       topic: 'Результаты'
       user: 'Пользователи'
-  sso:
-    not_found: "Мы не можем найти или создать данный аккаунт, свяжитесь с администратором сайта."
-    account_not_approved: "Аккаунт ожидает проверки. Вы получите уведомление на почту, когда ваш аккаунт будет одобрен."
-    unknown_error: "Ошибка обновления информации, сообщите об этом администратору сайта."
-    timeout_expired: "Закончилась сессия авторизации, пожалуйста войдите заново на сайт."
   original_poster: "Автор"
   most_posts: "Большинство сообщений"
   most_recent_poster: "Последний автор"
@@ -1181,6 +1183,8 @@ ru:
       few: "%{count} жалобы ожидают рассмотрения"
       many: "%{count} жалоб ожидают рассмотрения"
       other: "%{count} жалоб ожидают рассмотрения"
+  unsubscribe_mailer:
+    subject_template: "Подтвердите, что вы больше не желаете получать обновления по электронной почте от %{site_title}"
   invite_mailer:
     subject_template: "%{invitee_name} приглашает вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}"
     text_body_template: |
@@ -1355,6 +1359,10 @@ ru:
     csv_export_failed:
       subject_template: "Экспорт не удался"
       text_body_template: "Мы сожалеем, но возникли неполадки с экспортом ваших данных. Свяжитесь с администратором сайта."
+    email_reject_inactive_user:
+      subject_template: "[%{site_name}] Неполадки с e-mail -- неактивный пользователь"
+    email_reject_blocked_user:
+      subject_template: "[%{site_name}] Неполадки с e-mail -- заблокированный пользователь"
     email_reject_no_account:
       subject_template: "[%{site_name}] Неполадки с письмом - не найдена учетная запись"
     email_reject_empty:
@@ -1401,12 +1409,6 @@ ru:
         За дополнительной информацией обратитесь к [инструкции пользователя](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Учетная запись заблокирована"
-      text_body_template: |
-        Здравствуйте!
-
-        Это автоматическое сообщение с сайта %{site_name} для информирования вас о том, что ваша учетная запись заблокирована администратором или модератором.
-
-        Получить дополнительную информацию вы можете в нашей [инструкции пользователя](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "Пользователь %{username} заблокирован участниками сообщества"
     spam_post_blocked:
@@ -1444,43 +1446,102 @@ ru:
     posted_by: "Отправлено %{username} %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} приглашает вас к обсуждению сообщения '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} написал Вам сообщение
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        на сайте
-
-        > %{site_title} -- %{site_description}
-
-        Просмотреть сообщение вы можете по ссылке: %{base_url}%{url}
-    user_invited_to_topic:
-      text_body_template: |2
-
-        %{username} приглашает вас к обсуждению
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        на сайте:
-
-        > %{site_title} -- %{site_description}
-
-        Просмотреть сообщение вы можете по ссылке: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
+    user_replied_pm:
+      subject_template: "[%{site_name}] [ЛС] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
     user_quoted:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
+    user_linked:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
     user_mentioned:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
+    user_group_mentioned:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
     user_posted:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
     user_posted_pm:
       subject_template: "[%{site_name}] [Личное сообщение] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
+    user_posted_pm_staged:
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+        %{message}
+
+        ---
+        %{respond_instructions}
     digest:
       why: "Сводка обсуждений на сайте %{site_link} с момента вашего последнего визита %{last_seen_at}"
       subject_template: "Cводка новостей сайта [%{site_name}]"
@@ -1533,6 +1594,10 @@ ru:
         Подтвердите ваш новый адрес электронной почты для сайта %{site_name}, перейдя по следующей ссылке:
 
         %{base_url}/users/authorize-email/%{email_token}
+    confirm_old_email:
+      subject_template: "[%{site_name}] Подтвердите текущий адрес электронной почты"
+    notify_old_email:
+      subject_template: "[%{site_name}] Ваш адрес электронной почты был подтвержден"
     signup_after_approval:
       subject_template: "Ваша учетная запись на сайте %{site_name} одобрена!"
       text_body_template: |
@@ -1563,6 +1628,7 @@ ru:
 
         Если данная ссылка не работает, попробуйте скопировать её и вставить в строку адреса вашего браузера.
   page_not_found:
+    title: "Упс! Эта страница не существует или скрыта от публичного просмотра."
     popular_topics: "Популярные"
     recent_topics: "Недавние"
     see_more: "Еще"
@@ -1621,23 +1687,6 @@ ru:
     title: "Пользовательское соглашение"
   privacy_topic:
     title: "Политика конфиденциальности"
-  badges:
-    long_descriptions:
-      autobiographer: |
-        Эта награда выдается за заполнение
-         <a href="/my/preferences">своей страницы профиля</a> и выбор картинки профиля. Возможность узнать больше о дуг друге позволяет форумчанам сплотиться в тесное сообщество.
-      nice_post: |
-        Эта награда выдается за сообщение, собравшее 10 симпатий. Отличная работа!
-      nice_topic: |
-        Эта награда выдается за тему, собравшую 10 симпатий. Отличная работа!
-      good_post: |
-        Эта награда выдается за сообщение, собравшее 25 симпатий. Превосходная работа!
-      good_topic: |
-        Эта награда выдается за тему, собравшую 25 симпатий. Превосходная работа!
-      great_post: |
-        Эта награда выдается за сообщение, собравшее 50 симпаний. Вау!
-      great_topic: |
-        Эта награда выдается за тему, собравшую 50 симпаний. Вау!
   admin_login:
     success: "письмо отправлено"
     error: "Ошибка!"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 0437c8025d..7461986996 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -178,7 +178,6 @@ sk:
       can_not_modify_automatic: "Nemôžte upravovať automatickú skupinu"
       member_already_exist: "'%{username}' už je členom tejto skupiny."
       invalid_domain: "'%{domain}' nie je platnou doménou."
-      invalid_incoming_email: "'%{incoming_email}' je neplatná emailová addresa."
     default_names:
       everyone: "všetci"
       admins: "administrátori"
@@ -319,7 +318,6 @@ sk:
       uncategorized_parent: "Nekategorizovaná nemôže mať nadradenú kategóriu"
       self_parent: "Podkategória si nemôže byť zároveň kategóriou "
       depth: "Nemôžte umiestniť podkategóriu pod inú podkategóriu"
-      email_in_already_exist: "Prichádzajúca emailová adresa '%{email_in}' sa už používa pre kategóriu '%{category_name}'."
     cannot_delete:
       uncategorized: "Nemôžte vymazať nekategorizované"
       has_subcategories: "Nemôžte vymazať kategóriu pretože obsahuje podkategórie"
@@ -932,17 +930,9 @@ sk:
     tl2_requires_likes_received: "Koľko \"Páči sa\" musí nový užívateľ dostať pred povýšením na stupeň dôvery 2."
     tl2_requires_likes_given: "Koľko \"Páči sa\" musí nový užívateľ rozdať pred povýšením na stupeň dôvery 2."
     tl2_requires_topic_reply_count: "Na koľko tém musí nový užívateľ odpovedať pred povýšením na stupeň dôvery 2."
-    tl3_time_period: "Požiadavok na časovú dobu pre stupeň dôvery 3"
-    tl3_requires_days_visited: "Minimálny počet dní, koľkokrát používateľ musí navštíviť stránku za posledných 100 dní, aby sa kvalifikoval na úroveň dôvery 3. Ak chcete vypnúť povýšenie na úroveň dôvery 3, nastavte dobu vyššiu ako dobu na úroveň dôvery 3. (0 a viac)"
-    tl3_requires_topics_replied_to: "Minimálny počet tém,  na ktoré musí mať užívateľ odpovedať za posledných 100 dní potrebných pre kvalifikáciu na dosiahnute 3 levelu dôvery. (0 a viac)"
-    tl3_requires_topics_viewed: "Percento tém ktoré musí mať užívateľ pozreté, za posledných 100 dní pre kvalifikáciu na dosiahnute 3 levelu dôvery. (0 až 100)"
-    tl3_requires_posts_read: "Percento príspevkov, ktoré musí mať užívateľ pozreté za posledných 100 dní pre kvalifikáciu na dosiahnute 3 levelu dôvery. (0 až 100)"
     tl3_requires_topics_viewed_all_time: "Minimálny počet všetkých tém,  ktoré musí mať užívateľ pozreté pre kvalifikáciu na dosiahnute 3 levelu dôvery. "
     tl3_requires_posts_read_all_time: "Minimálny počet všetkých príspevkov,  ktoré musí mať užívateľ prečítané pre kvalifikáciu na 3 level dôvery. "
-    tl3_requires_max_flagged: "V posledných 100 dňoch použivateľ nemôže mať viac ako x príspevkou označených viac ako x rôznymi používateľmi aby sa kvalifikoval na postup na úroveň dôvery 3, kde  x je hodnota ktorú nastavujete. (0 alebo viac)"
     tl3_promotion_min_duration: "MInimálny počet dní po pridelení 3 levelu dôvery než môže byť užívateľ degradovaný späť na 3 level dôvery."
-    tl3_requires_likes_given: "Minimálny počet \"Páči sa\", ktoré musia byť udelené za posledných 100 dní pre kvalifikáciu na dosiahnutie 3 levelu dôvery. "
-    tl3_requires_likes_received: "Minimálny počet \"Páči sa\", ktoré musia byť prijaté za posledných 100 dní pre kvalifikáciu na dosiahnutie 3 levelu dôvery. "
     tl3_links_no_follow: "Neodstraňujte rel = nofollow z odkazov pridaných užívateľmi s úrovňou dôveryhodnosti 3 ."
     min_trust_to_create_topic: "MInimálna úroveň dôvery na vytvorenie novej témy."
     min_trust_to_edit_wiki_post: "MInimálna úroveň dôvery na úpravu wiki príspevku."
@@ -957,7 +947,6 @@ sk:
     max_users_notified_per_group_mention: "Maximálny počet používateľov, ktorý môžu dostať notifikácie, v prípade notifikovania celej skupiny (ak sa dosiahne maximum, žiadne ďalšie notifikácie nebudú zaslané)"
     create_thumbnails: "Vytvor náhľad a okraje pre obrázoky, ktoré sú príliš veľké aby sa zmestili do príspevku."
     email_time_window_mins: "Počkať (n) minút pred poslaním akýchkoľvek notifikačných emailov, aby mali používatelia čas úpraviť a dokončiť svoje príspevky."
-    private_email_time_window_seconds: "Počkať (n) sekúnd pred poslaním akýchkoľvek súkromných notifikačných emailov, aby mali používatelia čas úpraviť a dokončiť svoje príspevky."
     email_posts_context: "Koľko posledných odpovedí zahrnúť do obsahu v notifikačných emailoch."
     flush_timings_secs: "Ako často posielať časové dáta na server, v sekundách."
     title_max_word_length: "Maximálna povolená dĺžka slov v názve témy, v znakoch."
@@ -1059,7 +1048,6 @@ sk:
     disable_avatar_education_message: "Vypnúť informatívnu hlášku na zmenu avatara."
     daily_performance_report: "Denne analyzuj NGINX logy a z detailov vytváraj témy iba pre zamestnancov."
     suppress_uncategorized_badge: "V zozname tém nezobrazuj odznak za nekategorizované príspevky."
-    permalink_normalizations: "Pred vyhľadaním trvalého odkazu použi následujúci regulérny výraz, napríklad : /(\\/topic.*)\\?.*/\\1 oddelí dotazovaný reťazec od témy. Formátom je regex+reťazec. Použi \\1 atp. k prístupu na zachytenie"
     global_notice: "Pre všetkých návštevníkov zobraz URGENTNÉ, KRÍZOVÉ globálné záhlavie, zmeň na čierne a schovaj (HTML povolené)."
     disable_edit_notifications: "Ak je premenná 'download_remote_images_to_local' aktívna, vypnúť notifikácie o úpravách systémového používateľa."
     automatically_unpin_topics: "Automaticky odopnúť témy ak používateľ dostanie posledný príspevok."
@@ -1149,11 +1137,6 @@ sk:
       category: 'Kategórie'
       topic: 'Výsledky'
       user: 'Používatelia'
-  sso:
-    not_found: "Nepodarilo sa nájsť, alebo vytvoriť účet, kontaktujte správcu stránky"
-    account_not_approved: "Účet čaká na schválenie, o schválení budete upovedomení emailom"
-    unknown_error: "Zlyhala aktualizácia informácie, kontaktujte správcu stránky"
-    timeout_expired: "Vypršal časový limit príhlásenia, prosím skúste sa prihlásiť znova"
   original_poster: "Pôvodný autor"
   most_posts: "Najviac príspevkov"
   most_recent_poster: "Najaktuálnejší prispievateľ"
@@ -1584,20 +1567,6 @@ sk:
       subject_template: "[%{site_name}] %{username} Vás pozval k správe '%{topic_title}'"
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} Vás pozval k správe '%{topic_title}'"
-    user_invited_to_topic:
-      text_body_template: |2
-
-        %{username} Vás pozval do diskusie
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        na
-
-        > %{site_title} -- %{site_description}
-
-        Prosím návštívte tento odkaz pre pozretie správy: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
@@ -1714,12 +1683,6 @@ sk:
 
         Kliknite na nasledujúci odkaz pre nastavenie hesla k Vášmu novému účtu:
         %{base_url}/users/password-reset/%{email_token}
-    authorize_email:
-      subject_template: "[%{site_name}] Potvrďte Vašu novú email adresu"
-      text_body_template: |
-        Potvrďte Vašu novú emailovú adresu pre %{site_name} kliknutím na nasledujúci odkaz:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Váš účet bol schválený na %{site_name}!"
     signup:
@@ -1882,45 +1845,6 @@ sk:
     title: "Podmienky používania"
   privacy_topic:
     title: "Ochrana súkromia"
-  badges:
-    long_descriptions:
-      autobiographer: "Tento odznak je udelený za vypnenie <a href=\"/my/preferences\">Vášho užívateľského profilu</a> a zvolenie profilovej fotky. Dávaním najavo komunite kto ste a čo Vás zaujíma vytvára lepšiu a prepojenejšiu komunitu. \n"
-      first_like: |
-        Tento odznak je udelený za prvé udelené "Páči sa" použitím :heart:  talčidla. Označenie príspevku "Páči sa" je najlepšia cesta ako ukázať členom komunity, že ich príspevky sú zaujímavé, užitočné, výnimočné, alebo zábavné. Podeľte sa o to!
-      first_link: "Tento odznak je udelený za prvý vložený odkaz na inú tému v odpovedi. Spájanie tém pomáha kolegom čitateľom nájsť zaujímavé súvisiace konverzácie, poukázaním na prepojenia medzi témami oboma smermi. \n"
-      first_quote: "Tento odznak je udelený za prvý použitý citát príspevku vo Vašej odpovedi. Citovanie relevantných častí predchádzajúcich príspevkov pomáha udržiavať diskusiu v rámci témy. \n"
-      first_share: "Tento odznak je udelený za prvý zdieľaný odkaz na odpoveď, alebo tému pužítím zdieľacieho tlačidla. Zdieľanie odkazov je výborná cesta, ako ukázať zaujímavé diskusie zvyšku sveta a rozširovať Vašu komunitu. \n"
-      read_guidelines: |
-        Tento odznak je udelený za <a href="/guidelines">prečítanie pravidiel komunity</a>. Dodržiavanie a zdieľanie týchto jednoduchých pravidiel pomáha budovať bezpečnú a udržateľnú komunitu.
-      reader: "Tento odznak je udelený za prečítanie dlhej témy. Čítanie je základ. Pozorné ťítanie pomáha sledovať konverzáciu a vedie k lepším, ucelenejším odpovediam. \n"
-      editor: |
-        Tento odznak je udelený za úpravu Vášho príspevku. Nebojte sa kedykoľvek upravovať svoje príspevky za účelom ich vylepšenia, opravenia chýb, alebo pridania čohokoľvek, čo ste zabudli.
-      first_flag: |
-        Tento odznak je udelený za označenie príspevku. Označovanie príspevkov je dôležité pre zdravú komunitu. Keď zbadáte príspevok, ktorý vyžaduje pozornosť moderátora, prosím
-        nebojte sa ho označiť. Taktiež môžte použiť označovací dialóg na poslanie <b>správy</b> kolegovi užívateľovi.
-      nice_share: "Tento odznak je udelený za zdieľanie odkazu na príspevok, ktorý bol navštívený 25 návštevníkmi zvonku. Pekná práca! Zdieľanie odkazov na zaujímavé diskusie s priateľmi je výborná cesta, ako rozširiť Vašu komunitu. \n"
-      welcome: |
-        Tento odznak je udelený za prvé získané "Páči sa" na príspevok. Gratulujeme, prispeli ste niečim, čo členovia komunity považujú za zaujímavé, užitočné, alebo výnimočné!
-      anniversary: |
-        Tento odznak je udelený za to, že ste boli členom celý rok a prispeli najmenej jedným príspevkom v tomto roku. Ďakujeme za priazeň a prispievanie do našej komunity!
-      good_share: |
-        Tento odznak je udelený za zdieľanie odkazu na príspevok, ktorý bol navštívený 300 návštevníkmi zvonku. Dobrá práca! Ukázali ste zaujímavú diskusiu  <i>veľa</i> novým ľuďom a pomohli ste nám rásť.
-      great_share: |
-        Tento odznak je udelený za zdieľanie odkazu na príspevok, ktorý bol navštívený 100 návštevníkmi zvonku. Super! Spropagovalí ste zaujímavú diskusiu obrovskému publiku, a pomohli ste nám rásť vo veľkom štýle.
-      nice_post: |
-        Tento odznak je udelený za vytvorenie odpovede, ktorá dostane 10 "Páči sa". Pekná práca.
-      nice_topic: |
-        Tento odznak je udelený za vytvorenie témy, ktorá dostane 10 "Páči sa". Pekná práca.
-      good_post: |
-        Tento odznak je udelený za vytvorenie odpovede, ktorá dostane 25 "Páči sa". Dobrá práca.
-      good_topic: |
-        Tento odznak je udelený za vytvorenie témy, ktorá dostane 25 "Páči sa". Dobrá práca.
-      great_post: |
-        Tento odznak je udelený za vytvorenie príspevku, ktorý dostane 50 "Páči sa". Super!
-      great_topic: |
-        Tento odznak je udelený za vytvorenie odpovede, ktorá dostane 50 "Páči sa". Super!
-      basic: |
-        Tento odznak je udelený ak dosiahnete stupeň dóvery 1. Ďakujeme za Váš čas , prečítanie niekoľkých tém a zoznámenie sa s tým o čom je naša komunita. Odstránili sme obmedzenia pre nového používateľa a odteraz máte všetky základné práva, ako je zasielanie osobných správ, značkovanie, wiki úpravy a možnosť publikovať obrázky a viaceré odkazy.
   admin_login:
     success: "Email odoslaný"
     error: "Chyba !"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 8724129c5c..09361c7070 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -257,7 +257,6 @@ sq:
       uncategorized_parent: "Uncategorized can't have a parent category"
       self_parent: "A subcategory's parent cannot be itself"
       depth: "You can't nest a subcategory under another"
-      email_in_already_exist: "Incoming email address '%{email_in}' is already in use for '%{category_name}' category."
     cannot_delete:
       uncategorized: "Can't delete Uncategorized"
       has_subcategories: "Can't delete this category because it has sub-categories."
@@ -618,7 +617,6 @@ sq:
     min_private_message_title_length: "Minimum allowed title length for a message in characters"
     min_search_term_length: "Minimum valid search term length in characters"
     allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off."
-    uncategorized_description: "The description of the uncategorized category. Leave blank for no description."
     allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles."
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
     educate_until_posts: "When the user starts typing their first (n) new posts, show the pop-up new user education panel in the composer."
@@ -792,15 +790,9 @@ sq:
     tl2_requires_likes_received: "How many likes a user must receive before promotion to trust level 2."
     tl2_requires_likes_given: "How many likes a user must cast before promotion to trust level 2."
     tl2_requires_topic_reply_count: "How many topics user must reply to before promotion to trust level 2."
-    tl3_requires_topics_replied_to: "Minimum number of topics a user needs to have replied to in the last 100 days to qualify for promotion to trust level 3. (0 or higher)"
-    tl3_requires_topics_viewed: "The percentage of topics created in the last 100 days that a user needs to have viewed to qualify for promotion to trust level 3. (0 to 100)"
-    tl3_requires_posts_read: "The percentage of posts created in the last 100 days that a user needs to have viewed to qualify for promotion to trust level 3. (0 to 100)"
     tl3_requires_topics_viewed_all_time: "The minimum total number of topics a user must have viewed to qualify for trust level 3."
     tl3_requires_posts_read_all_time: "The minimum total number of posts a user must have read to qualify for trust level 3."
-    tl3_requires_max_flagged: "User must not have had more than x posts flagged by x different users in the last 100 days to qualify for promotion to trust level 3, where x is this setting's value. (0 or higher)"
     tl3_promotion_min_duration: "The minimum number of days that a promotion to trust level 3 lasts before a user can be demoted back to trust level 2."
-    tl3_requires_likes_given: "The minimum number of likes that must be given in the last 100 days to qualify for promotion to trust level 3."
-    tl3_requires_likes_received: "The minimum number of likes that must be received in the last 100 days to qualify for promotion to trust level 3."
     tl3_links_no_follow: "Do not remove rel=nofollow from links posted by trust level 3 users."
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     min_trust_to_edit_wiki_post: "The minimum trust level required to edit post marked as wiki."
@@ -888,7 +880,6 @@ sq:
     automatically_download_gravatars: "Download Gravatars for users upon account creation or email change."
     digest_topics: "The maximum number of topics to display in the email digest."
     digest_min_excerpt_length: "Minimum post excerpt in the email digest, in characters."
-    delete_digest_email_after_days: "Suppress digest emails for users not seen on the site for more than (n) days."
     disable_digest_emails: "Disable digest emails for all users."
     detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures."
     max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day"
@@ -903,7 +894,6 @@ sq:
     dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before being reminded about overly dominating a topic."
     daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
     suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists."
-    permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(\\/topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures"
     global_notice: "Display an URGENT, EMERGENCY global banner notice to all visitors, change to blank to hide it (HTML allowed)."
     disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
     full_name_required: "Full name is a required field of a user's profile."
@@ -933,7 +923,6 @@ sq:
     enable_emoji: "Enable emoji"
     emoji_set: "How would you like your emoji?"
     enforce_square_emoji: "Force a square aspect ratio to all emojis."
-    approve_post_count: "The amount of posts from a new user that must be approved"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
     notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact email. Set to 0 to disable these emails."
     errors:
@@ -960,7 +949,6 @@ sq:
     moved_post: "%{display_username} moved your post to %{link}"
     private_message: "%{display_username} sent you a message: %{link}"
     invited_to_private_message: "%{display_username} invited you to a message: %{link}"
-    invited_to_topic: "%{display_username} invited you to a topic: %{link}"
     invitee_accepted: "%{display_username} accepted your invitation"
     linked: "%{display_username} linked you in %{link}"
     granted_badge: "You earned %{link}"
@@ -970,11 +958,6 @@ sq:
       category: 'Categories'
       topic: 'Results'
       user: 'Users'
-  sso:
-    not_found: "Unable to lookup or create account, contact site admin"
-    account_not_approved: "Account is pending approval, you will receive an email notification once approved"
-    unknown_error: "Error updating information, contact site admin"
-    timeout_expired: "Account login timed out, please try logging in again"
   original_poster: "Original Poster"
   most_posts: "Most Posts"
   most_recent_poster: "Most Recent Poster"
@@ -1110,87 +1093,10 @@ sq:
       (If the link above has expired, choose "I forgot my password" when logging in with your email address.)
   test_mailer:
     subject_template: "[%{site_name}] Email Deliverability Test"
-    text_body_template: |
-      This is a test email from
-
-      [**%{base_url}**][0]
-
-      Email deliverability is complicated. Here are a few important things you should check first:
-
-      - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**.
-
-      - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. in Gmail, it is the "show original" option in the drop-down menu at the top right of each mail.
-
-      - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered.
-
-      - Is your domain's [SPF record][8] correct? [Test your SPF record][1] here. Note that TXT is the correct official record type for SPF.
-
-      - Is your domain's [DKIM record][3] correct? This will significantly improve email deliverability. [Test your DKIM record][7] here.
-
-      - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services.
-
-      (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!)
-
-      We hope you received this email deliverability test OK!
-
-      Good luck,
-
-      Your friends at [Discourse](http://www.discourse.org)
-
-      [0]: %{base_url}
-      [1]: http://www.kitterman.com/spf/validate.html
-      [2]: http://mxtoolbox.com/ReverseLookup.aspx
-      [3]: http://www.dkim.org/
-      [4]: http://whatismyipaddress.com/blacklist-check
-      [7]: http://dkimcore.org/tools/dkimrecordcheck.html
-      [8]: http://www.openspf.org/SPF_Record_Syntax
-      [md]: http://mandrill.com
-      [mg]: http://www.mailgun.com/
-      [mj]: https://www.mailjet.com/pricing
   new_version_mailer:
     subject_template: "[%{site_name}] verion i ri i Discourse, përditësoje!"
-    text_body_template: |
-      A new version of [Discourse](http://www.discourse.org) is available.
-
-      Your version: %{installed_version}
-      New version: **%{new_version}**
-
-      You may want to:
-
-      - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
-
-      - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse.
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] ka perditesime"
-    text_body_template: |
-      A new version of [Discourse](http://www.discourse.org) is available.
-
-      Your version: %{installed_version}
-      New version: **%{new_version}**
-
-      You may want to:
-
-      - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
-
-      - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse.
-
-      ### Release notes
-
-      %{notes}
-  flags_reminder:
-    flags_were_submitted:
-      one: "These flags were submitted over 1 hour ago."
-      other: "These flags were submitted over %{count} hours ago."
-    please_review: "Please review them."
-    post_number: "postim"
-    how_to_disable: 'You can disable or change the frequency of this email reminder via the "notify about flags after" setting.'
-    subject_template:
-      one: "1 flag waiting to be handled"
-      other: "%{count} flags waiting to be handled"
   queued_posts_reminder:
     subject_template:
       one: "[%{site_name}] 1 post waiting to be reviewed"
@@ -1314,10 +1220,6 @@ sq:
       text_body_template: "We're sorry, but your data export failed. Please check the logs or contact a staff member."
     email_reject_no_account:
       subject_template: "[%{site_name}] Email issue -- Unknown Account"
-      text_body_template: |
-        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
-
-        There is no known user account with this email address. Try sending from a different email address, or contact a staff member.
     email_reject_empty:
       subject_template: "[%{site_name}] Email issue -- No Content"
     email_reject_parsing:
@@ -1334,16 +1236,8 @@ sq:
         Your account does not have the privileges to post new topics in that category. If you believe this is in error, contact a staff member.
     email_reject_reply_key:
       subject_template: "[%{site_name}] Email issue -- Unknown Reply Key"
-      text_body_template: |
-        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
-
-        The provided reply key is invalid or unknown, so we don't know what this email is in reply to. Contact a staff member.
     email_reject_topic_not_found:
       subject_template: "[%{site_name}] Email issue -- Topic Not Found"
-      text_body_template: |
-        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
-
-        The topic you are replying to no longer exists, perhaps it was deleted? If you believe this is in error, contact a staff member.
     email_reject_topic_closed:
       subject_template: "[%{site_name}] Email issue -- Topic Closed"
       text_body_template: |
@@ -1352,16 +1246,8 @@ sq:
         The topic you are replying to is currently closed and no longer accepting replies. If you believe this is in error, contact a staff member.
     email_reject_auto_generated:
       subject_template: "[%{site_name}] Email issue -- Auto Generated Reply"
-      text_body_template: |
-        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
-
-        Your email was marked as "auto generated", which we can't accept. If you believe this is in error, contact a staff member.
     email_error_notification:
       subject_template: "[%{site_name}] Email issue -- POP authentication error"
-      text_body_template: |
-        There has been an authentication error while polling mails from the POP server.
-
-        Please make sure you have properly configured the POP credentials in [the site settings](%{base_url}/admin/site_settings/category/email).
     too_many_spam_flags:
       subject_template: "New account blocked"
       text_body_template: |
@@ -1374,12 +1260,6 @@ sq:
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Account blocked"
-      text_body_template: |
-        Hello,
-
-        This is an automated message from %{site_name} to inform you that your account has been blocked by a staff member.
-
-        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "New user %{username} blocked due to community flags"
     spam_post_blocked:
@@ -1413,34 +1293,6 @@ sq:
     posted_by: "Posted by %{username} on %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} invited you to a message
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        Please visit this link to view the message: %{base_url}%{url}
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} invited you to a topic '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} invited you to a discussion
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        at
-
-        > %{site_title} -- %{site_description}
-
-        Please visit this link to view the message: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
     user_quoted:
@@ -1497,12 +1349,6 @@ sq:
 
         Click the following link to choose a password for your new account:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Confirm your new email address"
-      text_body_template: |
-        Confirm your new email address for %{site_name} by clicking on the following link:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
       text_body_template: |
@@ -1532,7 +1378,6 @@ sq:
 
         If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
   page_not_found:
-    title: "The page you requested doesn't exist or is private."
     popular_topics: "Popular"
     recent_topics: "Recent"
     see_more: "More"
@@ -1824,57 +1669,6 @@ sq:
       Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politika e Privatësisë"
-  badges:
-    long_descriptions:
-      autobiographer: |
-        This badge is granted for filling out <a href="/my/preferences">your user profile</a> and selecting a profile picture. Letting the community know more about who you are and what you're interested in makes for a better, more connected community.
-      first_like: |
-        This badge is granted the first time you like a post using the :heart: button. Liking posts is a great way to let your fellow community members know that what they posted was interesting, useful, cool, or fun. Share the love!
-      first_link: |
-        This badge is granted the first time you place a link to another topic in a reply. Linking topics helps fellow readers find interesting related conversations, by showing connections between topics in both directions.
-      first_quote: |
-        This badge is granted the first time you quote a post in your reply. Quoting relevant sections of earlier posts in your reply helps keep discussions focused and on topic.
-      first_share: |
-        This badge is granted the first time you share a link to a reply or topic using the share button. Sharing links is a great way to show off interesting discussions with the rest of the world and grow your community.
-      read_guidelines: |
-        This badge is granted for <a href="/guidelines">reading the community guidelines</a>. Following and sharing these simple guidelines helps build a safe, fun, and sustainable community.
-      reader: |
-        This badge is granted for reading a long topic. Reading is fundamental. Reading closely helps you follow the conversation and leads to better, more complete replies.
-      editor: |
-        This badge is granted for editing your post. Don't hesitate to edit your posts any time to improve them, fix small mistakes, or add anything you forgot.
-      first_flag: |
-        This badge is granted for flagging a post. Flagging is critical to the health of your community. If you notice any posts that require moderator attention please
-        do not hesitate to flag. You may also use the flagging dialog to send <b>messages</b> to fellow users.
-      nice_share: |
-        This badge is granted for sharing a link to a post that's visited by 25 outside visitors. Nice job! Sharing links to interesting discussions with friends is an excellent way to grow our community.
-      welcome: |
-        This badge is granted when you receive your first like on a post. Congratulations, you've posted something that your fellow community members found interesting, cool, or useful!
-      anniversary: |
-        This badge is granted when you've been a member for a year with at least one post in that year. Thanks for sticking around and contributing to our community!
-      good_share: |
-        This badge is granted for sharing a link to a post that's visited by 300 outside visitors. Good work! You've shown off an interesting discussion to a <i>lot</i> of new people and helped us grow.
-      great_share: |
-        This badge is granted for sharing a link to a post that's visited by 100 outside visitors. Wow! You've promoted an interesting discussion to a huge new audience for this community, and helped us grow in a big way.
-      nice_post: |
-        This badge is granted for creating a reply that gets 10 likes. Nice job!
-      nice_topic: |
-        This badge is granted for creating a topic that gets 10 likes. Nice job!
-      good_post: |
-        This badge is granted for creating a reply that gets 25 likes. Good work!
-      good_topic: |
-        This badge is granted for creating a topic that gets 25 likes. Good work!
-      great_post: |
-        This badge is granted for creating a post that gets 50 likes. Wow!
-      great_topic: |
-        This badge is granted for creating a reply that gets 50 likes. Wow!
-      basic: |
-        This badge is granted when you reach trust level 1. Thanks for sticking around a little while and reading a few topics to learn what our community is about. Your new user restrictions have been lifted, and you've been granted all essential community abilities, such as personal messaging, flagging, wiki editing, and the ability to post images and multiple links.
-      member: |
-        This badge is granted when you reach trust level 2. Thanks for participating over a period of weeks to more join our community. You can now send personal invitations from your user page or individual topics, create group messages, and a few more likes per day.
-      regular: |
-        This badge is granted when you reach trust level 3. Thanks for being a regular part of our community over a period of months, one of the most active readers and a reliable contributor to what makes this community great. You can now recategorize and rename topics, access a private lounge area, more powerful spam flags, and lots more likes per day.
-      leader: |
-        This badge is granted when you reach trust level 4. You're a leader in this community as selected by staff, and set a positive example for the community in your deeds and words. You have the ability to edit all posts, take topic moderator actions such as pin, close, unlist, archive, split, and merge, and tons of likes per day.
   admin_login:
     success: "Email Sent"
     error: "Error!"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index a2b6a98263..2648fa087e 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -652,10 +652,8 @@ sv:
     tl2_requires_likes_received: "Antalet gillningar en användare måste mottaga innan en befordran till förtroendenivå 2."
     tl2_requires_likes_given: "Antalet gillningar en användare måste ge innan en befordran till förtroendenivå 2."
     tl2_requires_topic_reply_count: "Antalet ämnen en användare måste svara på innan en befordran till förtroendenivå 2."
-    tl3_requires_topics_replied_to: "Minsta antalet ämnen en användare behöver ha svarat på de senaste 100 dagarna för att bli kvalificerad till en befordran till förtroendenivå 3. (0 eller högre)"
     tl3_requires_topics_viewed_all_time: "Minsta antalet ämnen en användare måste ha tittat på för att bli kvalificerad för förtroendenivå 3."
     tl3_requires_posts_read_all_time: "Minsta antalet inlägg en användare måste ha läst för att bli kvalificerad för förtroendenivå 3."
-    tl3_requires_likes_received: "Minsta antalet mottagna gillningar under de senaste 100 dagarna för att bli kvalificerad för en befordran till förtroendenivå 3."
     min_trust_to_create_topic: "Lägsta förtroendenivå som krävs för att skapa ett nytt ämne."
     newuser_max_links: "Antalet länkar en ny användare kan lägga till i ett inlägg."
     newuser_max_images: "Antalet bilder en ny användare kan lägga till i ett inlägg."
@@ -715,7 +713,6 @@ sv:
     moved_post: "%{display_username} flyttade ditt inlägg till %{link}"
     private_message: "%{display_username} har skickat ett meddelande till dig: %{link}"
     invited_to_private_message: "%{display_username} har bjudit in dig till en privat konversation: %{link}"
-    invited_to_topic: "%{display_username} har bjudit in dig till ett ämne: %{link}"
     invitee_accepted: "%{display_username} accepterade din inbjudan"
     linked: "%{display_username} länkade dig i %{link}"
     granted_badge: "Du förtjänade %{link}"
@@ -725,8 +722,6 @@ sv:
       category: 'Kategorier'
       topic: 'Resultat'
       user: 'Användare'
-  sso:
-    account_not_approved: "Konto inväntar godkännande. Du kommer att få ett e-postmeddelande när kontot väl är godkänt."
   original_poster: "Ursprunglig skribent"
   most_posts: "Mest inlägg"
   most_recent_poster: "Senaste skribent"
@@ -830,47 +825,8 @@ sv:
     subject_template: "[%{site_name}] Email Deliverability Test"
   new_version_mailer:
     subject_template: "[%{site_name}] Ny version av Discourse, uppdatering tillgänglig"
-    text_body_template: |
-      En ny version av [Discourse](http://www.discourse.org) finns tillgängligt.
-
-      Din version: %{installed_version}
-      Ny version: **%{new_version}**
-
-      Du kanske vill:
-
-      - Se vad som är nytt i [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - Uppgradera från din webbläsare på [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
-
-      - Besöka [meta.discourse.org](http://meta.discourse.org) för nyheter, diskussioner och support för Discourse.
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] uppdatering tillgänglig"
-    text_body_template: |
-      En ny version av [Discourse](http://www.discourse.org) finns tillgängligt.
-
-      Din version: %{installed_version}
-      Ny version: **%{new_version}**
-
-      Du kanske vill:
-
-      - Se vad som är nytt i [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - Uppgradera från din webbläsare på  [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
-
-      - Besöka [meta.discourse.org](http://meta.discourse.org) för nyheter, diskussioner och support för Discourse.
-
-      ### Release notes
-
-      %{notes}
-  flags_reminder:
-    flags_were_submitted:
-      one: "Dessa flaggor skickades in för mer än 1 timme sedan."
-      other: "Dessa flaggor skickades in för mer än %{count} timmar sedan."
-    please_review: "Var god och granska dessa."
-    post_number: "inlägg"
-    subject_template:
-      one: "1 flagga väntar på att bli hanterad"
-      other: "%{count} flaggor väntar på att bli hanterade"
   flag_reasons:
     off_topic: "Ditt inlägg blev flaggat som **off-topic**. Medlemmarna i forumet kände att det inte är passande för ämnet, som definieras av titeln och det första inlägget."
     inappropriate: "Ditt inlägg blev flaggat som **olämpligt**. Medlemmarna i forumet kände att det är störande, kränkande eller att det strider mot [våra riktlinjer](/guidelines)."
@@ -954,8 +910,6 @@ sv:
     posted_by: "Postat av %{username} den %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} har bjudit in dig till en privat konversation '%{topic_title}'"
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} har bjudit in dig till ett ämne '%{topic_title}'"
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
     user_quoted:
@@ -987,18 +941,11 @@ sv:
       subject_template: "[%{site_name}] Logga in"
     account_created:
       subject_template: "[%{site_name}] Ditt nya konto"
-    confirm_new_email:
-      subject_template: "[%{site_name}] Confirm your new email address"
-      text_body_template: |
-        Confirm your new email address for %{site_name} by clicking on the following link:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Du har blivit godkänd på %{site_name}!"
     signup:
       text_body_template: "Välkommen till %{site_name}!\n\nKlicka på följande länk för att bekräfta och aktivera ditt nya konto:\n%{base_url}/users/activate-account/%{email_token}\n\nOm länken ovan inte går att klicka på kan du kopiera och klistra in länken i adressfältet i din webbläsare. \n"
   page_not_found:
-    title: "Sidan du sökte existerar inte eller är privat."
     popular_topics: "Populära"
     recent_topics: "Senaste"
     see_more: "Mer"
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 4b8e850d32..eb970fe9d5 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -567,9 +567,6 @@ te:
     email:
       not_allowed: "ఆ ఈమెయిల్ ప్రొవైడరును అనుమంతిచుటలేదు. దయచేసి మరో ఈమెయిల్ చిరునామా రాయండి"
       blocked: "అనుమతించుటలేదు"
-  flags_reminder:
-    please_review: "దయచేసి వాటిని సమీక్షించండి."
-    post_number: "టపా"
   system_messages:
     welcome_user:
       subject_template: "%{site_name} కు సుస్వాగతం!"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 8549a3524c..0090d73e28 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -148,7 +148,6 @@ tr_TR:
       can_not_modify_automatic: "Otomatik oluşturulan grubu düzenleyemezsiniz"
       member_already_exist: "'%{username}' zaten grubun bir üyesi."
       invalid_domain: "'%{domain}' geçerli bir alan adı değil."
-      invalid_incoming_email: "'%{incoming_email}' geçerli bir e-posta adresi değil."
     default_names:
       everyone: "herkes"
       admins: "adminler"
@@ -261,7 +260,6 @@ tr_TR:
       uncategorized_parent: "Kategorisizin üst kategorisi olamaz"
       self_parent: "Alt kategorinin üst kategorisi kendisi olamaz"
       depth: "Bir alt kategori başka bir alt kategorinin altında yer alamaz"
-      email_in_already_exist: "Gelen e-posta adresi '%{email_in}' %{category_name}' kategorisi için zaten kullanılıyor."
     cannot_delete:
       uncategorized: "Kategorisiz silinemez"
       has_subcategories: "Alt kategorileri bulunduğu için bu kategori silinemez."
@@ -627,7 +625,6 @@ tr_TR:
     min_search_term_length: "Arama için girilecek kelimede olması gereken en az karakter sayısı"
     search_tokenize_chinese_japanese_korean: " CJK olmayan siteler dahil, -Çince/Japonca/Korece için aramayı bilgileri sıfırlamaya zorla"
     allow_uncategorized_topics: "Konuların kategori seçmeden oluşturulmasına izin ver. DİKKAT: Bu özelliği kapamadan önce kategorisiz tüm konuları kategorize etmeniz lazım."
-    uncategorized_description: "Kategorisiz kategorisinin tanıtımı. Boş bırakabilirsiniz."
     allow_duplicate_topic_titles: "Aynı başlık ile birden çok konu açılmasına izin ver."
     unique_posts_mins: "Kullanıcının aynı içerikle yeni bir gönderi oluşturmadan önce geçmesi gereken dakika"
     educate_until_posts: "Kullanıcılar, ilk (n) gönderilerini yazmaya başladıklarında, pop-up yeni kullanıcı eğitim paneli metin düzenleyecisinin üstünde çıksın."
@@ -818,15 +815,9 @@ tr_TR:
     tl2_requires_likes_received: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce alması gereken beğeni sayısı."
     tl2_requires_likes_given: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce vermesi gereken beğeni sayısı."
     tl2_requires_topic_reply_count: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce cevaplaması gereken konu sayısı."
-    tl3_requires_topics_replied_to: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için son 100 günde cevap yazması gereken en az konu sayısı. (0 ya da daha fazla)"
-    tl3_requires_topics_viewed: "Bir kulanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için, son 100 gün içinde oluşturulmuş konulardan görüntülemesi gereken yüzde oranı. (0 ile 100 arası)"
-    tl3_requires_posts_read: "Bir kulanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için, son 100 gün içinde oluşturulmuş gönderilerden görüntülemesi gereken yüzde oranı. (0 ile 100 arası)"
     tl3_requires_topics_viewed_all_time: "Bir kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için görüntülemesi gereken toplam en az konu sayısı."
     tl3_requires_posts_read_all_time: "Bir kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için görüntülemesi gereken toplam en az gönderi sayısı."
-    tl3_requires_max_flagged: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için, son 100 gün içinde x farklı kullanıcı tarafından x adetten fazla gönderisinin bayraklanmamış olmaması gerekir. x bu ayara verilen değerdir. (0 ya da daha yüksek) "
     tl3_promotion_min_duration: "Bir kullanıcının güven seviyesi 2'ye düşürülebilmesi için güven seviyesi 3'te geçirmesi gereken en az gün sayısı."
-    tl3_requires_likes_given: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için son 100 günde vermesi gereken en az beğeni sayısı. "
-    tl3_requires_likes_received: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için son 100 günde alması gereken en az beğeni sayısı. "
     tl3_links_no_follow: "Güven seviyesi 3'teki kullanıcılar tarafından paylaşılan linklerdeki rel=nofollow'u kaldırma."
     min_trust_to_create_topic: "Yeni bir konu oluşturmak için gereken en az güven seviyesi. "
     min_trust_to_edit_wiki_post: "Wiki olarak işaretlenmiş bir gönderiyi düzenleyebilmek için gereken en az güven seviyesi."
@@ -919,7 +910,6 @@ tr_TR:
     automatically_download_gravatars: "Hesap oluşturma veya e-posta değişikliği esnasında kullanıcılar için Gravatarları indir"
     digest_topics: "Özet e-postalarda yer alacak en fazla konu sayısı. "
     digest_min_excerpt_length: "Özet e-postalarında, gönderi alıntılarında olması gereken en az karakter sayısı."
-    delete_digest_email_after_days: "Siteye (n) günden fazla süredir uğramayan kullanıcılar için özet e-posta gönderimini durdur"
     disable_digest_emails: "Tüm kullanıcılar için özet e-postalarını devre dışı bırak."
     detect_custom_avatars: "Kullanıcıların özel profil resimleri yükleyip yüklemediklerini kontrol et ya da etme."
     max_daily_gravatar_crawls: "Discourse'un gün içinde özel avatarlar için Gravatar'ı en fazla kaç kere kontrol edeceği."
@@ -935,7 +925,6 @@ tr_TR:
     dominating_topic_minimum_percent: "Konuyu domine ettiğine dair uyarı almadan önce konudaki gönderilerin yüzde kaçının kullanıcıya ait olması gerekir."
     daily_performance_report: "NGINX kayıtlarını analiz edip detaylı bir şekilde günlük Yetkili kategorisinde bir konu içerisinde paylaş."
     suppress_uncategorized_badge: "Kategorisiz konular için olan rozeti konu listesinde gösterme."
-    permalink_normalizations: "Kalıcı bağlantıları eşleştirmeden önce aşağıdaki regex'i uygula, mesela: /(\\/topic.*)\\?.*/\\1 konu yönlendirmelerindeki sorgu dizelerini kaldırır. Formatlama regex+string, yakalamalara erişmek \\1 vs."
     global_notice: "Tüm ziyaretçilere İVEDİ ACİL DURUM global manşet uyarısı göster, saklamak için boş bırakın (HTML kullanılabilir)."
     disable_edit_notifications: " 'download_remote_images_to_local' etkin olduğunda, sistem kullanıcısından gelen düzenleme bildirilerini devre dışı bırakır"
     automatically_unpin_topics: "Kullanıcı sayfa sonuna eriştiğinde tutturulmuş konuları otomatik olarak sayfadan ayır."
@@ -968,7 +957,6 @@ tr_TR:
     enable_emoji: "Emojiyi aktifleştir"
     emoji_set: "Emojinizi nasıl isterdiniz?"
     enforce_square_emoji: "Tüm emojileri kare en-boy oranına zorla"
-    approve_post_count: "Yeni bir kullanıcıdan onaylanması gereken gönderi sayısı"
     approve_unless_trust_level: "Bu güven seviyesi altındaki kullanıcılardan gelen gönderilerin onaylanması gerekir"
     notify_about_queued_posts_after: "Bu kadar saat geçmesine rağmen hala incelenmemiş konular varsa, iletişim adresine e-posta gönder. Devre dışı bırakmak için 0 girin."
     default_email_digest_frequency: "Öntanımlı olarak kullanıcılar hangi sıklıkta özet e-postalar alırlar."
@@ -1012,7 +1000,6 @@ tr_TR:
     moved_post: "%{display_username} gönderinizi buraya taşıdı: %{link}"
     private_message: "%{display_username} sana bir mesaj gönderdi: %{link}"
     invited_to_private_message: "%{display_username} seni bir mesaja davet etti: %{link}"
-    invited_to_topic: "%{display_username} seni bir konuya davet etti: %{link}"
     invitee_accepted: "%{display_username} davetinizi kabul etti"
     linked: "%{display_username} size %{link} sayfasında bağlantı verdi"
     granted_badge: "%{link} kazandınız"
@@ -1022,11 +1009,6 @@ tr_TR:
       category: 'Kategoriler'
       topic: 'Sonuçlar'
       user: 'Kullanıcılar'
-  sso:
-    not_found: "Hesap aranamıyor ya da oluşturulamıyor, site admini ile iletişime geçin"
-    account_not_approved: "Hesap henüz onaylanmamış, onaylandığında e-posta ile haberdar edileceksiniz"
-    unknown_error: "Bilgi güncellenirken hata oluştu, site admini ile iletişime geçin"
-    timeout_expired: "Seansınız zaman aşımına uğradı, lütfen tekrar giriş yapmayı deneyin"
   original_poster: "Orjinal Poster"
   most_posts: "En Çok Gönderi"
   most_recent_poster: "En Son Gönderen"
@@ -1101,8 +1083,6 @@ tr_TR:
       characters: "sadece rakam, harf ve altçizgi bulundurabilir "
       unique: "özgün olmalı"
       blank: "bulunmalı"
-      must_begin_with_alphanumeric: "bir harf, rakam ya da alt çizgi ile başlamalı"
-      must_end_with_alphanumeric: "bir harf, sayı yada alt tire ile bitmeli"
       must_not_contain_two_special_chars_in_seq: "2 ya da daha fazla uzunlukta özel karakter dizisi (.-_) içermemeli"
     email:
       not_allowed: "için o e-posta sağlayıcısına izin verilmiyor. Lütfen başka bir email adresi kullanın. "
@@ -1141,23 +1121,10 @@ tr_TR:
       (Eğer yukarıdaki bağlantının süresi dolmuşsa e-posta adresinizle giriş yaparken "Parolamı unuttum" bağlantısına tıklayınız.)
   test_mailer:
     subject_template: "[%{site_name}] E-posta Ulaştırma Testi"
-    text_body_template: "Bu aşağıdaki adresten gönderilen bir test e-postasıdır.\n\n[**%{base_url}**][0]\n\nE-postaların ulaştırılması karışık bir meseledir. Öncelikle dikkat etmeniz gereken bir kaç önemli nokta:\n\n- Site ayarlarınızda 'bildiri e-postaları' için gönderen adresini doğru ayarladığınıza emin olun. **Yolladığınız e-postalarda \"gönderen\" adresi olarak belirlediğiniz alan adı, e-postalarınızın doğrulanacağı alan adıdır.**\n\n- E-posta başlıklarındaki önemli ipuçlarını yakalayabilmek için e-posta istemcinizde e-postaların kaynak kodunu nasıl görüntüleyebileceğinizi öğrenin. Gmail'da, her e-postanın sağ üstündeki açılır menüden \"show original\" opsiyonuna tıklayabilirsiniz.\n\n- **ÖNEMLİ:** ISP'nizde e-posta yollamak için kullanıdığınız alan adlarıyla IP adreslerinin eşleşmesini sağlayacak bir reverse DNS kaydı var mı? Buradan [reverse PTR kayıtlarınızı test edin][2]. Eğer ISP'niz doğru reverse DNS pointer kaydı girmezse, büyük ihtimal e-postalarınızın hiç biri yerine ulaşmayacaktır.\n\n- Alan adınızın [SPF kaydı][8] doğru mu? Buradan [SPF kaydınızı test edin][1]. SPF için doğru resmi kayıt tipinin TXT olduğunu unutmayın. \n\n- Alan adınızın [DKIM kaydı][3] doğru mu? Bu e-postaların ulaştırılabilirliğini ciddi şekilde artıracaktır. Buradan [DKIM kaydınızı test edin][7].\n\n- Kendi e-posta sunucunuzu kullanıyorsanız, e-posta sunucunuzun IPlerinin [hiç bir e-posta karalistesine][4] alınmadığına emin olun. Sunucunuzun, kesinlikle, HELO mesajında DNS olarak çözümlenen tam tanımlanmış bilgisayar adı da gönderdiğinden emin olun. Göndermemesi, e-postanızın bir çok e-posta servisi tarafından reddedilmesine sebep olacaktır. \n\n(En kolayı, küçük topluluklar için rahat rahat yetecek sayıda bedava email yollama paketleri içeren, [Mandrill][md] veya [Mailgun][mg] veya [Mailjet][mj]'te ücretsiz hesap açmak. Tabi, gene, DNS ayarlarınızda SPF ve DKIM kayıtlarını oluşturmanız gerekecek!) \n\nUmarız bu e-posta ulaştırma testini başarıyla atlatmışsınızdır. \n\nİyi şanslar, \n\n[Discourse](http://www.discourse.org)'tan arkadaşlarınız \n\n[0]: %{base_url} \n[1]: http://www.kitterman.com/spf/validate.html \n[2]: http://mxtoolbox.com/ReverseLookup.aspx \n[3]: http://www.dkim.org/ \n[4]: http://whatismyipaddress.com/blacklist-check \n[7]: http://dkimcore.org/tools/dkimrecordcheck.html \n[8]: http://www.openspf.org/SPF_Record_Syntax [md]: http://mandrill.com [mg]: http://www.mailgun.com/ [mj]: https://www.mailjet.com/pricing\n"
   new_version_mailer:
     subject_template: "[%{site_name}] Yeni Discourse versiyonu, güncelleme var"
-    text_body_template: |
-      [Discourse'un](http://www.discourse.org) yeni versiyonu hazır. Sizin kullandığınız versiyon: %{installed_version} Yeni versiyon: **%{new_version}** Aşağıdakileri uygulayabilirsiniz: - Yenilikleri [GitHub değişiklikler listesinde] görüntüleyebilirsiniz (https://github.com/discourse/discourse/commits/master). - [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) sayfasını ziyaret ederek ve "Güncelle" butonuna basarak yeni versiyona geçebilirsiniz. - Haberler, tartışmalar ve Discourse ile ilgili destek için burayı ziyaret edebilirsiniz: [meta.discourse.org](http://meta.discourse.org)
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] güncellemesi var"
-    text_body_template: |
-      [Discourse'un](http://www.discourse.org) yeni bir versiyonu hazır. Sizin kullandığınız versiyon: %{installed_version} Yeni versiyon: **%{new_version}** Aşağıdakileri uygulayabilirsiniz: - Yenilikleri [GitHub değişiklikler listesinde] görüntüleyebilirsiniz (https://github.com/discourse/discourse/commits/master). - [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) sayfasını ziyaret ederek ve "Güncelle" butonuna basarak yeni versiyona geçebilirsiniz. - Haberler, tartışmalar ve Discourse ile ilgili destek için burayı ziyaret edebilirsiniz: [meta.discourse.org](http://meta.discourse.org) ### Yeni sürüm notları %{notes}
-  flags_reminder:
-    flags_were_submitted:
-      other: "Bu bayraklar %{count} saat önce verildi."
-    please_review: "Lütfen onları inceleyin."
-    post_number: "gönderi"
-    how_to_disable: '"Bayraklarla ilgili bilgilendirme süresi" ayarından bu hatırlatma e-postasının gönderimini devre dışı bırakabilir ya da sıklığını değiştirebilirsiniz. '
-    subject_template:
-      other: "İlgilenilmesi gereken %{count} bayrak var"
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} konu incelenmeyi bekliyor."
@@ -1250,10 +1217,6 @@ tr_TR:
       text_body_template: "Üzgünüz, dışarı veri aktarımı başarısız oldu. Lütfen kayıtları inceleyin veya bir görevli ile iletişime geçin."
     email_reject_no_account:
       subject_template: "[%{site_name}] E-posta sorunu -- Bilinmeyen Hesap"
-      text_body_template: |
-        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu.
-
-        Bu e-posta adresine sahip bir kullanıcı bulunamadı. Başka bir e-posta adresinden göndermeyi deneyin ya da bir görevli ile iletişime geçin.
     email_reject_empty:
       subject_template: "[%{site_name}] E-posta sorunu -- İçerik Yok"
       text_body_template: "Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başırısız oldu. \n\nE-postada herhangi bir cevap bulamadık.\n\nEğer bu mesajı alıyorsanız ve cevap eklediyseniz, daha basit bir biçimleme ile yeniden deneyin.\n\n\n\n"
@@ -1269,28 +1232,16 @@ tr_TR:
         Hesabınız o kategoride yeni konu oluşturabilmeniz için gereken ayrıcalıklara sahip değil. Yanlışlık olduğunu düşünüyorsanız, bir görevli ile iletişime geçin.
     email_reject_reply_key:
       subject_template: "[%{site_name}] E-posta sorunu -- Bilinmeyen Cevap Anahtarı"
-      text_body_template: |
-        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu.
-
-        Cevap anahtarı geçersiz ya da bulunamıyor, bu nedenle de bu mesajın neye cevaben gönderildiğini bilemiyoruz. Bir görevli ile iletişime geçin.
     email_reject_topic_not_found:
       subject_template: "[%{site_name}] E-posta sorunu -- Konu Bulunamadı"
-      text_body_template: |
-        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermek istediğiniz e-posta başarısız oldu. Konu bulunamadı, silinmiş olabilir. Yanlışlık olduğunu düşünüyorsanız, bir görevli ile iletişime geçin.
     email_reject_topic_closed:
       subject_template: "[%{site_name}] E-posta sorunu -- Konu Kapatıldı"
       text_body_template: |
         Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermek istediğiniz e-posta başarısız oldu. Konu kapatılmış. Yanlışlık olduğunu düşünüyorsanız, bir görevli ile iletişime geçin.
     email_reject_auto_generated:
       subject_template: "[%{site_name}] E-posta sorunu -- Otomatik Üretilmiş Cevap"
-      text_body_template: |
-        Üzgünüz, ama %{destination} (titled %{former_title}) adresine yollamak istediğiniz e-posta başarısız oldu. Otomatik olarak üretilmiş e-posta cevaplarını kabul edemiyoruz. Bir hata olduğuna inanıyorsanız, lütfen bir görevli ile iletişime geçin.
     email_error_notification:
       subject_template: "[%{site_name}] E-posta sorunu -- POP doğrulama hatası"
-      text_body_template: |
-        Mailler POP sunucusundan çağrılırken bir doğrulama hatası oluştu.
-
-        Lütfen, [site ayarlarında](%{base_url}/admin/site_settings/category/email) POP bilgilerinin doğru şekilde düzenlendiğinden emin olun.
     too_many_spam_flags:
       subject_template: "Yeni hesap engellendi"
       text_body_template: |
@@ -1303,12 +1254,6 @@ tr_TR:
         Daha fazla bilgi için lütfen [topluluk yönergelerine](%{base_url}/guidelines) bakın.
     blocked_by_staff:
       subject_template: "Hesap engellendi"
-      text_body_template: |
-        Merhaba.
-
-        Bu, %{site_name} sitesinin, hesabınızın bir görevli tarafından engellendiğini bildirmek için gönderdiği otomatik bir mesajdır.
-
-        Daha fazla bilgi için lütfen [topluluk yönergelerine](%{base_url}/guidelines) bakın.
     user_automatically_blocked:
       subject_template: "Topluluk bayrakları nedeniyle yeni kullanıcı %{username} engellendi"
     spam_post_blocked:
@@ -1338,34 +1283,6 @@ tr_TR:
     posted_by: "%{post_date} tarihinde %{username} tarafından gönderildi"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} sizi bir mesaja davet etti '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} sizi bir mesaja davet etti
-
-        > %{site_title} -- %{site_description}
-
-        adresinde
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        Mesajı görüntülemek için lütfen bu bağlantıyı ziyaret edin: %{base_url}%{url}
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} sizi bir konuya davet etti '%{topic_title}'"
-      text_body_template: |2
-
-        %{username} sizi bir tartışmaya davet etti
-
-        > %{site_title} -- %{site_description}
-
-        adresinde
-
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        Mesajı görüntülemek için lütfen bu bağlantıyı ziyaret edin: %{base_url}%{url}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
     user_quoted:
@@ -1424,12 +1341,6 @@ tr_TR:
 
         Yeni hesabınıza ait bir parola oluşturmak için aşağıdaki bağlantıya tıklayın:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Yeni e-posta adresinizi onaylayın"
-      text_body_template: |
-        Aşağıdaki bağlantıya tıklayarak %{site_name} sitesindeki yeni e-posta adresinizi onaylayın:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "%{site_name} sitesinde hesabınız onaylandı!"
       text_body_template: "%{site_name} sitesine hoşgeldiniz! \n\n%{site_name} sitesindeki hesabınız bir görevli tarafından onaylandı.\n\nAşağıdaki linke tıklayın ve yeni hesabınızı aktive edin: %{base_url}/users/activate-account/%{email_token} \n\nEğer link tıklanabilir değilse, linki kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyebilirsiniz. \n\n%{new_user_tips} \n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)\n"
@@ -1443,7 +1354,6 @@ tr_TR:
 
         Eğer yukarıdaki bağlantı tıklanabilir değilse, bağlantıyı kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyin.
   page_not_found:
-    title: "Aradığınız sayfa bulunmuyor ya da gizli."
     popular_topics: "Popüler"
     recent_topics: "Yeni"
     see_more: "Daha fazla"
@@ -1505,56 +1415,6 @@ tr_TR:
     title: "Üyelik Sözleşmesi"
   privacy_topic:
     title: "Gizlilik İlkeleri"
-  badges:
-    long_descriptions:
-      autobiographer: |
-        Bu rozet <a href="/my/preferences">profilini</a> doldurduğunda ve profil resmini seçtiğinde verilir. Kim olduğun ve nelerle ilgilendiğin hakkında topluluğa daha fazla bilgi vermen daha iyi ve daha yakın bir topluluğun oluşmasına yardım eder.
-      first_like: |
-        Bu rozet :heart: tuşunu kullanarak bir gönderiyi ilk kez beğendiğinizde verilir. Gönderileri beğenmek hemcins topluluk üyelerinin ilgi çekici, faydalı, havalı ve eğlenceli nelerin gönderildiğini bilmelerini sağlamak için mükemmel bir yoldur. Sevgiyi paylaş!
-      first_link: |
-        Bu rozet bir cevapta başka bir konuya bir bağlantı verdiğinde verilir. Konuları bağlamak, her iki yönde konular arasındaki ilişkiyi göstererek, hemcins okuyucuların ilgi çekici ve ilgili konuşmaları bulmalarına yardım eder.
-      first_quote: |
-        Bu rozet bir cevapta ilk kez bir gönderiden alıntı yaptığınızda verilir. Cevabında önceki gönderilerin ilgili bölümlerinden alıntı yapmak tartışmaların odaklanmış halde ve konu içinde tutulmasına yardımcı olur.
-      first_share: |
-        Bu rozet paylaş tuşunu kullanarak bir cevaba ya da konuya ilk kez bir bağlantı paylaştığında verilir. Bağlantıları paylaşmak dünyanın geri kalanıyla yapılan ilginç tartışmalarla gösteriş yapmak ve topluluğunu büyütmek için mükemmel bir yoldur.
-      read_guidelines: |
-        Bu rozet <a href="/guidelines">topluluk kurallarını okunmasına</a> verilir. Bu basit kuralları benimsemek ve paylaşmak güvenli, eğlenceli ve sürdürülebilir bir topluluğun inşa edilmesine yardım eder.
-      reader: |
-        Bu rozet uzun bir konuyu okumaya verilir. Okumak temeldir. Yakından okumak tartışmayı takip etmene ve daha iyi, daha eksiksiz cevaplar yazmana yardım eder.
-      editor: |
-        Bu rozet gönderini değiştirmene verilir. Geliştirmek, küçük hataları gidermek ya da unuttuğun bir şeyi eklemek için gönderilerini değiştirmekten hiçbir zaman çekinme.
-      first_flag: |
-        Bu rozet bir gönderinin işaretlenmesine verilir. İşaretleme, topluluğunun sağlığı için çok önemlidir. Yönetici incelemesi gereken herhangi bir gönderi görürseniz lütfen işaretlemekten çekinmeyin. Ayrıca hemcins kullanıcılara <b>mesajlar</b> göndermek için işaretleme diyaloğunu da kullanabilirsiniz.
-      nice_share: |
-        Bu rozet bir gönderide paylaşılan bir bağlantının 25 yabancı ziyaretçi tarafından ziyaret edilmesine verilir. Tebrikler! İlginç tartışmalara bağlantıları arkadaşlarla paylaşmak  topluluğumuzu büyütmek için harika bir yoldur.
-      welcome: |
-        Bu rozet bir gönderide ilk beğeninizi aldığınızda verilir. Tebrikler, hemcins topluluk üyelerinin ilginç, havalı ya da kullanışlı bulduğu bir şeyler gönderdin.
-      anniversary: |
-        Bu rozet en az bir gönderiye sahip olunan bir yıllık üyeliğe verilir. Buralarda olup topluluğumuza katkıda bulunduğunuz için teşekkür ederiz.
-      good_share: |
-        Bu rozet bir gönderide paylaşılan bir bağlantı, 300 yabancı ziyaretçi tarafından ziyaret edildiğinde verilir. İyi iş! <i>Bir sürü</> yeni kişiye ilgi çekici bir tartışma gösterdin ve böylece büyümemize yardımcı oldun.
-      great_share: |
-        Bu rozet bir gönderide paylaşılan bir bağlantının 100 yabancı ziyaretçi tarafından ziyaret edilmesine verilir. Vay be! Bu topluluk için ilginç bir tartışmayı yeni kocaman bir izleyici kitlesine terfi ettirdin ve büyümemize önemli bir katkı sağladın.
-      nice_post: |
-        Bu rozet bir cevap 10 beğeni aldığında verilir. İyi iş!
-      nice_topic: |
-        Bu rozet bir konu 10 beğeni aldığında verilir. İyi iş!
-      good_post: |
-        Bu rozet bir cevap 25 beğeni aldığında verilir. İyi iş!
-      good_topic: |
-        Bu rozet bir konu 25 beğeni aldığında verilir. İyi iş!
-      great_post: |
-        Bu rozet bir gönderi 50 beğeni aldığında verilir. Vay be!
-      great_topic: |
-        Bu rozet bir cevap 50 beğeni aldığında verilir. Vay be!
-      basic: |
-        Bu rozet güven seviyesi 1'e ulaştığında verilir. Bir süredir buralarda olduğun ve topluluğumuzun ne hakkında olduğu konusunda birkaç konu okuduğun için teşekkür ederiz. Yeni kullanıcı kısıtlamaların kaldırıldı ve kişisel mesajlaşma, işaretleme, wiki düzenleme, resim ve birden çok bağlantı gönderme yeteneği gibi ana topluluk yeteneklerini aldın.
-      member: |
-        Bu rozet güven seviyesi 2'ye ulaştığında verilir. Haftalar boyunca buralarda olup katkıda bulunduğun için teşekkür ederiz. Artık kullanıcı sayfandan ya da konularından kişisel davetler gönderebilir, grup mesajları oluşturabilir ve günlük birkaç daha fazla beğeni ekleyebilirsin.
-      regular: |
-        Bu rozet güven seviyesi 3'e ulaştığında verilir. Aylardır topluluğumuzun düzenli bir parçası, bu topluluğu harika yapan en etkin okuyucu ve güvenilir katkıcılardan biri olduğun için teşekkür ederiz. Artık konuların kategorilerini ve isimlerini değiştirebilirsin, özel bir lobi alanına erişebilir, daha güçlü spam işaretleri koyabilir ve günlük çok daha fazla beğeni ekleyebilirsin.
-      leader: |
-        Bu rozet güven seviyesi 4'e ulaştığında verilir. Eylem ve kelimelerin ile topluluk için olumlu bir izlenim bırakman sebebiyle forum kadrosu tarafından bu topluluğun bir önderi seçildin. Artık tüm gönderileri düzenleyebilir, sabitleme, kapatma, listelememe, arşivleme, ayırma ve birleştirme gibi yönetici eylemlerini yapabilir ve günlük yığınca beğeni ekleyebilirsiniz.
   admin_login:
     success: "E-posta Gönderildi"
     error: "Hata!"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index a4b9b79408..ed14a3c896 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -383,9 +383,6 @@ uk:
     subject_template: "[%{site_name}] Тест доставки електронної пошти"
   new_version_mailer_with_notes:
     subject_template: "оновлення [%{site_name}] доступно"
-  flags_reminder:
-    please_review: "Будь ласка, перегляньте його."
-    post_number: "допис"
   system_messages:
     post_hidden:
       subject_template: "Допис приховано через скарги спільноти"
@@ -457,12 +454,6 @@ uk:
 
         Перейдіть за посиланням, щоб обрати пароль:
         %{base_url}/users/password-reset/%{email_token}
-    confirm_new_email:
-      subject_template: "[%{site_name}] Підтвердіть свою електронну скриньку"
-      text_body_template: |
-        Підтвердіть свою нову електронну скриньку для сайта %{site_name}, перейшовши за посиланням:
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "Вас було схвалено на сайті %{site_name}!"
     signup:
@@ -474,7 +465,6 @@ uk:
 
         Якщо наведене посилання не є клікабельним, спробуйте скопіювати та вставити його в адресний рядок Вашого веб-оглядача.
   page_not_found:
-    title: "Сторінка, яку Ви запитали, не існує або є приватною."
     popular_topics: "Популярні"
     recent_topics: "Останні"
     see_more: "Більше"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index ab2a5822eb..d62310340f 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -151,7 +151,6 @@ vi:
       can_not_modify_automatic: "Bạn không thể sửa đổi một nhóm tự động"
       member_already_exist: "'%{username}' đã là thành viên của nhóm"
       invalid_domain: "'%{domain}' không phải là tên miền hợp lệ."
-      invalid_incoming_email: "'%{incoming_email}' không phải là một địa chỉ mail hợp lệ."
     default_names:
       everyone: "Mọi người"
       admins: "quản trị"
@@ -280,7 +279,6 @@ vi:
       uncategorized_parent: "Mục \"Chưa được phân loại\" không thể có một chuyên mục chính"
       self_parent: "Cha của chủ đề phụ không thể nào là chính nó"
       depth: "Bạn không thể để một chuyên mục con trong một chuyên mục con khác."
-      email_in_already_exist: "Địa chỉ thư đến '%{email_in}' đã được sử dụng cho danh mục '%{category_name}'"
     cannot_delete:
       uncategorized: "Không thể xoá mục Chưa phân loại"
       has_subcategories: "Không thể xoá chuyên mục này được vì nó có chuyên mục con."
@@ -732,7 +730,6 @@ vi:
     suppress_reply_directly_above: "Không hiện trả lời mở rộng cho bài viết chỉ có duy nhất một trả lời trực tiếp bên trên bài viết này."
     suppress_reply_when_quoting: "Không hiện trả lời mở rộng cho bài viết chỉ trích dẫn trả lời."
     max_reply_history: "Số tối đa trả lời được mở rộng khi trả lời mở rộng"
-    experimental_reply_expansion: "Ẩn các trả lời trung gian khi mở rộng trả lời (thử nghiệm)"
     topics_per_period_in_top_summary: "Số lượng chủ đề top hiển thị trong tóm tắt các chủ đề top theo mặc định."
     topics_per_period_in_top_page: "Số lượng chủ đề top hiển thị khi click 'Xem thêm'."
     redirect_users_to_top_page: "Tự động chuyển thành viên mới và vắng mặt lâu ngày lên trên cùng trang."
@@ -841,17 +838,9 @@ vi:
     tl2_requires_likes_received: "Số like một thành viên phải nhận được trước khi được thăng lên bậc tin cậy cấp 2."
     tl2_requires_likes_given: "Số like một thành viên phải thực hiện trước khi được thăng lên bậc tin cậy cấp 2."
     tl2_requires_topic_reply_count: "Số chủ đề thành viên phải trả lời trước khi được thăng lên bậc tin cậy cấp 2."
-    tl3_time_period: "Khoảng thời gian độ tin cậy cấp 3 yêu cầu"
-    tl3_requires_days_visited: "Số ngày tối thiểu thành viên cần phải ghé thăm site trong khoảng 100 ngày gần đây trước khi được thăng lên độ tin cậy cấp 3. Đặt cao hơn khoảng thời gian tl3 để vô hiệu hóa thăng hạng tl3. (0 hoặc cao hơn)"
-    tl3_requires_topics_replied_to: "Số tối thiểu chủ đề thành viên phải trả lời trong 100 ngày gần đây trước khi được thăng lên bậc tin cậy cấp 3. (0 hoặc cao hơn)"
-    tl3_requires_topics_viewed: "Số phần trăm chủ đề được tạo trong khoảng 100 ngày gần đây mà thành viên cần phải xem trước khi được thăng lên độ tin cậy cấp 3. (từ 0 đến 100)"
-    tl3_requires_posts_read: "Phần trăm số bài viết được tạo trong khoảng 100 ngày gần đây mà thành viên cần xem để được thăng lên độ tin cậy cấp 3. (từ 0 tới 100)"
     tl3_requires_topics_viewed_all_time: "Số lượng chủ đề tối thiểu mà thành viên phải xem trước khi được thăng lên độ tin cậy cấp 3."
     tl3_requires_posts_read_all_time: "Tổng số bài viết tối thiểu mà thành viên phải đọc trước khi được thăng lên độ tin cậy cấp 3."
-    tl3_requires_max_flagged: "Thành viên phải không có nhiều hơn x bài viết bị đánh dấu bởi x thành viên khác trong khoảng 100 ngày gần đây để được thăng lên độ tin cậy cấp 3, với x là giá trị thiết lập. (0 hoặc cao hơn)"
     tl3_promotion_min_duration: "Số ngày tối thiểu chương trình thăng hạng cấp 3 kéo dài trước khi thành viên có thể bị giáng cấp xuống độ tin cậy cấp 2."
-    tl3_requires_likes_given: "Số like tối thiểu mà thành viên phải thực hiện trong khoảng 100 ngày gần đây để được thăng lên độ tin cậy cấp 3."
-    tl3_requires_likes_received: "Số like tối thiểu mà thành viên phải nhận được trong khoảng 100 ngày gần đây để được thăng lên độ tin cậy cấp 3."
     tl3_links_no_follow: "Không loại bỏ rel=nofollow khỏi các liên kết trong bài viết của thành viên có độ tin cậy cấp 3."
     min_trust_to_create_topic: "Bậc tin tưởng tối thiểu để tạo một chủ đề mới."
     min_trust_to_edit_wiki_post: "Bậc tin cậy tối thiểu cần thiết để có thể sửa bài viết được đánh dấu là wiki."
@@ -915,7 +904,6 @@ vi:
     moved_post: "%{display_username} di chuyển bài viết của bạn tới %{link}"
     private_message: "%{display_username} gửi bạn một tin nhắn: %{link}"
     invited_to_private_message: "%{display_username} mời bạn xem tin nhắn: %{link}"
-    invited_to_topic: "%{display_username} mời bạn xem chủ đề: %{link}"
     invitee_accepted: "%{display_username} chấp nhận lời mời của bạn"
     linked: "%{display_username} kết nối với bạn ở %{link}"
     granted_badge: "Bạn kiếm được %{link}"
@@ -925,11 +913,6 @@ vi:
       category: 'Thư mục'
       topic: 'Kết quả'
       user: 'Thành viên'
-  sso:
-    not_found: "Không thể tìm hoặc tạo tài khoản, vui lòng liên hệ quản trị trang"
-    account_not_approved: "Tài khoản đang chờ duyệt, bạn sẽ nhận được email thông báo khi được duyệt"
-    unknown_error: "Có lỗi khi cập nhật thông tin, liên hệ quản trị trang"
-    timeout_expired: "Tài khoản đăng nhập bị quá thời gian, vui lòng đăng nhập lại"
   original_poster: "Người viết gốc"
   most_posts: "Bài viết Phỏ biến"
   redirected_to_top_reasons:
@@ -973,8 +956,6 @@ vi:
       characters: "chỉ bao gồm số, ký tự và dấu gạch dưới"
       unique: "phải độc nhất"
       blank: "phải hiện hành"
-      must_begin_with_alphanumeric: "phải bắt đầu bằng ký tự hoặc số hoặc gạch dưới"
-      must_end_with_alphanumeric: "phải kết thúc bằng ký tự hoặc số hoặc gạch dưới"
     email:
       not_allowed: "không được chấp nhận từ nhà cung cấp email đó. Vui long sử dụng địa chỉ email khác."
       blocked: "không được chấp nhận."
@@ -1000,9 +981,6 @@ vi:
     subject_template: "[%{site_name}] Phiên bạn Discourse mới, cập nhật đã sẵn sàng"
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] cập nhật đã sẵn sàng"
-  flags_reminder:
-    please_review: "Vui lòng xem lại chúng."
-    post_number: "bài đăng"
   flags_dispositions:
     agreed: "Cảm ơn đã cho chúng tôi biết. Chúng thôi đồng ý nó là một vấn đề và chúng tôi sẽ xem xét nó."
     agreed_and_deleted: "Cảm ơn đã cho chúng tôi biết thông tin. Chúng tôi đồng ý đây là một vấn đề và chúng tôi đã xóa bài viết này."
@@ -1080,8 +1058,6 @@ vi:
     posted_by: "Đăng bởi %{{username} ngày %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} mời bạn trả lời thông điệp '%{topic_title}'"
-    user_invited_to_topic:
-      subject_template: "[%{site_name}] %{username} mời bạn trả lời chủ đề '%{topic_title}'"
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
     user_quoted:
@@ -1111,14 +1087,11 @@ vi:
       subject_template: "[%{site_name}] Đăng nhập"
     account_created:
       subject_template: "[%{site_name}] Tài khoản mới"
-    confirm_new_email:
-      subject_template: "[%{site_name}] Xác nhận địa chỉ email mới của bạn"
     signup_after_approval:
       subject_template: "Bạn đã được kiểm duyệt ở %{site_name}!"
     signup:
       subject_template: "[%{site_name}] Xác nhận tài khoản mới của bạn"
   page_not_found:
-    title: "Trang bạn yêu cầu không tồn tại hoặc riêng tư."
     popular_topics: "Phổ biến"
     recent_topics: "Gân đây"
     see_more: "Thêm"
@@ -1175,16 +1148,6 @@ vi:
     title: "Điều khoản Dịch vụ"
   privacy_topic:
     title: "Chính sách Riêng tư"
-  badges:
-    long_descriptions:
-      good_post: |
-        Huy hiệu này được trao khi câu trả lời nhận được 24 lượt thích. Làm tốt lắm!
-      good_topic: |
-        Huy hiệu này được trao khi bài viết nhận được 25 lượt thích. Làm tốt lắm!
-      great_post: |
-        Huy hiệu này được trao khi bài viết nhận được 50 lượt thích. Wow!
-      great_topic: |
-        Huy hiệu này được trao khi câu trả lời nhận được 50 lượt thích. Wow!
   admin_login:
     success: "Gửi mail lỗi"
     error: "Lỗi!"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 9ef4a717c1..3e2d34d4f7 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -157,6 +157,9 @@ zh_CN:
     hot: "最热主题"
     top: "热门主题"
     posts: "最新帖子"
+    private_posts: "最近的私信"
+    group_posts: "%{group_name}组最近的帖子"
+    group_mentions: "%{group_name}组最近的提及"
   too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。"
   revert_version_same: "目前的版本和你想要回退至的版本一样。"
   excerpt_image: "图片"
@@ -416,6 +419,7 @@ zh_CN:
     confirmed: "你的电子邮箱已被更新。"
     please_continue: "转入到 %{site_name}"
     error: "在修改你的电子邮箱地址时出现了错误，可能此邮箱已经在论坛中使用了？"
+    error_staged: "在修改你的电子邮箱地址时出现了错误。这个邮箱已经被一个暂存用户占用了。"
     already_done: "抱歉，此激活链接已经失效。可能你已经修改了邮箱？"
     authorizing_old:
       title: "感谢你确认你目前的邮箱地址"
@@ -670,11 +674,14 @@ zh_CN:
     site_contact_username_warning: "输入一个友善的管理人员账户名，并以他的名义发送重要的自动消息。在<a href='/admin/site_settings'>站点设置</a>中更新 site_contact_username。"
     notification_email_warning: "通知邮件不是从你域名的一个有效地址发出的；邮件分发将会变得危险和不可靠。请在<a href='/admin/site_settings'>站点设置</a>中将 notification_email 设置为一个有效的本地邮件地址。"
     subfolder_ends_in_slash: "你的子目录设置不正确；DISCOURSE_RELATIVE_URL_ROOT以斜杠结尾。"
+    email_polling_errored_recently:
+      other: "邮件轮询在过去的 24 小时内发生了 %{count} 个错误。看一看<a href='/logs' target='_blank'>日志</a>寻找详情。"
   site_settings:
     censored_words: "将被自动替换为 &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "自动删除被隐藏超过 30 天的帖子。"
     default_locale: "此论坛的缺省语言（ISO 639-1 代码）"
     allow_user_locale: "允许用户选择他们自己的语言界面"
+    set_locale_from_accept_language_header: "为未登录用户按照他们的浏览器发送的请求头部设置界面语言。（实验性，无法和匿名缓存共同使用）"
     min_post_length: "帖子允许的最少字符数"
     min_first_post_length: "第一帖（主题内容）允许的最少字符数"
     min_private_message_post_length: "消息允许的最小字符数"
@@ -770,7 +777,6 @@ zh_CN:
     suppress_reply_directly_above: "当一个帖子只有一个回复时，不显示回复到该贴的回复。"
     suppress_reply_when_quoting: "当帖子引用回复时，不显示可展开的回复到某贴的标记。"
     max_reply_history: "扩展回复至时显示的最大回复数量"
-    experimental_reply_expansion: "当展开回复至内容时隐藏直接回复（实验性）"
     topics_per_period_in_top_summary: "在一个主题底部显示的默认推荐主题的数量。"
     topics_per_period_in_top_page: "在展开“显示更多”推荐主题列表显示的主题数量。"
     redirect_users_to_top_page: "自动重定向至新用户或者长时间未登入的用户至热门页面。"
@@ -823,7 +829,7 @@ zh_CN:
     instagram_consumer_secret: "Instagram 验证的 Consumer secret"
     enable_facebook_logins: "启用 Facebook 帐号验证登录，需要 facebook_app_id 和 facebook_app_secret"
     facebook_app_id: "Facebook 帐号验证的应用帐号（App id），到 https://developers.facebook.com/apps 来注册获取"
-    facebook_app_secret: "脸书帐号验证的应用密码（App secret），到 https://developers.facebook.com/apps 来注册获取"
+    facebook_app_secret: "Facebook 帐号验证的应用密码（App secret），到 https://developers.facebook.com/apps 来注册获取"
     enable_github_logins: "启用 Github 帐号验证登录，需要 github_client_id 和 github_client_secret"
     github_client_id: "Github 帐号验证的客户端帐号（Client id），到 https://github.com/settings/applications 来注册获取"
     github_client_secret: "Github 帐号验证的客户端密码（Client secret），到 https://github.com/settings/applications 来注册获取"
@@ -887,17 +893,17 @@ zh_CN:
     tl2_requires_likes_received: "一个初级用户升级到信任等级2所需要获得的赞数。"
     tl2_requires_likes_given: "一个初级用户升级到信任等级2所需要给出的赞数。"
     tl2_requires_topic_reply_count: "一个初级用户升级到信任等级2所需要回复的主题数量。"
-    tl3_time_period: "3级信任等级时间期"
-    tl3_requires_days_visited: "要维持信任等级 3 升级的用户，需要在最近 100 天内访问的最低次数。将其设置为高于信任等级 3 的评估时间来禁用升级至信任等级 3 功能。（设置为 0 或比那个值更高）"
-    tl3_requires_topics_replied_to: "在最近 100 天内升至信任等级3所需的回复主题的最小数量。（0或更高）"
-    tl3_requires_topics_viewed: "升至信任等级 3 所需阅读的最近 100 天内新创建主题的百分比。（0到100）"
-    tl3_requires_posts_read: "升至信任等级 3 所需阅读的最近 100 天内新创建帖子的百分比。（0到100）"
+    tl3_time_period: "信任等级 3 考察期限（天数）"
+    tl3_requires_days_visited: "要升到信任等级 3 所需要的，在最近考察时间段内访问的最低天数。将其设置为高于信任等级 3 的考察时间可禁用信任等级 3。（设置为 0 或比考察期更长）"
+    tl3_requires_topics_replied_to: "要升到信任等级 3 所需要的，在最近考察时间段内回复的主题数量。（设置为 0 或更高）"
+    tl3_requires_topics_viewed: "要升到信任等级 3 所需要的，在最近考察时间段内所查看的新主题的百分比。将其设置为高于信任等级 3 的考察时间可禁用信任等级 3。（设置为 0 到 100）"
+    tl3_requires_posts_read: "要升到信任等级 3 所需要的，在最近考察时间段内所查看的新主题的百分比。将其设置为高于信任等级 3 的考察时间可禁用信任等级 3。（设置为 0 或比考察期更长）"
     tl3_requires_topics_viewed_all_time: "用户升至信任等级 3 所需查看的最小主题数量。"
     tl3_requires_posts_read_all_time: "用户升至信任等级 3 所需查看的最小帖子数量。"
-    tl3_requires_max_flagged: "用户在最近 100 天内升至信任等级3所需的必须没有超过 x 个帖子被 x 个不同的用户标记数量，x为数量。（0或更高）"
+    tl3_requires_max_flagged: "要升到信任等级 3 所需要的，在最近考察时间段内，用户不得被 x 个不同用户标记 x 篇帖子的 x 值。（设置为 0 或更高）"
     tl3_promotion_min_duration: "信任等级3的用户可被降级至信任等级2前最小持续天数。"
-    tl3_requires_likes_given: "在最近 100 天内升至信任等级3所需给出的赞。"
-    tl3_requires_likes_received: "在最近 100 天内升至信任等级3所需收到的赞。"
+    tl3_requires_likes_given: "要升到信任等级 3 所需要的，在最近考察时间段内用户必须要给出的赞（设置为 0 或更高）"
+    tl3_requires_likes_received: "要升到信任等级 3 所需要的，在最近考察时间段内用户必须要收到的赞（设置为 0 或更高）"
     tl3_links_no_follow: "不移除信任等级3用户帖子中的链接中的 rel=nofollow 属性。"
     min_trust_to_create_topic: "创建主题所需的最低信任等级。"
     min_trust_to_edit_wiki_post: "能编辑维基模式帖子的最小信任等级"
@@ -912,7 +918,7 @@ zh_CN:
     max_users_notified_per_group_mention: "当整个群组被提及，用户可能收到的最多提醒数量（超过阈值后将不会有更多新提醒）"
     create_thumbnails: "为太大而无法恰当地显示在帖子里的图片创建 lightbox 缩略图。"
     email_time_window_mins: "等待多少（n）分钟才给用户发送通知电子邮件，好让他们有机会自己来编辑和完善他们的帖子。"
-    private_email_time_window_seconds: "等待多少（n）秒后再给用户发送通知私人通知邮件，这让用户有机会编辑和完善他们的帖子。"
+    private_email_time_window_seconds: "等待多少（n）秒再给用户发送通知电子邮件，这可以让用户有时间来编辑和完善他们的消息。"
     email_posts_context: "在通知邮件中包含的作为上下文的回复数量。"
     flush_timings_secs: "向服务器刷新时间数据的频率，以秒为单位。"
     title_max_word_length: "在主题的标题中，允许的词语长度的最大字符数。"
@@ -970,6 +976,9 @@ zh_CN:
     unsubscribe_via_email: "允许用户在发送的邮件的主题或正文中包含“unsubscribe”（未知中文版用什么）来退订邮件"
     unsubscribe_via_email_footer: "在发出的邮件底部包含退订链接"
     delete_email_logs_after_days: "在（N）天后删除邮件日志。设置为 0 无限期保留"
+    max_emails_per_day_per_user: "每日发送给用户的最大帖子数量。设置为 0 禁止限制"
+    enable_staged_users: "处理进站邮件时自动创建暂存用户。"
+    manual_polling_enabled: "用 API 推送邮件回复。"
     pop3_polling_enabled: "轮询 POP3 收取邮件回复。"
     pop3_polling_ssl: "连接至 POP3 服务器时使用 SSL。（推荐）"
     pop3_polling_period_mins: "查询用于邮件的 POP3 账户的间隔（以分钟计）。注意：需要重新启动。"
@@ -997,6 +1006,7 @@ zh_CN:
     digest_topics: "邮件摘要中显示的最大主题数目。"
     digest_min_excerpt_length: "在邮件摘要中每个帖子最少显示的字符数量。"
     delete_digest_email_after_days: "不发送摘要邮件给超过（n）天没访问的用户"
+    digest_suppress_categories: "不在摘要邮件中显示关注这个分类的任何内容。"
     disable_digest_emails: "为所有用户禁用摘要邮件。"
     detect_custom_avatars: "检测用户是否上传了自定义个人头像。"
     max_daily_gravatar_crawls: "一天内 Discourse 将自动检查 gravatar 自定义头像的次数"
@@ -1014,7 +1024,7 @@ zh_CN:
     disable_avatar_education_message: "禁用更改头像操作的教育消息。"
     daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到管理人员才能看到的主题"
     suppress_uncategorized_badge: "不要为主题列表中的未分类主题显示徽章。"
-    permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(\\/topic.*)\\?.*/\\1 将去掉所有主题路径的参数字符串。格式为使用正则表达式，以及在字符串使用 \\1 等等来访问捕获内容"
+    permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(topic.*)\\?.*/\\1 将去掉所有主题路径的参数字符串。格式为使用正则表达式+使用 \\1 等字符串来访问捕获内容"
     global_notice: "为所有访客显示“紧急的”全局横幅，留空隐藏它（可以使用 HTML）"
     disable_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统编辑提醒。"
     automatically_unpin_topics: "当用户到达底部时自动解除主题置顶。"
@@ -1052,6 +1062,7 @@ zh_CN:
     approve_unless_trust_level: "该信任等级之下的用户的帖子必须被审核"
     notify_about_queued_posts_after: "如果有帖子等待了设定的小时数后仍在等候处理，发送一封邮件给联络邮件地址。设为 0 将禁用这些邮件。"
     default_email_digest_frequency: "用户默认收到摘要邮件的默认频率。"
+    default_include_tl0_in_digests: "用户在摘要邮件中是否收到新用户帖子的默认设置。用户可以在参数设置中更改这个设置。"
     default_email_private_messages: "默认在有人发消息给用户时发送一封邮件通知。"
     default_email_direct: "默认在有人引用、回复、提及或者邀请用户时发送一封邮件通知。"
     default_email_mailing_list_mode: "默认为每一个新帖子发送一封邮件通知。"
@@ -1090,7 +1101,8 @@ zh_CN:
       pop3_polling_password_is_empty: "在启用 POP3 轮询前，你必须设置 'pop3 polling password'。"
       pop3_polling_authentication_failed: "POP3 验证失败。请验证你的 pop3 账户信息。"
       reply_by_email_address_is_empty: "在启用邮件回复之前，你必须设置“reply by email address”。"
-      pop3_polling_disabled: "在启用邮件回复之前，你必须先启用 POP3 轮询。"
+      email_polling_disabled: "在启用邮件回复功能前，你必须启用手动或者 POP3 轮询。"
+      user_locale_not_enabled: "你必须先设置 'allow user locale' 再启用该设置。"
   notification_types:
     group_mentioned: "%{group_name} 在 %{link} @ 了你"
     mentioned: "%{display_username} 在 %{link} @ 了你"
@@ -1113,10 +1125,10 @@ zh_CN:
       topic: '结果'
       user: '用户'
   sso:
-    not_found: "无法找到或创建账户，联系站点管理员"
-    account_not_approved: "账户正在等待验证，完成后你将收到一封邮件提醒"
-    unknown_error: "更新信息时错误，联系站点管理员"
-    timeout_expired: "账户登录超时，请重试登录"
+    not_found: "无法找到你的账户。请联系站点管理人员。"
+    account_not_approved: "你的帐号尚未被审核通过。一旦你的帐号获得批准，你就会收到一封电子邮件提醒。"
+    unknown_error: "你的账户发生了问题。请联系站点管理人员。"
+    timeout_expired: "账户登录超市，请重新尝试登录。"
   original_poster: "原始作者"
   most_posts: "大部分帖子"
   most_recent_poster: "当前大部分帖子作者"
@@ -1332,14 +1344,6 @@ zh_CN:
       ### 发行注记
 
       %{notes}
-  flags_reminder:
-    flags_were_submitted:
-      other: "这些标记在过去 %{count} 内被提交。"
-    please_review: "请核查他们。"
-    post_number: "帖子"
-    how_to_disable: '你可以通过修改“notify about flags after”设置项以禁用或改变邮件提醒设置。'
-    subject_template:
-      other: "%{count} 个标记需要被处理"
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} 个帖子等待审核"
@@ -1353,9 +1357,9 @@ zh_CN:
     spam: "你的帖子被标记为 **广告**：社群成员觉得它是广告，像是在过度地推广着什么，而不是预期中与主题有关的内容。"
     notify_moderators: "你的帖子被标记为 **需要版主关注**：社群成员认为帖子需要管理人员介入。"
   flags_dispositions:
-    agreed: "感谢通知我们。我们认为这是一个问题，并且我们正在了解情况。"
+    agreed: "谢谢你的消息。我们认为这是个问题。我们正在进行处理。"
     agreed_and_deleted: "感谢通知我们。我们认为这是一个问题，并且我们已经删除了帖子。"
-    disagreed: "感谢通知我们。我们正在了解情况。"
+    disagreed: "谢谢你的消息。我们正在进行处理。"
     deferred: "感谢通知我们。我们正在调查情况。"
     deferred_and_deleted: "感谢通知我们。我们已经删除了帖子。"
   temporarily_closed_due_to_flags: "主题因为大量的社群标记暂时关闭"
@@ -1365,7 +1369,7 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是一封从%{site_name}自动发出的邮件，通知你的帖子已被隐藏。
+        这是%{site_name}自动发出的邮件，通知你的帖子已被隐藏。
 
         %{base_url}%{url}
 
@@ -1540,6 +1544,12 @@ zh_CN:
         我们非常抱歉，你发送至 %{destination}（名为 %{former_title}）的邮件出问题了。
 
         你的账户没有足够的信任等级向该邮件地址发布新主题。如果你坚信这是错误，联系管理人员。
+    email_reject_user_not_found:
+      subject_template: "[%{site_name}] 邮件问题 -- 用户未找到"
+      text_body_template: |
+        我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
+
+        你发送回复的邮件地址是未知的邮件地址。试试从另外一个邮件地址发送，或者联系管理人员。
     email_reject_inactive_user:
       subject_template: "[%{site_name}] 电子邮件错误 -- 未激活用户"
       text_body_template: |
@@ -1661,7 +1671,7 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是一封自 %{site_name} 自动发出的邮件，以告知你的帖子已因被社群多次标记而被自动隐藏。
+        这是%{site_name}自动发出的邮件，以告知你的帖子已因被社群多次标记而被自动隐藏。
 
         处于谨慎的考虑，你的新账户被禁止创建新回复或主题。除非一个管理人员能复核你的账户。
 
@@ -1671,13 +1681,17 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是一封自 %{site_name} 自动发出的邮件，以告知你的账户被管理人员封禁。
+        这是%{site_name}自动发出的邮件。你的账户已经被管理人员封禁。
+
+        请知晓在管理人员解封你之前，你不能够再创建新的回复或者主题。
+
+        如果你对封禁有异议，请联系我们的[管理人员](%{base_url}/about)。
 
         欲查看额外的指导，请查看我们的[社群指引](%{base_url}/guidelines)。
     user_automatically_blocked:
       subject_template: "因标记而被封禁的新用户 %{username}"
       text_body_template: |
-        这是一封自动发出的邮件。
+        这是自动发出的邮件。
 
         因多位用户标记%{username}的帖子，新用户[%{username}](%{base_url}%{user_url})已被自动封禁。
 
@@ -1687,7 +1701,7 @@ zh_CN:
     spam_post_blocked:
       subject_template: "新用户 %{username} 因重复发布链接而被禁止发表相关帖子"
       text_body_template: |
-        这是一封自动发出的邮件。
+        这是自动发出的邮件。
 
         新用户[%{username}](%{base_url}%{user_url})试图创建多个链接至 %{domains} 的帖子，但这些帖子因为反垃圾策略而被阻挡了。用户仍能够发表不包含到 %{domains} 的帖子。
 
@@ -1699,7 +1713,7 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是一封自 %{site_name} 自动发出的邮件，以告知你的账户已经在管理人员审核后被解封。
+        这是%{site_name}自动发出的邮件，以告知你的账户已经在管理人员审核后被解封。
 
         你现在又可以创建新的回复和主题了。
     pending_users_reminder:
@@ -1720,6 +1734,8 @@ zh_CN:
   subject_pm: "[私信]"
   user_notifications:
     previous_discussion: "之前的回复"
+    reached_limit:
+      other: "警告：你达到了每日邮件限额（%{count}）。之后邮件通知将被禁用。"
     in_reply_to: "回复给"
     unsubscribe:
       title: "取消订阅"
@@ -1730,51 +1746,53 @@ zh_CN:
     visit_link_to_respond: "访问[Visit Topic](%{base_url}%{url})以回复"
     visit_link_to_respond_pm: "访问[Visit Message](%{base_url}%{url})以回复"
     posted_by: "%{username}发表于%{post_date}"
+    invited_to_private_message_body: |
+      %{username} 邀请你至消息交流：
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      论坛：
+
+      > %{site_title} -- %{site_description}
+    invited_to_topic_body: |
+      %{username} 邀请你参与讨论：
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      论坛：
+
+      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} 邀请你加入消息交流：'%{topic_title}'"
-      text_body_template: |2
+      text_body_template: |
+        %{header_instructions}
 
-        %{username} 邀请你至消息交流：
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        论坛：
-
-        > %{site_title} -- %{site_description}
-
-        请访问 %{base_url}%{url} 来查看该主题。
+        ---
+        %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} 邀请你加入消息交流：'%{topic_title}'"
-      text_body_template: |2
+      text_body_template: |
+        %{header_instructions}
 
-        %{username} 邀请你至消息交流：
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        论坛：
-
-        > %{site_title} -- %{site_description}
-
-        请访问 %{base_url}%{url} 来查看该主题。
+        ---
+        %{respond_instructions}
     user_invited_to_topic:
       subject_template: "[%{site_name}] %{username}邀请你参与“%{topic_title}”"
-      text_body_template: |2
+      text_body_template: |
+        %{header_instructions}
 
-        %{username} 邀请你参与讨论：
+        %{message}
 
-        > **%{topic_title}**
-        >
-        > %{topic_excerpt}
-
-        论坛：
-
-        > %{site_title} -- %{site_description}
-
-        请访问 %{base_url}%{url} 来查看该主题。
+        ---
+        %{respond_instructions}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
@@ -1895,9 +1913,9 @@ zh_CN:
     set_password:
       subject_template: "[%{site_name}] 设置密码"
       text_body_template: |
-        有人请求添加你在 [%{site_name}](%{base_url}) 的密码。除此之外，你可以通过已验证邮件地址的在线服务商（Google、Facebook等等）登录。
+        有人请求添加你在 [%{site_name}](%{base_url}) 的密码。除此之外，你可以通过已验证过你邮件地址的在线服务商登录。
 
-        如果不是你请求添加密码，你可以直接忽略本邮件。
+        如果不是你在请求添加密码，你可以直接忽略本邮件。
 
         点击下面的链接来选择一个新密码：
         %{base_url}/users/password-reset/%{email_token}
@@ -1934,7 +1952,7 @@ zh_CN:
     notify_old_email:
       subject_template: "[%{site_name}] 你的邮箱地址已经修改成功"
       text_body_template: |
-        这是一封自 %{site_name} 自动发出的邮件，以告知你的邮箱地址已经被修改了。如果这是一个错误，请联系站点管理人员。
+        这是%{site_name}自动发出的邮件，以告知你的邮箱地址已经被修改了。如果这是一个错误，请联系站点管理人员。
 
         你的邮箱地址被修改为：
 
@@ -2009,6 +2027,7 @@ zh_CN:
     post_deleted: "主题被作者删除"
     user_suspended: "用户被封禁"
     already_read: "用户已经阅读了主题"
+    exceeded_limit: "超过 max_emails_per_day_per_user"
     message_blank: "消息为空"
     message_to_blank: "message.to 为空"
     text_part_body_blank: "text_part.body 为空"
@@ -2249,86 +2268,206 @@ zh_CN:
 
       文档以 CC-BY-SA 发布。最后更新时间为2013年5月31日。
   static:
-    search_help: |
-      <h3>小技巧</h3>
-      <p>
-      <ul>
-        <li>标题匹配优先 &ndash; 不知道搜什么时，搜索标题</li>
-        <li>搜索独一无二且不常见的词可以找到最好的结果</li>
-        <li>试试搜索特定的分类、用户或主题</li>
-      </ul>
-      </p>
-      <h3>选项</h3>
-      <p>
-        <table>
-        <tr><td><code>order:views（按照显示次数排序）</code></td><td><code>order:latest（按照更新时间排序）</code></td><td><code>order:likes（按照赞的次数排序）</code><td></td><td colspan=2></td></tr>
-        <tr><td><code>status:open（搜索正常状态的主题）</code></td><td><code>status:closed（搜索已经关闭的主题）</code></td><td><code>status:archived（搜索已经存档的主题）</code></td><td><code>status:noreplies（搜索没有回复的主题）</code></td><td><code>status:single_user（搜索单个用户的主题）</code></td></tr>
-        <tr><td><code>category:分类名</code></td><td><code>user:用户名</code></td><td><code>group:群组名</code></td><td><code>badge:徽章名</code></td><td></td></tr>
-        <tr><td><code>in:likes（在已经赞的帖子里搜索）</code></td><td><code>in:posted（在发表的帖子里搜索）</code></td><td><code>in:watching（在关注的帖子里搜索）</code></td><td><code>in:tracking（在追踪的帖子里搜索）</code></td><td><code>in:private（在私密的帖子里搜索）</code></td></tr>
-        <tr><td><code>in:bookmarks（在加书签的帖子里搜索）</code></td><td><code>in:first（在第一帖里搜索）</code></td><td colspan=3></td></tr>
-        <tr><td><code>posts_count:数字（帖子数量）</code></td><td><code>before:天数或者日期</code></td><td><code>after:天数或者日期</code></td> <td colspan=2></td></tr>
-        </table>
-      </p>
-      <h3>例子</h3>
-      <p>
-        <ul>
-          <li><code>彩虹 category:公园 status:open order:latest</code> 将搜索在“公园”分类中没有关闭或存档中的名字包含“彩虹”的主题，并按最后一个帖子的日期来排序。</li>
-          <li><code>彩虹 category:"公园和花园" in:bookmarks</code> 将搜索在“公园和花园”分类中已被你加过书签的且名字包含“彩虹”的主题。</li>
-        </ul>
-      </p>
+    search_help: "<h3>小技巧</h3>\n<p>\n<ul>\n<li>标题匹配优先 &ndash; 不知道搜什么时，搜索标题</li>\n<li>搜索独一无二且不常见的词可以找到最好的结果</li>\n<li>试试搜索特定的分类、用户或主题</li>\n</ul>\n</p>\n<h3>选项</h3>\n<p> \n<table>\n<tr><td><code>order:views（按照显示次数排序）</code></td><td><code>order:latest（按照更新时间排序）</code></td><td><code>order:likes（按照赞的次数排序）</code><td></td><td colspan=2></td></tr>\n<tr><td><code>status:open（搜索正常状态的主题）</code></td><td><code>status:closed（搜索已经关闭的主题）</code></td><td><code>status:archived（搜索已经存档的主题）</code></td><td><code>status:noreplies（搜索没有回复的主题）</code></td><td><code>status:single_user（搜索单个用户的主题）</code></td></tr>\n<tr><td><code>category:分类名</code></td><td><code>user:用户名</code></td><td><;code>group:群组名</code></td><;td><code>badge:徽章名</code></td><td></td></tr>\n<tr><td><code>in:likes（在已经赞的帖子里搜索）</code></td><td><code>in:posted（在发表的帖子里搜索）</code></td><td><code>in:watching（在关注的帖子里搜索）</code></td><td><code>in:tracking（在追踪的帖子里搜索）</code></td><td><code>in:private（在私密的帖子里搜索）</code></td></tr>\n<tr><td><code>in:bookmarks（在加书签的帖子里搜索）</code></td><td><code>in:first（在第一帖里搜索）</code></td><td colspan=3></td></tr>\n<tr><td><code>posts_count:数字（帖子数量）</code></td><td><code>before:天数或者日期</code></td><td><code>after:天数或者日期</code></td>\n<td colspan=2></td></tr>\n</table>\n</p>\n<h3>例子</h3>\n<p>\n<ul>\n<li><code>彩虹 category:公园 status:open order:latest</code> 将搜索在“公园”分类中没有关闭或存档中的名字包含“彩虹”的主题，并按最后一个帖子的日期来排序。</li>\n<li><code>彩虹 category:\"公园和花园\" in:bookmarks<;/code> 将搜索在“公园和花园”分类中已被你加过书签的且名字包含“彩虹”的主题。</li>\n</ul>\n</p>\n"
   badges:
-    long_descriptions:
-      autobiographer: |
-        该徽章授予给填写了<a href="/my/preferences">用户页面</a>并选择了用户头像的成员。让社群更多地了解你是谁以及你感兴趣的内容能帮助创造一个更好的更团结的社群。
-      first_like: |
-        该徽章授予给第一次使用 :heart: 按钮赞了帖子的成员。给帖子点赞是一个极好的让社群成员知道他们的帖子有意思、有用、酷炫或者好玩的方法。分享爱！
-      first_link: |+
-        该徽章授予给第一次在回复中包含了到另一个主题的链接。链接主题在两个主题的右侧显示连接，可以帮助阅读者迅速地找到相关讨论。
-
-      first_quote: |
-        该徽章授予给第一次在回复中包含了到另一个主题的链接。链接主题在两个主题的右侧显示连接，可以帮助阅读者迅速地找到相关讨论。
-      first_share: |
-        该徽章授予给第一次用分享按钮分享了回复或者主题的链接的成员。分享链接是一个极好的方式向外部世界展示有趣的讨论的方法，并且能推动社群增长。
-      read_guidelines: |+
-        该徽章授予给<a href="/guidelines">阅读了社群指引</a>的成员。遵守和分享简单的指引能帮助打造一个安全、有趣和可持续的社群。
-
-      reader: |
-        该徽章授予给阅读了一个较长的主题的成员。阅读是最基础的。详细阅读帮助你更好地了解讨论并帮助你编写更好的、更完整的回复。
-      editor: |
-        该徽章授予给编辑自己帖子的成员。任何时候都不要犹豫编辑你的帖子以改善他们、改正小错误或者增加你忘记的内容。
-      first_flag: |
-        该徽章授予给标记过帖子的用户。标记对社群的健康很重要。如果你注意到了任何需要版主注意的帖子，请不要犹豫，直接标记 它。你可能也使用了标记对话框向用户发送了<b>消息</b>。
-      nice_share: |
-        该徽章授予给分享帖子的链接至超过 25 个外部访客的成员。干得好！分享有趣的讨论给朋友是一个帮助社群成长的极好方式。
-      welcome: |
+    editor:
+      name: 编辑
+      description: 首次编辑帖子
+      long_description: |
+        该徽章授予给第一次编辑自己帖子的你。虽然你不能永远在编辑自己的帖子，但是编辑他们总是一个好办法——你可以改进你的帖子、修正小错误，或者是增补你原来没有写的内容。编辑能让你的帖子质量变得更好！
+    basic_user:
+      name: 初级用户
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">授予</a>所有常用社群功能
+      long_description: |
+        该徽章授予给用户等级达到 1 的成员。感谢你在社群里花了一些时间并且阅读了一些帖子，了解了我们的社群。你的新用户限制已经被取消；并且你已经被授予了所有基本的社群权限，必须个人消息、标记、维基编辑和发布多张图片和多个链接的能力。
+    member:
+      name: 成员
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">授予</a> 邀请、群组消息和更多的赞
+      long_description: |
+        该徽章授予给达到用户等级 2 的你。感谢你在社群待了几周，真正融入到了社群中。你现在可以在你的用户页或者主题中邀请他人或者创建群组消息了。每天你也可以点更多次赞了。
+    regular:
+      name: 活跃用户
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">授予</a> 重分类、重命名、跟踪链接、维基功能和更多的赞
+      long_description: |
+        该徽章授予给达到用户等级 3 的你。感谢你在这几个月持续地参与社群。你现在是我们之中最活跃的读者之一了，你持续的贡献极大地帮助了我们的社群。你现在可以社群待了几周，真正融入到了社群中。你现在可以重新分类或者重命名主题、使用能力强大的垃圾标记功能以及访问隐藏的贵宾分类了。而且每天你可以点更多次赞了。
+    leader:
+      name: 资深
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">授予</a> 全局编辑、固定、关闭、存档、分割、合并和更多的赞
+      long_description: |
+        该徽章授予给达到用户等级 4 的你。你被管理人员选作了社群的领导力量，你用你的行动和言辞为社群树立了正面的形象。你现在可以修改所有帖子，使用常见的版主的主题管理功能，比如置顶、关闭、隐藏、存档、分割和合并功能。你每天可以点更多的赞了。
+    welcome:
+      name: 欢迎
+      description: 得到一个赞
+      long_description: |
         该徽章授予给帖子收到了第一个赞的成员。恭喜，有社群成员发现你发表的内容有意思、酷炫或者有用！
-      anniversary: |
-        该徽章授予给在社群超过一年并且这一年中至少发布了一个帖子的成员。谢谢你的关注和对我们社群的贡献！
-      good_share: |
-        该徽章授予给分享帖子的链接至超过 300 个外部访客的成员。做得真棒！你已经把一个有意思的讨论分享给了许多新人，并且帮助了社群成长。
-      great_share: |
-        该徽章授予给分享帖子的链接至超过 100 个外部访客的成员。哇！你已经把一个有趣的主题分享给了许多新读者，并且帮助了社群成长。
-      nice_post: |+
-        该徽章授予给创建了得到 10 个赞的回复的成员。干得好！
+    autobiographer:
+      name: 自传作者
+      description: 已填写用户<a href="/my/preferences">资料</a>信息
+      long_description: |
+        该徽章授予给填写了<a href="/my/preferences">用户页面</a>并选择了用户头像的你。让社群成员们多了解你一点以及你感兴趣的内容，能帮助我们打造一个更好、更团结的社群。让我们一起努力！
+    anniversary:
+      name: 年度纪念日
+      description: 一年活跃用户，至少发了一个帖子
+      long_description: |
+        该徽章授予给在社群注册一年并超至少发布了一个帖子的你。感谢你的持续关注和对我们社群的贡献！我们希望你继续参与我们的社群。
+    nice_post:
+      name: 不错的回复
+      description: 回复被赞了 10 次
+      long_description: |
+        该徽章授予给回复被赞了 10 次的你。你的回复给社群成员们留下了印象，并且你推动了讨论的进程！
+    good_post:
+      name: 很好的回复
+      description: 回复被赞了 25 次
+      long_description: |
+        该徽章授予给回复被赞了 25 次的你。你的回复很杰出，这个讨论对每个人都变得更有意义了！
+    great_post:
+      name: 精彩的回复
+      description: 回复被赞了 50 次
+      long_description: |
+        该徽章授予给回复被赞了 50 次的你。哇！你的回复很有启发、引经据典、令人冷俊不禁或者十分有内涵，整个社群都喜欢它。
+    nice_topic:
+      name: 不错的主题
+      description: 主题被赞了 10 次
+      long_description: |
+        该徽章授予给主题获得 10 个赞的你。嗨，你开启了一个社群成员觉得有意思的讨论！
+    good_topic:
+      name: 很好的主题
+      description: 主题被赞了 25 次
+      long_description: |
+        该徽章授予给主题获得 25 个赞的你。你开启了一个有意义的主题，整个社群都在积极响应，而且大家喜欢你的主题！
+    great_topic:
+      name: 精彩的主题
+      description: 主题被赞了 50 次
+      long_description: |
+        该徽章授予给主题获得 50 个赞的你。你开启了一个引人入胜的主题，整个社群都沉浸于讨论之中。
+    nice_share:
+      name: 不错的分享
+      description: 分享了一个有 25 个独立访问者的帖子
+      long_description: |
+        该徽章授予给分享链接给 25 个其他访客的你。感谢你广而告之我们的讨论，和对这个社群的帮助。
+    good_share:
+      name: 很棒的分享
+      description: 分享了一个有 300 个独立访问者的帖子
+      long_description: |
+        该徽章授予给分享链接给 300 个其他访客的你。干得漂亮！你把一个有意思的讨论介绍给了许多新的朋友，并且帮助社群前进了一步。
+    great_share:
+      name: 精彩的分享
+      description: 分享了一个有 1000 个独立访问者的帖子
+      long_description: |+
+        该徽章授予给分享链接给 1000 个其他访客的你。哇！你把一个有意思的讨论推广给了广大的读者们，并且帮助社群前进了一大步！
 
-      nice_topic: |
-        该徽章授予给创建了得到 10 个赞的主题的成员。干得好！
-      good_post: |
-        该徽章授予给创建了得到 25 个赞的回复的成员。干得好！
-      good_topic: |
-        该徽章授予给创建了得到 25 个赞的主题的成员。干得好！
-      great_post: |
-        该徽章授予给创建了得到 50 个赞的帖子的成员。哇！
-      great_topic: |
-        该徽章授予给创建了得到 50 个赞的回复的成员。哇！
-      basic: |
-        该徽章授予给用户等级达到 1 的成员。感谢你在社群里花了一些时间并且阅读了一些帖子，了解了我们的社群。你的新用户限制已经被取消，并且你已经被授予了所有基本的社群权限，必须个人消息、标记、维基编辑和发布图片和多个链接的能力。
-      member: |
-        该徽章授予给用户等级达到 2 的成员。感谢你在社群的这几周时间。你现在已经可以在你的用户页或者主题中发送私人邀请、创建群组消息，以及每天可以赞更多次了。
-      regular: |
-        该徽章授予给用户等级达到 3 的成员。感谢你在社群的这几月的活跃参与，并且是我们最活跃的读者质疑，也是社群中的可靠贡献者。你现在可以重新分类和重命名主题、访问隐藏的贵宾分类、使用更多强大的防骚扰标记功能，以及每天可以赞更多次了。
-      leader: |
-        该徽章授予给用户等级达到 4 的成员。你是由管理人员选择的社群领袖，鉴于你在社群的话语和贡献，你为社群树立了一个正面的例子。你有权限编辑所有的帖子，使用主题管理操作，例如置顶、关闭、不在列表中显示、存档、分割和合并，并且可以每天点赞非常多次。
+    first_like:
+      name: 首个赞
+      description: 已赞过了一个帖子
+      long_description: |
+        该徽章授予给第一次使用 :heart: 按钮赞了帖子的成员。给帖子点赞是一个极好的让社群成员知道他们的帖子有意思、有用、酷炫或者好玩的方法。分享爱！
+    first_flag:
+      name: 首个标记
+      description: 已标记过了一个帖子
+      long_description: |
+        该徽章授予给第一次标记帖子的你。标记是帮助我们帮助社群保持健康、合宜的工具。如果你注意到哪个帖子需要版主的注意，不用在乎什么原因，直接标记。如果你注意到别人帖子里的某个问题，你也可用标记功能发送<b>私信</b>给该成员。如果你发现了问题，:flag_black: 标记吧！
+    promoter:
+      name: 推广者
+      description: 已邀请了 1 个用户
+      long_description: |
+        该徽章授予给邀请他人加入社群的你。你曾使用了用户页面的邀请按钮或主题底部的邀请按钮。邀请对某个讨论感兴趣的朋友是引介新人的好办法，非常感谢！
+    campaigner:
+      name: 活动家
+      description: 已邀请了 3 个初级用户
+      long_description: |
+        该徽章授予给邀请了 3 人加入社群的你，你的朋友在站点上度过了一段时间，已经成为了初级用户。一个活跃的社群需要不断有新鲜血液的参与，这样新观点才能推进讨论进程。
+    champion:
+      name: 外交官
+      description: 已邀请了 5 个成员
+      long_description: |
+        该徽章授予给邀请了 5 人加入社群的你，你的朋友在站点上度过了很长的时间，已经成为了成员。哇！感谢你帮助社群成长，社群因此变得更多元了！
+    first_share:
+      name: 首次分享
+      description: 已分享了一个帖子
+      long_description: |
+        该徽章授予给第一次用分享按钮分享了回复或者主题的链接的成员。分享链接是一个极好的方式向外部世界展示有趣的讨论的方法，并且能推动社群增长。
+    first_link:
+      name: 首个链接
+      description: 已链接了另一个主题
+      long_description: |
+        该徽章授予给第一次链接到另一个主题的你。联结主题会在各个主题的右侧显示链接和标题，这可以帮助阅读者迅速地找到相关讨论。多链接一些主题吧！
+    first_quote:
+      name: 首次引用
+      description: 已引用过一个帖子
+      long_description: |
+        该徽章授予给第一次在回复中引用帖子的你。在你的回复中引用之前帖子中的相关的段落可以让讨论更有主题和重点。而且这很简单：你只要选中别的帖子中的任何文字，然后点击在旁边的“引用回复”按钮。多引用一些吧！
+    read_guidelines:
+      name: 阅读指引
+      description: 阅读<a href="/guidelines">社群指引</a>
+      long_description: |
+        该徽章授予给<a href="/guidelines">阅读了社群指引</a>的你。遵守和分享简单的指引能让我们打造一个稳定、有趣和可持续的社群。永远记住别人，一个和你有很多共同点的人，就在屏幕的那一侧。友好一些！
+    reader:
+      name: 读者
+      description: 阅读了有至少 100 个回复的主题中的所有回复
+      long_description: |
+        该徽章授予给第一次阅读了超过 100 个回复的长主题的你。仔细地阅读对话内容能让你关注到讨论的中心，理解不同的观点，而且能帮助我们打造更有趣的对话情景。你读得越多，对话的效果就会越好。就如我们常说的那般，阅读是最重要的！ :slight_smile:
+    popular_link:
+      name: 流行链接
+      description: 分享的链接被点击了 50 次
+      long_description: |
+        该徽章授予给分享的链接被点击过 50 次的你。感谢你贴出了有用的链接，这让讨论的情节更形象了！
+    hot_link:
+      name: 热门链接
+      description: 分享的链接被点击了 300 次
+      long_description: |
+        该徽章授予给分享的链接被点击过 300 次的你。感谢你贴出了精彩的链接，这推进了讨论的进程，并且装点了讨论！
+    famous_link:
+      name: 著名链接
+      description: 分享的链接被点击了 1000 次
+      long_description: |
+        该徽章授予给分享的链接被点击过 1000 次的你。哇！感谢你贴出了推动讨论的重要链接，这让讨论更加具体，更有情节，并且传达了跟多的信息。干的好！
+    appreciated:
+      name: 感谢
+      description: 有 20 个帖子都被赞了 1 次
+      long_description: |
+        该徽章授予给 20 个不同的帖子都收到了至少 1 个赞的你。社群感谢你对讨论的贡献！
+    respected:
+      name: 尊敬
+      description: 有 100 个帖子都被赞了 2 次
+      long_description: |
+        该徽章授予给 100 个不同的帖子都收到了至少 2 个赞的你。社群越来越尊重你在讨论中的贡献了。
+    admired:
+      name: 敬仰
+      description: 有 300 个帖子都被赞了 5 次
+      long_description: |+
+        该徽章授予给 300 个不同的帖子都收到了至少 5 个赞的你。哇！社群敬仰你在讨论中频繁和高质量的贡献。
+
+    out_of_love:
+      name: 热情
+      description: 1 天内赞了 50 次
+      long_description: |
+        该徽章授予给一天内赞了 50 次的你。别忘记休息一下。赞你喜欢的帖子能鼓励成员不断改进讨论的内容。
+    higher_love:
+      name: "激情\b"
+      description: 5 天都赞过 50 次
+      long_description: |
+        该徽章授予给 5 天赞过 50 次的你。感谢你每天都花点时间鼓励讨论的进行！
+    crazy_in_love:
+      name: 狂热
+      description: 20 天都赞过 50 次
+      long_description: |+
+        该徽章授予给 20 天赞过 50 次的你。哇！你为社群成员们树立了一个令人鼓舞的模范！
+
+    thank_you:
+      name: 感谢你
+      description: 有 20 个被赞的帖子，给出过 10 个赞
+      long_description: |
+        该徽章授予给收到了 20 个赞，且赞过别人 10 次的你。当别人感谢你的帖子时，你也感谢他们的帖子。
+    gives_back:
+      name: 回馈
+      description: 有 100 个被赞的帖子，给出过 100 个赞
+      long_description: |
+        该徽章授予给收到了 100 个赞，且赞过别人 100 次的你。感谢你回馈赞给社群！
+    empathetic:
+      name: 感性
+      description: 有 500 个被赞的帖子，给出过 1000 个赞
+      long_description: |
+        该徽章授予给收到了 500 个赞，且赞过别人 1000 次的你。哇！你是一个富有同情心且会换位思考的模范。 :two_hearts:
   admin_login:
     success: "邮件已发送"
     error: "错误！"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 228829eb41..86b2e2e27a 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -126,7 +126,6 @@ zh_TW:
       can_not_modify_automatic: "你無法修改自動群組"
       member_already_exist: "'%{username}' 已經是群組成員了。"
       invalid_domain: "'%{domain}' 不是有效的域名."
-      invalid_incoming_email: "'%{incoming_email}' 不是有效的電子郵件地址."
     default_names:
       everyone: "所有人"
       admins: "管理員"
@@ -520,7 +519,6 @@ zh_TW:
     max_topic_title_length: "標題允許的最大文字數"
     min_private_message_title_length: "標題允許的最小文字數"
     min_search_term_length: "搜尋條件允許的最小文字數"
-    uncategorized_description: "\"未分類\"的分類的描述，留空則無描述"
     allow_duplicate_topic_titles: "允許話題有相同，重複的標題"
     unique_posts_mins: "使用者再次發表包含相同內容文章的間隔時間"
     educate_until_posts: "當用戶開始鍵入他們的前幾個 (n) 新帖子時，在編輯器上顯示教育面板視窗。"
@@ -671,15 +669,9 @@ zh_TW:
     tl2_requires_likes_received: "一個初級用戶升級到信任等級2所需要獲得的讚賞數。"
     tl2_requires_likes_given: "初級用戶升級到信任等級2所需要付出的讚賞數。"
     tl2_requires_topic_reply_count: "一個初級用戶升級到信任等級2所需要回覆的主題數量。"
-    tl3_requires_topics_replied_to: "在最近 100 天內升至信任等級3所需的回覆主題的最少數量。（0或更高）"
-    tl3_requires_topics_viewed: "在最近 100 天內升至信任等級3所需的創建主題的百分比。（0到100）"
-    tl3_requires_posts_read: "在最近 100 天內升信任等級3所需的創建帖子的百分比。（0到100）"
     tl3_requires_topics_viewed_all_time: "用戶升至信任等級3所需查看的最少主題數量。"
     tl3_requires_posts_read_all_time: "用戶升至信任等級3所需查看的最少帖子數量。"
-    tl3_requires_max_flagged: "用戶在最近 100 天內升至信任等級3所需的必須沒有超過 x 個帖子被 x 個不同的用戶標記數量，x為數量。（0或更高）"
     tl3_promotion_min_duration: "信任等級3的用戶可被降級至信任等級2前最少持續天數。"
-    tl3_requires_likes_given: "升至信任等級3需要在最近 100 天內所給出最少的讚。"
-    tl3_requires_likes_received: "升至信任等級3需要在最近 100 天內所收到最少的讚。"
     tl3_links_no_follow: "禁止從信任等級 3 之用戶所發表的連結中刪除 rel=nofollow 標籤"
     min_trust_to_create_topic: "建立話題最低所需的信任等級"
     min_trust_to_edit_wiki_post: "編輯被標示為維基的文章所需之最低信任等級。"
@@ -737,7 +729,6 @@ zh_TW:
     automatically_download_gravatars: "當用戶註冊或更改EMail時下載 Gravatars 圖片"
     digest_topics: "EMail 摘要中顯示的最大話題數量"
     digest_min_excerpt_length: "EMail 摘要中每篇文章最少顯示的字元數量"
-    delete_digest_email_after_days: "不發送摘要郵件給超過 (n) 天閒置的用戶。"
     disable_digest_emails: "禁用發送摘要郵件給所有用戶。"
     max_daily_gravatar_crawls: "一天內 Discourse 將自動檢查 Gravatar 自訂個人圖示的次數"
     public_user_custom_fields: "用戶可設定公開顯示的自定欄位白名單。"
@@ -784,8 +775,6 @@ zh_TW:
       category: '分類'
       topic: '結果'
       user: '用戶'
-  sso:
-    account_not_approved: "帳戶正在等待驗證，完成後你將收到一封電郵提醒"
   original_poster: "原始作者"
   most_posts: "大部分文章"
   most_recent_poster: "當前大部分文章作者"
@@ -852,11 +841,6 @@ zh_TW:
     subject_template: "[%{site_name}] 有可用的新版 Discourse 更新"
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] 可以升級"
-  flags_reminder:
-    flags_were_submitted:
-      other: "這些標記在過去 %{count} 小時內被提交。"
-    please_review: "請再次確認。"
-    post_number: "文章"
   flags_dispositions:
     disagreed: "感謝你讓我們知道。我們正在調查。"
     deferred: "感謝你讓我們知道。我們正在調查。"
@@ -944,12 +928,6 @@ zh_TW:
       subject_template: "[%{site_name}] 設定密碼"
     account_created:
       subject_template: "[%{site_name}] 你的新帳號"
-    confirm_new_email:
-      subject_template: "[%{site_name}] 確認你的新電子郵箱位址"
-      text_body_template: |
-        點擊下面的連結來確認你在 %{site_name} 上的新電子郵箱位址：
-
-        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "你已受到 %{site_name} 的認可！"
     signup:
@@ -961,7 +939,6 @@ zh_TW:
 
         如果上面的連結無法點擊，請拷貝該連結並粘貼到你的流覽器的地址欄裡。
   page_not_found:
-    title: "你請求的頁面在本論壇不存在。可能我們能幫助你找到它，或者類似的其它討論話題："
     popular_topics: "熱門"
     recent_topics: "最近"
     see_more: "更多"
@@ -1011,20 +988,6 @@ zh_TW:
     title: "服務條款"
   privacy_topic:
     title: "隱私政策"
-  badges:
-    long_descriptions:
-      nice_post: |
-        此徽章授予創建一個能獲取10個讚的回應。幹得不錯！
-      nice_topic: |
-        此徽章授予創建一個能獲取10個讚的話題。幹得不錯！
-      good_post: |
-        此徽章授予創建一個能獲取25個讚的回應。幹得好！
-      good_topic: |
-        此徽章授予創建一個能獲取25個讚的話題。幹得好！
-      great_post: |
-        此徽章授予創建一個能獲取50個讚的又章。勁！
-      great_topic: |
-        此徽章授予創建一個能獲取50個讚的回應。勁！
   admin_login:
     success: "已發送郵件"
     error: "錯誤"
diff --git a/config/routes.rb b/config/routes.rb
index ce8a19fc7d..c8de5b6507 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,6 +111,7 @@ Discourse::Application.routes.draw do
     end
     get "users/:id.json" => 'users#show', defaults: {format: 'json'}
     get 'users/:id/:username' => 'users#show'
+    get 'users/:id/:username/badges' => 'users#show'
 
 
     post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new
@@ -252,15 +253,15 @@ Discourse::Application.routes.draw do
   end
 
   resources :static
-  post "login" => "static#enter"
-  get "login" => "static#show", id: "login"
-  get "password-reset" => "static#show", id: "password_reset"
-  get "faq" => "static#show", id: "faq"
-  get "guidelines" => "static#show", id: "guidelines", as: 'guidelines'
-  get "tos" => "static#show", id: "tos", as: 'tos'
-  get "privacy" => "static#show", id: "privacy", as: 'privacy'
-  get "signup" => "static#show", id: "signup"
-  get "login-preferences" => "static#show", id: "login"
+  post "login" => "static#enter", constraints: { format: /(json|html)/ }
+  get "login" => "static#show", id: "login", constraints: { format: /(json|html)/ }
+  get "password-reset" => "static#show", id: "password_reset", constraints: { format: /(json|html)/ }
+  get "faq" => "static#show", id: "faq", constraints: { format: /(json|html)/ }
+  get "guidelines" => "static#show", id: "guidelines", as: 'guidelines', constraints: { format: /(json|html)/ }
+  get "tos" => "static#show", id: "tos", as: 'tos', constraints: { format: /(json|html)/ }
+  get "privacy" => "static#show", id: "privacy", as: 'privacy', constraints: { format: /(json|html)/ }
+  get "signup" => "static#show", id: "signup", constraints: { format: /(json|html)/ }
+  get "login-preferences" => "static#show", id: "login", constraints: { format: /(json|html)/ }
 
   get "users/admin-login" => "users#admin_login"
   put "users/admin-login" => "users#admin_login"
@@ -347,13 +348,17 @@ Discourse::Application.routes.draw do
   # used to download attachments (old route)
   get "uploads/:site/:id/:sha" => "uploads#show", constraints: { site: /\w+/, id: /\d+/, sha: /[a-f0-9]{16}/ }
 
-  get "posts" => "posts#latest"
+  get "posts" => "posts#latest", id: "latest_posts"
+  get "private-posts" => "posts#latest", id: "private_posts"
   get "posts/by_number/:topic_id/:post_number" => "posts#by_number"
   get "posts/:id/reply-history" => "posts#reply_history"
   get "posts/:username/deleted" => "posts#deleted_posts", constraints: {username: USERNAME_ROUTE_FORMAT}
   get "posts/:username/flagged" => "posts#flagged_posts", constraints: {username: USERNAME_ROUTE_FORMAT}
 
   resources :groups do
+    get "posts.rss" => "groups#posts_feed", format: :rss
+    get "mentions.rss" => "groups#mentions_feed", format: :rss
+
     get 'members'
     get 'posts'
     get 'topics'
diff --git a/config/site_settings.yml b/config/site_settings.yml
index b4c4da72b9..3a4bc825fc 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -108,7 +108,7 @@ basic:
   post_menu:
     client: true
     type: list
-    default: 'like-count|like|share|flag|edit|bookmark|wiki|delete|admin|reply'
+    default: 'like-count|like|share|flag|edit|bookmark|delete|admin|reply'
     choices:
      - like-count
      - like
@@ -119,11 +119,10 @@ basic:
      - bookmark
      - admin
      - reply
-     - wiki
   post_menu_hidden_items:
     client: true
     type: list
-    default: 'bookmark|edit|wiki|delete|admin'
+    default: 'bookmark|edit|delete|admin'
     choices:
      - like
      - edit
@@ -133,7 +132,6 @@ basic:
      - bookmark
      - admin
      - reply
-     - wiki
   share_links:
     client: true
     type: list
@@ -514,6 +512,9 @@ email:
   digest_min_excerpt_length: 100
   digest_topics: 20
   delete_digest_email_after_days: 365
+  digest_suppress_categories:
+    type: category_list
+    default: ''
   disable_digest_emails:
     default: false
     client: true
@@ -559,6 +560,8 @@ email:
   delete_email_logs_after_days:
     default: 365
     min: 0
+  max_emails_per_day_per_user: 100
+  enable_staged_users: true
 
 files:
   max_image_size_kb: 3072
@@ -1085,6 +1088,7 @@ user_preferences:
   default_email_digest_frequency:
     enum: 'DigestEmailSiteSetting'
     default: 10080
+  default_include_tl0_in_digests: false
   default_email_private_messages: true
   default_email_direct: true
   default_email_mailing_list_mode: false
diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb
index c8c30236e4..bb2e9fba0f 100644
--- a/db/fixtures/006_badges.rb
+++ b/db/fixtures/006_badges.rb
@@ -134,7 +134,8 @@ Badge.seed do |b|
   b.target_posts = true
   b.show_posts = false
   b.query = Badge::Queries::FirstFlag
-  b.default_badge_grouping_id = BadgeGrouping::Community
+  b.badge_grouping_id = BadgeGrouping::GettingStarted
+  b.default_badge_grouping_id = BadgeGrouping::GettingStarted
   b.trigger = Badge::Trigger::PostAction
   b.auto_revoke = false
   b.system = true
@@ -228,7 +229,8 @@ Badge.seed do |b|
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.query = Badge::Queries::Editor
-  b.default_badge_grouping_id = BadgeGrouping::Community
+  b.badge_grouping_id = BadgeGrouping::GettingStarted
+  b.default_badge_grouping_id = BadgeGrouping::GettingStarted
   b.trigger = Badge::Trigger::PostRevision
   b.system = true
 end
@@ -285,7 +287,8 @@ end
     b.target_posts = true
     b.show_posts = true
     b.query = Badge::Queries.linking_badge(count)
-    b.default_badge_grouping_id = BadgeGrouping::Community
+    b.badge_grouping_id = BadgeGrouping::Posting
+    b.default_badge_grouping_id = BadgeGrouping::Posting
     # don't trigger for now, its too expensive
     b.trigger = Badge::Trigger::None
     b.system = true
@@ -314,9 +317,9 @@ end
 
 
 [
-  [Badge::ThankYou,   "Thank You",  BadgeType::Bronze, 20, 0.00],
-  [Badge::GivesBack,  "Gives Back", BadgeType::Silver, 100, 1.0],
-  [Badge::Empathetic, "Empathetic", BadgeType::Gold,   500, 2.0],
+  [Badge::ThankYou,   "Thank You",  BadgeType::Bronze, 20, 10],
+  [Badge::GivesBack,  "Gives Back", BadgeType::Silver, 100, 100],
+  [Badge::Empathetic, "Empathetic", BadgeType::Gold,   500, 1000]
 ].each do |spec|
   id, name, level, count, ratio = spec
   Badge.seed do |b|
diff --git a/db/migrate/20160317174357_create_given_daily_likes.rb b/db/migrate/20160317174357_create_given_daily_likes.rb
new file mode 100644
index 0000000000..42cf767b95
--- /dev/null
+++ b/db/migrate/20160317174357_create_given_daily_likes.rb
@@ -0,0 +1,34 @@
+class CreateGivenDailyLikes < ActiveRecord::Migration
+  def up
+    create_table :given_daily_likes, id: false, force: true do |t|
+      t.integer :user_id, null: false
+      t.integer :likes_given, null: false
+      t.date    :given_date, null: false
+      t.boolean :limit_reached, null: false, default: false
+    end
+    add_index :given_daily_likes, [:user_id, :given_date], unique: true
+    add_index :given_daily_likes, [:limit_reached, :user_id]
+
+    max_likes_rows = execute("SELECT value FROM site_settings WHERE name = 'max_likes_per_day'")
+    if max_likes_rows && max_likes_rows.cmd_tuples > 0
+      max_likes = max_likes_rows[0]['value'].to_i
+    end
+    max_likes ||= 50
+
+    execute "INSERT INTO given_daily_likes (user_id, likes_given, limit_reached, given_date)
+             SELECT pa.user_id,
+                    COUNT(*),
+                    CASE WHEN COUNT(*) >= #{max_likes} THEN true
+                    ELSE false
+                    END,
+                    pa.created_at::date
+             FROM post_actions AS pa
+             WHERE pa.post_action_type_id = 2
+               AND pa.deleted_at IS NULL
+             GROUP BY pa.user_id, pa.created_at::date"
+  end
+
+  def down
+    drop_table :given_daily_likes
+  end
+end
diff --git a/db/migrate/20160317201955_add_include_tl0_in_digests_to_user_options.rb b/db/migrate/20160317201955_add_include_tl0_in_digests_to_user_options.rb
new file mode 100644
index 0000000000..512f5d6df5
--- /dev/null
+++ b/db/migrate/20160317201955_add_include_tl0_in_digests_to_user_options.rb
@@ -0,0 +1,5 @@
+class AddIncludeTl0InDigestsToUserOptions < ActiveRecord::Migration
+  def change
+    add_column :user_options, :include_tl0_in_digests, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20160329101122_remove_wiki_color.rb b/db/migrate/20160329101122_remove_wiki_color.rb
new file mode 100644
index 0000000000..4b6007ceae
--- /dev/null
+++ b/db/migrate/20160329101122_remove_wiki_color.rb
@@ -0,0 +1,8 @@
+class RemoveWikiColor < ActiveRecord::Migration
+  def up
+    execute "DELETE FROM color_scheme_colors WHERE name = 'wiki'"
+  end
+
+  def down
+  end
+end
diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index 4288d3fdd4..c8e893345a 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -9,7 +9,7 @@ Note: If you are developing on a Mac, you will probably want to look at [these i
 1. Install and configure PostgreSQL 9.3+.
   1. Run `postgres -V` to see if you already have it.
   1. Make sure that the server's messages language is English; this is [required](https://github.com/rails/rails/blob/3006c59bc7a50c925f6b744447f1d94533a64241/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L1140) by the ActiveRecord Postgres adapter.
-2. Install and configure Redis 2+.
+2. Install and configure Redis 2.8.12+.
   1. Run `redis-server -v` to see if you already have it.
 3. Install ImageMagick
 4. Install libxml2, libpq-dev, g++, gifsicle, libjpeg-progs and make.
diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md
index db40eea4e3..ee499ad470 100644
--- a/docs/INSTALL-email.md
+++ b/docs/INSTALL-email.md
@@ -26,9 +26,10 @@ If not using **the exact** domain you verified (e.g. you're using a subdomain of
 ```yml
 DISCOURSE_SMTP_ADDRESS: smtp.sendgrid.net
 DISCOURSE_SMTP_PORT: 587
-DISCOURSE_SMTP_USER_NAME: [SendGrid username]
-DISCOURSE_SMTP_PASSWORD: [SendGrid password]
+DISCOURSE_SMTP_USER_NAME: apikey
+DISCOURSE_SMTP_PASSWORD: [SendGrid API Key]
 ```
+We recommend creating an [API Key][sg2] instead of using your SendGrid username and password.
 
 #### [Mailgun][gun] (10k emails/month)
 
@@ -49,3 +50,4 @@ Go to [My Account page](https://www.mailjet.com/account) and click on the ["SMTP
   [jet]: https://www.mailjet.com/pricing
   [gun]: http://www.mailgun.com/
    [sg]: https://sendgrid.com/
+  [sg2]: https://sendgrid.com/docs/Classroom/Send/How_Emails_Are_Sent/api_keys.html
diff --git a/docs/VAGRANT.md b/docs/VAGRANT.md
index b22a77cc30..865eaab8b1 100644
--- a/docs/VAGRANT.md
+++ b/docs/VAGRANT.md
@@ -94,7 +94,7 @@ In a few seconds, rails will start serving pages. To access them, open a web bro
 
 If you want to log in as a user, a shortcut you can use in development mode is to follow this link to log in as `eviltrout`:
 
-http://localhost:4000/session/eviltrout/become
+[http://localhost:4000/session/eviltrout/become](http://localhost:4000/session/eviltrout/become)
 
 You can now edit files on your local file system, using your favorite text editor or IDE. When you reload your web browser, it should have the latest changes.
 
diff --git a/lib/category_badge.rb b/lib/category_badge.rb
index 3175372d9c..196d17691a 100644
--- a/lib/category_badge.rb
+++ b/lib/category_badge.rb
@@ -50,7 +50,7 @@ module CategoryBadge
       case (SiteSetting.category_style || :box).to_sym
       when :bar then inline_category_stripe(category.color, 'display: inline-block; padding: 1px;', true)
       when :box then inline_category_stripe(category.color, 'left: 5px; display: block; position: absolute; width: calc(100% - 5px); height: 100%;')
-      when :bullet then inline_category_stripe(category.color, "display: inline-block; width: #{category.parent_category_id.nil? ? 10 : 5}px; height: 10px;", true)
+      when :bullet then inline_category_stripe(category.color, "display: inline-block; width: #{category.parent_category_id.nil? ? 10 : 5}px; height: 10px;")
       end
     else
       category_stripe(category.color, 'badge-category-bg')
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 4bb3cd156d..8f865d9ac9 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -75,6 +75,9 @@ class DiscourseRedis
     end
 
     def resolve
+
+      return @options unless @slave_options[:host]
+
       begin
         options = @options.dup
         options.delete(:connector)
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 5c16c7e091..2211541e1c 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -10,6 +10,7 @@ module Email
 
     class ProcessingError             < StandardError; end
     class EmptyEmailError             < ProcessingError; end
+    class UserNotFoundError           < ProcessingError; end
     class AutoGeneratedEmailError     < ProcessingError; end
     class NoBodyDetectedError         < ProcessingError; end
     class InactiveUserError           < ProcessingError; end
@@ -53,6 +54,9 @@ module Email
 
     def process_internal
       user = find_or_create_user(@from_email, @from_display_name)
+
+      raise UserNotFoundError if user.nil?
+
       @incoming_email.update_columns(user_id: user.id)
 
       body, @elided = select_body
@@ -195,13 +199,23 @@ module Email
     end
 
     def find_or_create_user(email, display_name)
-      username = UserNameSuggester.sanitize_username(display_name) if display_name.present?
+      user = nil
 
-      User.find_or_create_by(email: email) do |user|
-        user.username = UserNameSuggester.suggest(username.presence || email)
-        user.name = display_name.presence || User.suggest_name(email)
-        user.staged = true
+      User.transaction do
+        user = User.find_by_email(email)
+
+        if user.nil? && SiteSetting.enable_staged_users
+          username = UserNameSuggester.sanitize_username(display_name) if display_name.present?
+          user = User.create(
+            email: email,
+            username: UserNameSuggester.suggest(username.presence || email),
+            name: display_name.presence || User.suggest_name(email),
+            staged: true
+          )
+        end
       end
+
+      user
     end
 
     def destinations
@@ -382,7 +396,7 @@ module Email
               display_name = address_field.display_name.try(:to_s)
               if should_invite?(email)
                 user = find_or_create_user(email, display_name)
-                if can_invite?(topic, user)
+                if user && can_invite?(topic, user)
                   topic.topic_allowed_users.create!(user_id: user.id)
                   topic.add_small_action(sender, "invited_user", user.username)
                 end
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index 71c57f05c8..1bda27bb27 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -26,7 +26,11 @@ class EmailUpdater
     email = Email.downcase(email_input.strip)
     EmailValidator.new(attributes: :email).validate_each(self, :email, email)
 
-    errors.add(:base, I18n.t('change_email.error')) if User.find_by_email(email)
+    if existing_user = User.find_by_email(email)
+      error_message = 'change_email.error'
+      error_message << '_staged' if existing_user.staged?
+      errors.add(:base, I18n.t(error_message))
+    end
 
     if errors.blank?
       args = {
diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
index d54524fe68..b0d6f1b917 100644
--- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
+++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
@@ -94,6 +94,14 @@ module Tilt
       @@whitelisted.include?(path) || path =~ /discourse\/mixins/
     end
 
+    def babel_transpile(source)
+      klass = self.class
+      klass.protect do
+        klass.v8['console'] = Console.new("BABEL: babel-eval: ")
+        @output = klass.v8.eval(babel_source(source))
+      end
+    end
+
     def evaluate(scope, locals, &block)
       return @output if @output
 
@@ -139,11 +147,15 @@ module Tilt
       @output
     end
 
+    def babel_source(source)
+      js_source = ::JSON.generate(source, quirks_mode: true)
+      "babel.transform(#{js_source}, {ast: false, whitelist: ['es6.constants', 'es6.properties.shorthand', 'es6.arrowFunctions', 'es6.blockScoping', 'es6.destructuring', 'es6.spread', 'es6.parameters', 'es6.templateLiterals', 'es6.regex.unicode', 'es7.decorators', 'es6.classes']})['code']"
+    end
+
     private
 
     def generate_source(scope)
-      js_source = ::JSON.generate(data, quirks_mode: true)
-      js_source = "babel.transform(#{js_source}, {ast: false, whitelist: ['es6.constants', 'es6.properties.shorthand', 'es6.arrowFunctions', 'es6.blockScoping', 'es6.destructuring', 'es6.spread', 'es6.parameters', 'es6.templateLiterals', 'es6.regex.unicode', 'es7.decorators', 'es6.classes']})['code']"
+      js_source = babel_source(data)
       "new module.exports.Compiler(#{js_source}, '#{module_name(scope.root_path, scope.logical_path)}', #{compiler_options}).#{compiler_method}()"
     end
 
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index 015833bba8..ecf966a5fd 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -6,7 +6,7 @@ class FileHelper
     filename =~ images_regexp
   end
 
-  def self.download(url, max_file_size, tmp_file_name, follow_redirect=false)
+  def self.download(url, max_file_size, tmp_file_name, follow_redirect=false, read_timeout=5)
     raise Discourse::InvalidParameters.new(:url) unless url =~ /^https?:\/\//
 
     uri = parse_url(url)
@@ -14,7 +14,7 @@ class FileHelper
     tmp = Tempfile.new([tmp_file_name, extension])
 
     File.open(tmp.path, "wb") do |f|
-      downloaded = uri.open("rb", read_timeout: 5, redirect: follow_redirect, allow_redirections: :all)
+      downloaded = uri.open("rb", read_timeout: read_timeout, redirect: follow_redirect, allow_redirections: :all)
       while f.size <= max_file_size && data = downloaded.read(512.kilobytes)
         f.write(data)
       end
diff --git a/lib/mobile_detection.rb b/lib/mobile_detection.rb
index 9dc0e17995..a9e2702de1 100644
--- a/lib/mobile_detection.rb
+++ b/lib/mobile_detection.rb
@@ -1,6 +1,6 @@
 module MobileDetection
   def self.mobile_device?(user_agent)
-    user_agent =~ /Mobile|Android|webOS/ && !(user_agent =~ /iPad|Nexus (9|10)/)
+    user_agent =~ /Mobile/ && !(user_agent =~ /iPad/)
   end
 
   # we need this as a reusable chunk that is called from the cache
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index 923315d915..f354a277ad 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -82,14 +82,11 @@ class NewPostManager
 
       result = manager.enqueue('default')
 
-      block = is_fast_typer?(manager)
-
-      block ||= matches_auto_block_regex?(manager)
-
-      manager.user.update_columns(blocked: true) if block
+      if is_fast_typer?(manager) || matches_auto_block_regex?(manager)
+        UserBlocker.block(manager.user, Discourse.system_user, keep_posts: true)
+      end
 
       result
-
     end
   end
 
diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb
index df678960d7..0985db9116 100644
--- a/lib/rate_limiter.rb
+++ b/lib/rate_limiter.rb
@@ -67,6 +67,15 @@ class RateLimiter
     $redis.lpop(@key)
   end
 
+  def remaining
+    return @max if @user && @user.staff?
+
+    arr = $redis.lrange(@key, 0, @max) || []
+    t0 = Time.now.to_i
+    arr.reject! {|a| (t0 - a.to_i) > @secs}
+    @max - arr.size
+  end
+
   private
 
   def seconds_to_wait
diff --git a/lib/search.rb b/lib/search.rb
index fb8b989a41..5bfd9d4e2e 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -219,6 +219,18 @@ class Search
     posts.where("posts.post_number = 1")
   end
 
+  advanced_filter(/in:pinned/) do |posts|
+    posts.where("topics.pinned_at IS NOT NULL")
+  end
+
+  advanced_filter(/in:unpinned/) do |posts|
+    if @guardian.user
+      posts.where("topics.pinned_at IS NOT NULL AND topics.id IN (
+                  SELECT topic_id FROM topic_users WHERE user_id = ? AND cleared_pinned_at IS NOT NULL
+                 )", @guardian.user.id)
+    end
+  end
+
   advanced_filter(/badge:(.*)/) do |posts,match|
     badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first
     if badge_id
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 387696c300..2fa450bb74 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -25,6 +25,14 @@ class Search
       @users = []
     end
 
+    def find_user_data(guardian)
+      if user = guardian.user
+        topics = @posts.map(&:topic)
+        topic_lookup = TopicUser.lookup_for(user, topics)
+        topics.each { |ft| ft.user_data = topic_lookup[ft.id] }
+      end
+    end
+
     def blurb(post)
       GroupedSearchResults.blurb_for(post.cooked, @term, @blurb_length)
     end
diff --git a/lib/version.rb b/lib/version.rb
index 1ff19323bd..407ea4e310 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 5
       TINY  = 0
-      PRE   = 'beta13b'
+      PRE   = 'beta14'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6
index 576bf7433c..dc5e549a39 100644
--- a/plugins/poll/assets/javascripts/controllers/poll.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6
@@ -8,12 +8,12 @@ export default Ember.Controller.extend({
 
   // shows the results when
   //   - poll is closed
-  //   - topic is archived/closed
+  //   - topic is archived
   //   - user wants to see the results
-  showingResults: Em.computed.or("isClosed", "post.topic.closed", "post.topic.archived", "showResults"),
+  showingResults: Em.computed.or("isClosed", "post.topic.archived", "showResults"),
 
   showResultsDisabled: Em.computed.equal("poll.voters", 0),
-  hideResultsDisabled: Em.computed.or("isClosed", "post.topic.closed", "post.topic.archived"),
+  hideResultsDisabled: Em.computed.or("isClosed", "post.topic.archived"),
 
   @computed("model", "vote", "model.voters", "model.options", "model.status")
   poll(poll, vote) {
@@ -100,12 +100,11 @@ export default Ember.Controller.extend({
 
   castVotesDisabled: Em.computed.not("canCastVotes"),
 
-  @computed("loading", "post.user_id", "post.topic.closed", "post.topic.archived")
-  canToggleStatus(loading, userId, topicClosed, topicArchived) {
+  @computed("loading", "post.user_id", "post.topic.archived")
+  canToggleStatus(loading, userId, topicArchived) {
     return this.currentUser &&
            (this.currentUser.get("id") === userId || this.currentUser.get("staff")) &&
            !loading &&
-           !topicClosed &&
            !topicArchived;
   },
 
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index c27957849d..68fe20140e 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -67,6 +67,7 @@ function initializePolls(api) {
     if (!$polls.length) { return; }
 
     const post = helper.getModel();
+    api.preventCloak(post.id);
     const votes = post.get('polls_votes') || {};
 
     post.pollsChanged();
@@ -82,11 +83,12 @@ function initializePolls(api) {
       const $poll = $(pollElem);
 
       const pollName = $poll.data("poll-name");
+      const pollId = `${pollName}-${post.id}`;
       const pollView = createPollView(helper.container, post, polls[pollName], votes[pollName]);
 
       $poll.replaceWith($div);
       Em.run.next(() => pollView.renderer.replaceIn(pollView, $div[0]));
-      postPollViews[pollName] = pollView;
+      postPollViews[pollId] = pollView;
     });
 
     _pollViews = postPollViews;
diff --git a/plugins/poll/config/locales/client.gl.yml b/plugins/poll/config/locales/client.gl.yml
new file mode 100644
index 0000000000..3cdfb4b000
--- /dev/null
+++ b/plugins/poll/config/locales/client.gl.yml
@@ -0,0 +1,48 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl:
+  js:
+    poll:
+      voters:
+        one: "votante"
+        other: "votantes"
+      total_votes:
+        one: "votos totais"
+        other: "votos totais"
+      average_rating: "Valoración media: <strong>%{average}</strong>."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Debes seleccionar cando menos <strong>1</strong> opción."
+            other: "Debes seleccionar cando menos <strong>%{count}</strong> opcións."
+          up_to_max_options:
+            one: "Podes escoller <strong>1</strong> única opción."
+            other: "Podes escoller até <strong>%{count}</strong> opcións."
+          x_options:
+            one: "Debes escoller <strong>1</strong> opción."
+            other: "Debes escoller <strong>%{count}</strong> opcións."
+          between_min_and_max_options: "Debes escoller entre <strong>%{min}</strong> e <strong>%{max}</strong> opcións."
+      cast-votes:
+        title: "Vota"
+        label: "Vota agora!"
+      show-results:
+        title: "Mostrar os resultados da votación"
+        label: "Mostrar os resultados"
+      hide-results:
+        title: "Volver aos teus votos"
+        label: "Ocultar os resultados"
+      open:
+        title: "Abrir a enquisa"
+        label: "Abrir"
+        confirm: "Confirmas a apertura da enquisa?"
+      close:
+        title: "Pechar a enquisa"
+        label: "Pechar"
+        confirm: "Confirmas o peche desta enquisa?"
+      error_while_toggling_status: "Produciuse un erro durante o cambio do estado da enquisa."
+      error_while_casting_votes: "Produciuse un erro durante a emisión do teu voto."
diff --git a/plugins/poll/config/locales/server.gl.yml b/plugins/poll/config/locales/server.gl.yml
new file mode 100644
index 0000000000..161239af6b
--- /dev/null
+++ b/plugins/poll/config/locales/server.gl.yml
@@ -0,0 +1,39 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl:
+  site_settings:
+    poll_enabled: "Queres permitir os usuarios crear enquisas?"
+    poll_maximum_options: "Número máximo de opcións permitidas nunha enquisa."
+  poll:
+    multiple_polls_without_name: "Hai múltiples enquisas sen nome. Utiliza o atributo '<code>nome</code>' para singularizar as túas enquisas."
+    multiple_polls_with_same_name: "Hai múltiples enquisas co mesmo nome: <strong>%{name}</strong>. Utiliza o atributo '<code>nome</code>' para singularizar as túas enquisas."
+    default_poll_must_have_at_least_2_options: "A enquisa debe ter alomenos 2 opcións."
+    named_poll_must_have_at_least_2_options: "A enquisa chamada <strong>%{name}</strong> debe ter alomenos 2 opcións."
+    default_poll_must_have_less_options:
+      one: "A enquisa debe ter cando menos 1 opción."
+      other: "A enquisa debe ter alomenos %{count} opcións."
+    named_poll_must_have_less_options:
+      one: "A enquisa chamada <strong>%{name}</strong> debe ter menos de 1 opción."
+      other: "A enquisa chamada <strong>%{name}</strong> debe ter menos de %{count} opcións."
+    default_poll_must_have_different_options: "A enquisa debe ter diferentes opcións."
+    named_poll_must_have_different_options: "A enquisa chamada strong>%{name}</strong> debe ter diferentes opcións."
+    default_poll_with_multiple_choices_has_invalid_parameters: "A enquisa con varios apartados ten parámetros incorrectos."
+    named_poll_with_multiple_choices_has_invalid_parameters: "A enquisa chamada <strong>%{name}</strong> con varios apartados ten parámetros incorrectos."
+    requires_at_least_1_valid_option: "Debes seleccionar alomenos 1 opción válida."
+    cannot_change_polls_after_5_minutes: "Non podes engadir, retirar ou renomear enquisas despois dos primeiros 5 minutos."
+    op_cannot_edit_options_after_5_minutes: "Non podes engadir nin retirar opcións da enquisa despois de 5 minutos. Contacta cun moderador se precisas editar unha opción da enquisa."
+    staff_cannot_add_or_remove_options_after_5_minutes: "Non podes engadir nin retirar opcións da enquisa despois de 5 minutos. Deberías pechar este tema e crear outro novo para substituílo."
+    no_polls_associated_with_this_post: "Non hai enquisas asociadas con esta publicación."
+    no_poll_with_this_name: "Non hai ningunha enquisa chamada <strong>%{name}</strong> asociada con esta publicación."
+    post_is_deleted: "Non se pode actuar sobre unha publicación eliminada."
+    topic_must_be_open_to_vote: "O tema debe estar aberto para votalo."
+    poll_must_be_open_to_vote: "A enquisa debe estar aberta para votala."
+    topic_must_be_open_to_toggle_status: "O tema debe estar aberto para cambiarlle o estado."
+    only_staff_or_op_can_toggle_status: "Soamente un membro do equipo ou o publicador orixinal poden trocar o estado dunha enquisa."
+    email:
+      link_to_poll: "Preme para ver a enquisa."
diff --git a/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb b/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb
new file mode 100644
index 0000000000..5ca969c68d
--- /dev/null
+++ b/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb
@@ -0,0 +1,18 @@
+class ClosePollsInClosedTopics < ActiveRecord::Migration
+
+  def up
+    PostCustomField.joins(post: :topic)
+                   .where("post_custom_fields.name = 'polls'")
+                   .where("topics.closed")
+                   .find_each do |pcf|
+      polls = ::JSON.parse(pcf.value || "{}")
+      polls.values.each { |poll| poll["status"] = "closed" }
+      pcf.value = polls.to_json
+      pcf.save
+    end
+  end
+
+  def down
+  end
+
+end
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index d68603ef44..7d9834e19d 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -54,8 +54,8 @@ after_initialize do
             raise StandardError.new I18n.t("poll.post_is_deleted")
           end
 
-          # topic must be open
-          if post.topic.try(:closed) || post.topic.try(:archived)
+          # topic must not be archived
+          if post.topic.try(:archived)
             raise StandardError.new I18n.t("poll.topic_must_be_open_to_vote")
           end
 
@@ -107,8 +107,8 @@ after_initialize do
             raise StandardError.new I18n.t("poll.post_is_deleted")
           end
 
-          # topic must be open
-          if post.topic.try(:closed) || post.topic.try(:archived)
+          # topic must not be archived
+          if post.topic.try(:archived)
             raise StandardError.new I18n.t("poll.topic_must_be_open_to_toggle_status")
           end
 
diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index bb45816f0d..b1679d7d6e 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -41,12 +41,10 @@ describe ::DiscoursePoll::PollsController do
       expect(json["poll"]["options"][1]["votes"]).to eq(1)
     end
 
-    it "ensures topic is not closed" do
+    it "works even if topic is closed" do
       topic.update_attribute(:closed, true)
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["A"] }
-      expect(response).not_to be_success
-      json = ::JSON.parse(response.body)
-      expect(json["errors"][0]).to eq(I18n.t("poll.topic_must_be_open_to_vote"))
+      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
+      expect(response).to be_success
     end
 
     it "ensures topic is not archived" do
diff --git a/public/403.gl.html b/public/403.gl.html
new file mode 100644
index 0000000000..4a2ac9508d
--- /dev/null
+++ b/public/403.gl.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+<title>Non podes facer iso (403)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>Non podes ver este recurso.</p>
+
+    <p>Substituirase pola páxina 403 personalizada de Discourse.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.gl.html b/public/422.gl.html
new file mode 100644
index 0000000000..98d3a1b87c
--- /dev/null
+++ b/public/422.gl.html
@@ -0,0 +1,25 @@
+<html>
+<head>
+<title>Rexeitouse o cambio pretendido (422)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>Rexeitouse o cambio pretendido.</h1>
+    <p>Se cadra tentaches cambiar algo ao que non tes acceso.</p>
+  </div>
+</body>
+</html>
diff --git a/public/500.gl.html b/public/500.gl.html
new file mode 100644
index 0000000000..998201529d
--- /dev/null
+++ b/public/500.gl.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+<title>Vaites - Erro 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Vaites!</h1>
+    <p>O software con que funciona este foro de discusión atopou un problema inesperado. Sentimos as molestias.</p>
+    <p>Rexistrouse información detallada do erro e xerouse unha notificación automática. Revisarémolo.</p>
+    <p>Non é precisa ningunha outra medida. Con todo, se persisten as condicións do erro, podes subministrar información adicional, incluíndo os pasos para reproducilo, publicando un tema de discusión na <a href="/category/meta">metacategoría</a>.</p>
+</body>
+</html>
diff --git a/public/503.gl.html b/public/503.gl.html
new file mode 100644
index 0000000000..7ffae6239a
--- /dev/null
+++ b/public/503.gl.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<title>Este sitio está en mantemento - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Estamos realizando tarefas planificadas de mantemento</h1>
+    <p>Por favor, téntao <span id="when-to-check-back">dentro duns minutos</span>.</p>
+    <p id="apology">Sentimos as molestias.</p>
+</body>
+</html>
diff --git a/public/503.ro.html b/public/503.ro.html
index e1ecd7c1bb..2752fc234e 100644
--- a/public/503.ro.html
+++ b/public/503.ro.html
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Momentan suntem indisponibili pentru o mentenanţă a site-ului planificată</h1>
+    <h1>Momentan suntem indisponibili pentru o mentenanţă planificată a site-ului</h1>
     <p>Te rog verifică din nou <span id="when-to-check-back">în câteva minute</span>.</p>
     <p id="apology">Ne cerem scuze pentru inconvenienţă!</p>
 </body>
diff --git a/spec/components/concern/category_hashtag_spec.rb b/spec/components/concern/category_hashtag_spec.rb
index be60931f79..c57ac89163 100644
--- a/spec/components/concern/category_hashtag_spec.rb
+++ b/spec/components/concern/category_hashtag_spec.rb
@@ -22,5 +22,13 @@ describe CategoryHashtag do
     it "should return nil for incorrect parent and child category slug" do
       expect(Category.query_from_hashtag_slug("random-slug#{CategoryHashtag::SEPARATOR}random-slug")).to eq(nil)
     end
+
+    it "should be case sensitive" do
+      parent_category.update_attributes!(slug: "ApPlE")
+      child_category.update_attributes!(slug: "OraNGE")
+
+      expect(Category.query_from_hashtag_slug("apple")).to eq(nil)
+      expect(Category.query_from_hashtag_slug("apple:orange")).to eq(nil)
+    end
   end
 end
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index 0dce786dc5..01afbb6f89 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -21,6 +21,11 @@ describe Email::Receiver do
     expect { Email::Receiver.new("") }.to raise_error(Email::Receiver::EmptyEmailError)
   end
 
+  it "raises and UserNotFoundError when staged users are disabled" do
+    SiteSetting.enable_staged_users = false
+    expect { process(:user_not_found) }.to raise_error(Email::Receiver::UserNotFoundError)
+  end
+
   it "raises an AutoGeneratedEmailError when the mail is auto generated" do
     expect { process(:auto_generated_precedence) }.to raise_error(Email::Receiver::AutoGeneratedEmailError)
     expect { process(:auto_generated_header) }.to raise_error(Email::Receiver::AutoGeneratedEmailError)
diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb
index b868e6c9a5..74ec89e2f2 100644
--- a/spec/components/email_updater_spec.rb
+++ b/spec/components/email_updater_spec.rb
@@ -5,6 +5,17 @@ describe EmailUpdater do
   let(:old_email) { 'old.email@example.com' }
   let(:new_email) { 'new.email@example.com' }
 
+  it "provides better error message when a staged user has the same email" do
+    Fabricate(:user, staged: true, email: new_email)
+
+    user = Fabricate(:user, email: old_email)
+    updater = EmailUpdater.new(user.guardian, user)
+    updater.change_to(new_email)
+
+    expect(updater.errors).to be_present
+    expect(updater.errors.messages[:base].first).to be I18n.t("change_email.error_staged")
+  end
+
   context 'as a regular user' do
     let(:user) { Fabricate(:user, email: old_email) }
     let(:updater) { EmailUpdater.new(user.guardian, user) }
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 59dd7bdc21..8f5ef5ae10 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -202,6 +202,14 @@ describe Guardian do
       it "returns false if target is not staff" do
         expect(Guardian.new(user).can_send_private_message?(another_user)).to be_falsey
       end
+
+      it "returns true if target is a staff group" do
+        Group::STAFF_GROUPS.each do |name|
+          g = Group[name]
+          g.alias_level = Group::ALIAS_LEVELS[:everyone]
+          expect(Guardian.new(user).can_send_private_message?(g)).to be_truthy
+        end
+      end
     end
   end
 
diff --git a/spec/components/rate_limiter_spec.rb b/spec/components/rate_limiter_spec.rb
index e997db7c68..1cf43b11c9 100644
--- a/spec/components/rate_limiter_spec.rb
+++ b/spec/components/rate_limiter_spec.rb
@@ -39,6 +39,16 @@ describe RateLimiter do
       end
     end
 
+    context "remaining" do
+      it "updates correctly" do
+        expect(rate_limiter.remaining).to eq(2)
+        rate_limiter.performed!
+        expect(rate_limiter.remaining).to eq(1)
+        rate_limiter.performed!
+        expect(rate_limiter.remaining).to eq(0)
+      end
+    end
+
     context "multiple calls" do
       before do
         rate_limiter.performed!
@@ -47,6 +57,7 @@ describe RateLimiter do
 
       it "returns false for can_perform when the limit has been hit" do
         expect(rate_limiter.can_perform?).to eq(false)
+        expect(rate_limiter.remaining).to eq(0)
       end
 
       it "raises an error the third time called" do
@@ -54,10 +65,10 @@ describe RateLimiter do
       end
 
       context "as an admin/moderator" do
-
         it "returns true for can_perform if the user is an admin" do
           user.admin = true
           expect(rate_limiter.can_perform?).to eq(true)
+          expect(rate_limiter.remaining).to eq(2)
         end
 
         it "doesn't raise an error when an admin performs the task" do
@@ -74,8 +85,6 @@ describe RateLimiter do
           user.moderator = true
           expect { rate_limiter.performed! }.not_to raise_error
         end
-
-
       end
 
       context "rollback!" do
@@ -90,7 +99,6 @@ describe RateLimiter do
         it "raises no error now that there is room" do
           expect { rate_limiter.performed! }.not_to raise_error
         end
-
       end
 
     end
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 42a4f1866d..7a0e580643 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -408,6 +408,24 @@ describe Search do
 
   describe 'Advanced search' do
 
+    it 'supports pinned and unpinned' do
+      topic = Fabricate(:topic)
+      Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic)
+      _post = Fabricate(:post, raw: 'boom boom shake the room', topic: topic)
+
+      topic.update_pinned(true)
+
+      user = Fabricate(:user)
+      guardian = Guardian.new(user)
+
+      expect(Search.execute('boom in:pinned').posts.length).to eq(1)
+      expect(Search.execute('boom in:unpinned', guardian: guardian).posts.length).to eq(0)
+
+      topic.clear_pin_for(user)
+
+      expect(Search.execute('boom in:unpinned', guardian: guardian).posts.length).to eq(1)
+    end
+
     it 'supports before and after in:first user:' do
 
       time = Time.zone.parse('2001-05-20 2:55')
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index b3de180969..d49745940b 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -507,52 +507,66 @@ describe Admin::UsersController do
 
   end
 
-  it 'can sync up sso' do
-    log_in(:admin)
 
-    SiteSetting.enable_sso = true
-    SiteSetting.sso_overrides_email = true
-    SiteSetting.sso_overrides_name = true
-    SiteSetting.sso_overrides_username = true
+  context '#sync_sso' do
+    let(:sso) { SingleSignOn.new }
+    let(:sso_secret) { "sso secret" }
 
-    SiteSetting.sso_secret = "sso secret"
+    before do
+      log_in(:admin)
 
-    sso = SingleSignOn.new
-    sso.sso_secret = "sso secret"
-    sso.name = "Bob The Bob"
-    sso.username = "bob"
-    sso.email = "bob@bob.com"
-    sso.external_id = "1"
+      SiteSetting.enable_sso = true
+      SiteSetting.sso_overrides_email = true
+      SiteSetting.sso_overrides_name = true
+      SiteSetting.sso_overrides_username = true
+      SiteSetting.sso_secret = sso_secret
+      sso.sso_secret = sso_secret
+    end
 
-    user = DiscourseSingleSignOn.parse(sso.payload)
-                                .lookup_or_create_user
 
-    sso.name = "Bill"
-    sso.username = "Hokli$$!!"
-    sso.email = "bob2@bob.com"
+    it 'can sync up with the sso' do
+      sso.name = "Bob The Bob"
+      sso.username = "bob"
+      sso.email = "bob@bob.com"
+      sso.external_id = "1"
 
-    xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
-    expect(response).to be_success
+      user = DiscourseSingleSignOn.parse(sso.payload)
+                                  .lookup_or_create_user
 
-    user.reload
-    expect(user.email).to eq("bob2@bob.com")
-    expect(user.name).to eq("Bill")
-    expect(user.username).to eq("Hokli")
+      sso.name = "Bill"
+      sso.username = "Hokli$$!!"
+      sso.email = "bob2@bob.com"
 
-    # It can also create new users
-    sso = SingleSignOn.new
-    sso.sso_secret = "sso secret"
-    sso.name = "Dr. Claw"
-    sso.username = "dr_claw"
-    sso.email = "dr@claw.com"
-    sso.external_id = "2"
-    xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
-    expect(response).to be_success
+      xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
+      expect(response).to be_success
 
-    user = User.where(email: 'dr@claw.com').first
-    expect(user).to be_present
-    expect(user.ip_address).to be_blank
+      user.reload
+      expect(user.email).to eq("bob2@bob.com")
+      expect(user.name).to eq("Bill")
+      expect(user.username).to eq("Hokli")
+    end
 
+    it 'should create new users' do
+      sso.name = "Dr. Claw"
+      sso.username = "dr_claw"
+      sso.email = "dr@claw.com"
+      sso.external_id = "2"
+      xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
+      expect(response).to be_success
+
+      user = User.where(email: 'dr@claw.com').first
+      expect(user).to be_present
+      expect(user.ip_address).to be_blank
+    end
+
+    it 'should return the right message if the record is invalid' do
+      sso.email = ""
+      sso.name = ""
+      sso.external_id = "1"
+
+      xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
+      expect(response.status).to eq(403)
+      expect(JSON.parse(response.body)["message"]).to include("Email can't be blank")
+    end
   end
-
 end
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 8a42a6fe63..fded427a08 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -228,4 +228,20 @@ describe GroupsController do
 
   end
 
+  describe '.posts_feed' do
+    it 'renders RSS' do
+      get :posts_feed, group_id: group.name, format: :rss
+      expect(response).to be_success
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+  end
+
+  describe '.mentions_feed' do
+    it 'renders RSS' do
+      get :mentions_feed, group_id: group.name, format: :rss
+      expect(response).to be_success
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+  end
+
 end
diff --git a/spec/controllers/post_actions_controller_spec.rb b/spec/controllers/post_actions_controller_spec.rb
index 4a828893ab..ca822b832e 100644
--- a/spec/controllers/post_actions_controller_spec.rb
+++ b/spec/controllers/post_actions_controller_spec.rb
@@ -7,21 +7,6 @@ describe PostActionsController do
       expect { xhr :post, :create }.to raise_error(Discourse::NotLoggedIn)
     end
 
-    describe 'logged in as regular user' do
-      before do
-        @user = log_in(:user)
-        @post = Fabricate(:post, user: Fabricate(:coding_horror))
-      end
-
-      it 'creates user history if the rate limit for a like is hit' do
-        PostAction.expects(:act).once.raises(RateLimiter::LimitExceeded.new(60, 'create_like'))
-        expect(-> {
-          xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like]
-          puts response.success?
-        }).to change(UserHistory, :count).by(1)
-      end
-    end
-
     describe 'logged in as moderator' do
       before do
         @user = log_in(:moderator)
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index 67392c081c..635798e8d9 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -55,27 +55,56 @@ describe PostsController do
 
   describe 'latest' do
     let(:user) { log_in }
-    let!(:post) { Fabricate(:post, user: user) }
+    let!(:public_topic) { Fabricate(:topic) }
+    let!(:post) { Fabricate(:post, user: user, topic: public_topic) }
+    let!(:private_topic) { Fabricate(:topic, archetype: Archetype.private_message, category: nil) }
+    let!(:private_post) { Fabricate(:post, user: user, topic: private_topic) }
     let!(:topicless_post) { Fabricate(:post, user: user, raw: '<p>Car 54, where are you?</p>') }
 
-    before do
-      topicless_post.update topic_id: -100
+    context "public posts" do
+      before do
+        topicless_post.update topic_id: -100
+      end
+
+      it 'returns public posts with topic for json' do
+        xhr :get, :latest, id: "latest_posts", format: :json
+        expect(response).to be_success
+        json = ::JSON.parse(response.body)
+        post_ids = json['latest_posts'].map { |p| p['id'] }
+        expect(post_ids).to include post.id
+        expect(post_ids).to_not include private_post.id
+        expect(post_ids).to_not include topicless_post.id
+      end
+
+      it 'returns public posts with topic for rss' do
+        xhr :get, :latest, id: "latest_posts", format: :rss
+        expect(response).to be_success
+        expect(assigns(:posts)).to include post
+        expect(assigns(:posts)).to_not include private_post
+        expect(assigns(:posts)).to_not include topicless_post
+      end
     end
 
-    it 'does not return posts without a topic for json' do
-      xhr :get, :latest, format: :json
-      expect(response).to be_success
-      json = ::JSON.parse(response.body)
-      post_ids = json['latest_posts'].map { |p| p['id'] }
-      expect(post_ids).to include post.id
-      expect(post_ids).to_not include topicless_post.id
-    end
+    context 'private posts' do
+      before do
+        Guardian.any_instance.expects(:can_see?).with(private_post).returns(true)
+      end
 
-    it 'does not return posts without a topic for rss' do
-      xhr :get, :latest, format: :rss
-      expect(response).to be_success
-      expect(assigns(:posts)).to include post
-      expect(assigns(:posts)).to_not include topicless_post
+      it 'returns private posts for json' do
+        xhr :get, :latest, id: "private_posts", format: :json
+        expect(response).to be_success
+        json = ::JSON.parse(response.body)
+        post_ids = json['private_posts'].map { |p| p['id'] }
+        expect(post_ids).to include private_post.id
+        expect(post_ids).to_not include post.id
+      end
+
+      it 'returns private posts for rss' do
+        xhr :get, :latest, id: "private_posts", format: :rss
+        expect(response).to be_success
+        expect(assigns(:posts)).to include private_post
+        expect(assigns(:posts)).to_not include post
+      end
     end
   end
 
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index 92f36ba5f8..d06b4ff1cd 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -578,6 +578,11 @@ describe TopicsController do
       expect(response.status).to eq(404)
     end
 
+    it 'returns a 404 for an ID that is larger than postgres limits' do
+      xhr :get, :show, topic_id: 50142173232201640412, slug: 'topic-that-is-made-up'
+      expect(response.status).to eq(404)
+    end
+
     context 'a topic with nil slug exists' do
       before do
         @nil_slug_topic = Fabricate(:topic)
diff --git a/spec/fixtures/emails/user_not_found.eml b/spec/fixtures/emails/user_not_found.eml
new file mode 100644
index 0000000000..b2863e5d0c
--- /dev/null
+++ b/spec/fixtures/emails/user_not_found.eml
@@ -0,0 +1,9 @@
+Return-Path: <user@not.found>
+From: Not Found <user@not.found>
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <50@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+Email from an unknown user.
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 5931ec0d3a..7adf0c2baf 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -29,28 +29,38 @@ describe ApplicationHelper do
 
       context "mobile_view is not set" do
         it "is false if user agent is not mobile" do
-          controller.request.stubs(:user_agent).returns('Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.17 Safari/537.36')
+          controller.request.stubs(:user_agent).returns('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36')
           expect(helper.mobile_view?).to be_falsey
         end
 
         it "is true for iPhone" do
-          controller.request.stubs(:user_agent).returns('Mozilla/5.0 (iPhone; U; ru; CPU iPhone OS 4_2_1 like Mac OS X; ru) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148a Safari/6533.18.5')
+          controller.request.stubs(:user_agent).returns('Mozilla/5.0 (iPhone; CPU iPhone OS 9_2_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13D15 Safari/601.1')
+          expect(helper.mobile_view?).to eq(true)
+        end
+
+        it "is true for Android Samsung Galaxy" do
+          controller.request.stubs(:user_agent).returns('Mozilla/5.0 (Linux; Android 5.0.2; SAMSUNG SM-G925F Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile Safari/537.36')
+          expect(helper.mobile_view?).to eq(true)
+        end
+
+        it "is true for Android Google Nexus 5X" do
+          controller.request.stubs(:user_agent).returns('Mozilla/5.0 (Linux; Android 6.0; Nexus 5X Build/MDB08I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.43 Mobile Safari/537.36')
           expect(helper.mobile_view?).to eq(true)
         end
 
         it "is false for iPad" do
-          controller.request.stubs(:user_agent).returns("Mozilla/5.0 (iPad; CPU OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B176 Safari/7534.48.3")
+          controller.request.stubs(:user_agent).returns("Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B14 3 Safari/601.1")
           expect(helper.mobile_view?).to eq(false)
         end
 
         it "is false for Nexus 10 tablet" do
-          controller.request.stubs(:user_agent).returns("Mozilla/5.0 (Linux; Android 4.2.1; Nexus 10 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19")
+          controller.request.stubs(:user_agent).returns("Mozilla/5.0 (Linux; Android 5.1.1; Nexus 10 Build/LMY49G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.91 Safari/537.36")
           expect(helper.mobile_view?).to be_falsey
         end
 
-        it "is true for Nexus 7 tablet" do
-          controller.request.stubs(:user_agent).returns("Mozilla/5.0 (Linux; Android 4.1.2; Nexus 7 Build/JZ054K) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19")
-          expect(helper.mobile_view?).to eq(true)
+        it "is false for Nexus 7 tablet" do
+          controller.request.stubs(:user_agent).returns("Mozilla/5.0 (Linux; Android 6.0.1; Nexus 7 Build/MMB29Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.91 Safari/537.36")
+          expect(helper.mobile_view?).to be_falsey
         end
       end
     end
diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb
index d3a0022f1f..f63b4225cc 100644
--- a/spec/jobs/notify_mailing_list_subscribers_spec.rb
+++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb
@@ -3,9 +3,34 @@ require "rails_helper"
 describe Jobs::NotifyMailingListSubscribers do
 
   context "with mailing list on" do
-    before { SiteSetting.stubs(:default_email_mailing_list_mode).returns(true) }
+    before { SiteSetting.default_email_mailing_list_mode = true }
     let(:user) { Fabricate(:user) }
 
+    context "SiteSetting.max_emails_per_day_per_user" do
+
+      it 'stops sending mail once limit is reached' do
+        SiteSetting.max_emails_per_day_per_user = 2
+        post = Fabricate(:post)
+
+        user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id)
+        user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id)
+
+        Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+        expect(EmailLog.where(user_id: user.id, skipped: true).count).to eq(1)
+      end
+    end
+
+    context "totally skipped if mailing list mode disabled" do
+
+      it "sends no email to the user" do
+        SiteSetting.disable_mailing_list_mode = true
+
+        post = Fabricate(:post)
+        Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+        expect(EmailLog.count).to eq(0)
+      end
+    end
+
     context "with a valid post" do
       let!(:post) { Fabricate(:post, user: user) }
 
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 92fd5abd2a..e7405bade7 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -193,6 +193,17 @@ describe Jobs::UserEmail do
         Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id)
       end
 
+      it "does not send notification if limit is reached" do
+        SiteSetting.max_emails_per_day_per_user = 2
+
+        user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id)
+        user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id)
+
+        Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id, post_id: post.id)
+
+        expect(EmailLog.where(user_id: user.id, skipped: true).count).to eq(1)
+      end
+
       it "doesn't send the mail if the user is using mailing list mode" do
         Email::Sender.any_instance.expects(:send).never
         user.user_option.update_column(:mailing_list_mode, true)
@@ -205,7 +216,7 @@ describe Jobs::UserEmail do
         # When post does not have a topic
         post = Fabricate(:post)
         post.topic.destroy
-        Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted", post_id: post)
+        Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted", post_id: post.id)
       end
 
       it "doesn't send the email if the post has been user deleted" do
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index ebc9b27e4c..00ceb74a3a 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -243,6 +243,31 @@ describe UserNotifications do
     end
   end
 
+
+  it 'adds a warning when mail limit is reached' do
+    SiteSetting.max_emails_per_day_per_user = 2
+    user = Fabricate(:user)
+    user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id, skipped: false)
+
+    post = Fabricate(:post)
+    reply = Fabricate(:post, topic_id: post.topic_id)
+
+    notification = Fabricate(:notification, topic_id: post.topic_id, post_number: reply.post_number,
+                             user: post.user, data: {original_username: 'bob'}.to_json)
+
+    mail = UserNotifications.user_replied(
+      user,
+      post: reply,
+      notification_type: notification.notification_type,
+      notification_data_hash: notification.data_hash
+    )
+
+    # WARNING: you reached the limit of 100 email notifications per day. Further emails will be suppressed.
+    # Consider watching less topics or disabling mailing list mode.
+    expect(mail.html_part.to_s).to match("WARNING: ")
+    expect(mail.body.to_s).to match("WARNING: ")
+  end
+
   def expects_build_with(condition)
     UserNotifications.any_instance.expects(:build_email).with(user.email, condition)
     mailer = UserNotifications.send(mail_type, user,
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index f5ff32d462..3ee6bf8ce0 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -14,5 +14,48 @@ describe Badge do
     expect(Badge.create!(name: "test", badge_type_id: 1).system?).to be false
   end
 
+  it 'auto translates name' do
+    badge = Badge.find_by_name("Basic User")
+    name_english = badge.name
+
+    I18n.locale = 'fr'
+
+    expect(badge.display_name).not_to eq(name_english)
+  end
+
+  it 'handles changes on badge description and long description correctly for system badges' do
+    badge = Badge.find_by_name("Basic User")
+    badge.description = badge.description.dup
+    badge.long_description = badge.long_description.dup
+    badge.save
+    badge.reload
+
+    expect(badge[:description]).to eq(nil)
+    expect(badge[:long_description]).to eq(nil)
+
+    badge.description = "testing"
+    badge.long_description = "testing it"
+
+    badge.save
+    badge.reload
+
+    expect(badge[:description]).to eq("testing")
+    expect(badge[:long_description]).to eq("testing it")
+  end
+
+  it 'can ensure consistency' do
+    b = Badge.first
+    b.grant_count = 100
+    b.save
+
+    UserBadge.create!(user_id: -100, badge_id: b.id, granted_at: 1.minute.ago, granted_by_id: -1)
+    UserBadge.create!(user_id: User.first.id, badge_id: b.id, granted_at: 1.minute.ago, granted_by_id: -1)
+
+    Badge.ensure_consistency!
+
+    b.reload
+    expect(b.grant_count).to eq(1)
+  end
+
 end
 
diff --git a/spec/models/email_log_spec.rb b/spec/models/email_log_spec.rb
index 8c33e2b5f8..3b5ca7df46 100644
--- a/spec/models/email_log_spec.rb
+++ b/spec/models/email_log_spec.rb
@@ -26,6 +26,21 @@ describe EmailLog do
     end
   end
 
+  describe '#reached_max_emails?' do
+    it "tracks when max emails are reached" do
+      SiteSetting.max_emails_per_day_per_user = 2
+      user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id, skipped: true)
+      user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id)
+      user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id, created_at: 3.days.ago)
+
+      expect(EmailLog.reached_max_emails?(user)).to eq(false)
+
+      user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id)
+
+      expect(EmailLog.reached_max_emails?(user)).to eq(true)
+    end
+  end
+
   describe '#count_per_day' do
     it "counts sent emails" do
       user.email_logs.create(email_type: 'blah', to_address: user.email)
diff --git a/spec/models/given_daily_like_spec.rb b/spec/models/given_daily_like_spec.rb
new file mode 100644
index 0000000000..b3a8636776
--- /dev/null
+++ b/spec/models/given_daily_like_spec.rb
@@ -0,0 +1,50 @@
+require 'rails_helper'
+
+describe GivenDailyLike do
+
+  it 'no errors without a user' do
+    expect(-> { GivenDailyLike.increment_for(nil) }).not_to raise_error
+    expect(-> { GivenDailyLike.decrement_for(nil) }).not_to raise_error
+  end
+
+  context 'with a user' do
+    let(:user) { Fabricate(:user) }
+
+    def value_for(user_id, date)
+      GivenDailyLike.find_for(user_id, date).pluck(:likes_given)[0] || 0
+    end
+
+    def limit_reached_for(user_id, date)
+      GivenDailyLike.find_for(user_id, date).pluck(:limit_reached)[0] || false
+    end
+
+    it 'can be incremented and decremented' do
+      SiteSetting.max_likes_per_day = 2
+
+      Timecop.freeze(Date.today) do
+        dt = Date.today
+
+        expect(value_for(user.id, dt)).to eq(0)
+        expect(limit_reached_for(user.id, dt)).to eq(false)
+
+        GivenDailyLike.increment_for(user.id)
+        expect(value_for(user.id, dt)).to eq(1)
+        expect(limit_reached_for(user.id, dt)).to eq(false)
+
+        GivenDailyLike.increment_for(user.id)
+        expect(value_for(user.id, dt)).to eq(2)
+        expect(limit_reached_for(user.id, dt)).to eq(true)
+
+        GivenDailyLike.decrement_for(user.id)
+        expect(value_for(user.id, dt)).to eq(1)
+        expect(limit_reached_for(user.id, dt)).to eq(false)
+
+        GivenDailyLike.decrement_for(user.id)
+        expect(value_for(user.id, dt)).to eq(0)
+        expect(limit_reached_for(user.id, dt)).to eq(false)
+      end
+    end
+
+  end
+
+end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 09b9f58433..ef64bcfbe3 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -159,8 +159,11 @@ describe Notification do
     before do
       @topic = Fabricate(:private_message_topic)
       @post = Fabricate(:post, topic: @topic, user: @topic.user)
-      PostAlerter.post_created(@post)
       @target = @post.topic.topic_allowed_users.reject{|a| a.user_id == @post.user_id}[0].user
+
+      TopicUser.change(@target.id, @topic.id, notification_level: TopicUser.notification_levels[:watching])
+
+      PostAlerter.post_created(@post)
     end
 
     it 'should create and rollup private message notifications' do
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index e7a906bc60..e5809521e7 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -12,6 +12,10 @@ describe PostAction do
   let(:second_post) { Fabricate(:post, topic_id: post.topic_id) }
   let(:bookmark) { PostAction.new(user_id: post.user_id, post_action_type_id: PostActionType.types[:bookmark] , post_id: post.id) }
 
+  def value_for(user_id, dt)
+    GivenDailyLike.find_for(user_id, dt).pluck(:likes_given)[0] || 0
+  end
+
   describe "rate limits" do
 
     it "limits redo/undo" do
@@ -168,19 +172,24 @@ describe PostAction do
   describe "update_counters" do
 
     it "properly updates topic counters" do
-      # we need this to test it
-      TopicUser.change(codinghorror, post.topic, posted: true)
+      Timecop.freeze(Date.today) do
+        # we need this to test it
+        TopicUser.change(codinghorror, post.topic, posted: true)
 
-      PostAction.act(moderator, post, PostActionType.types[:like])
-      PostAction.act(codinghorror, second_post, PostActionType.types[:like])
+        expect(value_for(moderator.id, Date.today)).to eq(0)
 
-      post.topic.reload
-      expect(post.topic.like_count).to eq(2)
+        PostAction.act(moderator, post, PostActionType.types[:like])
+        PostAction.act(codinghorror, second_post, PostActionType.types[:like])
 
-      tu = TopicUser.get(post.topic, codinghorror)
-      expect(tu.liked).to be true
-      expect(tu.bookmarked).to be false
+        post.topic.reload
+        expect(post.topic.like_count).to eq(2)
 
+        expect(value_for(moderator.id, Date.today)).to eq(1)
+
+        tu = TopicUser.get(post.topic, codinghorror)
+        expect(tu.liked).to be true
+        expect(tu.bookmarked).to be false
+      end
     end
 
   end
@@ -239,29 +248,33 @@ describe PostAction do
     end
 
     it 'should increase the `like_count` and `like_score` when a user likes something' do
-      PostAction.act(codinghorror, post, PostActionType.types[:like])
-      post.reload
-      expect(post.like_count).to eq(1)
-      expect(post.like_score).to eq(1)
-      post.topic.reload
-      expect(post.topic.like_count).to eq(1)
+      Timecop.freeze(Date.today) do
+        PostAction.act(codinghorror, post, PostActionType.types[:like])
+        post.reload
+        expect(post.like_count).to eq(1)
+        expect(post.like_score).to eq(1)
+        post.topic.reload
+        expect(post.topic.like_count).to eq(1)
+        expect(value_for(codinghorror.id, Date.today)).to eq(1)
 
-      # When a staff member likes it
-      PostAction.act(moderator, post, PostActionType.types[:like])
-      post.reload
-      expect(post.like_count).to eq(2)
-      expect(post.like_score).to eq(4)
+        # When a staff member likes it
+        PostAction.act(moderator, post, PostActionType.types[:like])
+        post.reload
+        expect(post.like_count).to eq(2)
+        expect(post.like_score).to eq(4)
 
-      # Removing likes
-      PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
-      post.reload
-      expect(post.like_count).to eq(1)
-      expect(post.like_score).to eq(3)
+        # Removing likes
+        PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
+        post.reload
+        expect(post.like_count).to eq(1)
+        expect(post.like_score).to eq(3)
+        expect(value_for(codinghorror.id, Date.today)).to eq(0)
 
-      PostAction.remove_act(moderator, post, PostActionType.types[:like])
-      post.reload
-      expect(post.like_count).to eq(0)
-      expect(post.like_score).to eq(0)
+        PostAction.remove_act(moderator, post, PostActionType.types[:like])
+        post.reload
+        expect(post.like_count).to eq(0)
+        expect(post.like_score).to eq(0)
+      end
     end
   end
 
diff --git a/spec/models/site_customization_spec.rb b/spec/models/site_customization_spec.rb
index 571e95ddd0..ca87b12bca 100644
--- a/spec/models/site_customization_spec.rb
+++ b/spec/models/site_customization_spec.rb
@@ -119,4 +119,37 @@ HTML
     expect(SiteCustomization.custom_head_tag).to match(/<b>test<\/b>/)
   end
 
+  context "plugin api" do
+    def transpile(html)
+      c = SiteCustomization.create!(user_id: -1, name: "test", head_tag: html, body_tag: html)
+      c.head_tag_baked
+    end
+
+    it "transpiles ES6 code" do
+      html = <<HTML
+        <script type='text/discourse-plugin' version='0.1'>
+          const x = 1;
+        </script>
+HTML
+
+      transpiled = transpile(html)
+      expect(transpiled).to match(/\<script\>/)
+      expect(transpiled).to match(/var x = 1;/)
+      expect(transpiled).to match(/_registerPluginCode\('0.1'/)
+    end
+
+    it "converts errors to a script type that is not evaluated" do
+      html = <<HTML
+        <script type='text/discourse-plugin' version='0.1'>
+          const x = 1;
+          x = 2;
+        </script>
+HTML
+
+      transpiled = transpile(html)
+      expect(transpiled).to match(/text\/discourse-js-error/)
+      expect(transpiled).to match(/read-only/)
+    end
+  end
+
 end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 6d0e7074e2..6c071fce29 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1296,6 +1296,16 @@ describe Topic do
       expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
     end
 
+    it "doesn't return topics from suppressed categories" do
+      user = Fabricate(:user)
+      category = Fabricate(:category)
+      Fabricate(:topic, category: category)
+
+      SiteSetting.digest_suppress_categories = "#{category.id}"
+
+      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
+    end
+
     it "doesn't return topics from TL0 users" do
       new_user = Fabricate(:user, trust_level: 0)
       Fabricate(:topic, user_id: new_user.id)
@@ -1303,6 +1313,16 @@ describe Topic do
       expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
     end
 
+    it "returns topics from TL0 users if enabled in preferences" do
+      new_user = Fabricate(:user, trust_level: 0)
+      topic = Fabricate(:topic, user_id: new_user.id)
+
+      u = Fabricate(:user)
+      u.user_option.include_tl0_in_digests = true
+
+      expect(Topic.for_digest(u, 1.year.ago, top_order: true)).to eq([topic])
+    end
+
   end
 
   describe 'secured' do
@@ -1597,7 +1617,7 @@ describe Topic do
 
     topic.update_status('closed', true, user)
     topic.reload
-    
+
     expect(@topic_status_event_triggered).to eq(true)
   end
 end
diff --git a/spec/services/auto_block_spec.rb b/spec/services/auto_block_spec.rb
index dcecb04c8e..d23738835a 100644
--- a/spec/services/auto_block_spec.rb
+++ b/spec/services/auto_block_spec.rb
@@ -100,7 +100,7 @@ describe SpamRule::AutoBlock do
 
     context 'user is not blocked' do
       before do
-        UserBlocker.expects(:block).with(user, nil, has_entries(message: :too_many_spam_flags)).returns(true)
+        UserBlocker.expects(:block).with(user, Discourse.system_user, message: :too_many_spam_flags).returns(true)
       end
 
       it 'prevents the user from making new posts' do
@@ -126,7 +126,7 @@ describe SpamRule::AutoBlock do
 
     context 'user is already blocked' do
       before do
-        UserBlocker.expects(:block).with(user, nil, has_entries(message: :too_many_spam_flags)).returns(false)
+        UserBlocker.expects(:block).with(user, Discourse.system_user, message: :too_many_spam_flags).returns(false)
       end
 
       it "doesn't send a pm to moderators if the user is already blocked" do
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 6d444e7d83..d6889f7493 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -10,6 +10,43 @@ describe PostAlerter do
     PostAlerter.post_created(post)
   end
 
+  context "private message" do
+    it "notifies for pms correctly" do
+      pm = Fabricate(:topic, archetype: 'private_message', category_id: nil)
+      op = Fabricate(:post, user_id: pm.user_id)
+      pm.allowed_users << pm.user
+      PostAlerter.post_created(op)
+      reply = Fabricate(:post, user_id: pm.user_id, topic_id: pm.id, reply_to_post_number: 1)
+      PostAlerter.post_created(reply)
+
+      reply2 = Fabricate(:post, topic_id: pm.id, reply_to_post_number: 1)
+      PostAlerter.post_created(reply2)
+
+      # we get a green notification for a reply
+      expect(Notification.where(user_id: pm.user_id).pluck(:notification_type).first).to eq(Notification.types[:private_message])
+
+      TopicUser.change(pm.user_id, pm.id, notification_level: TopicUser.notification_levels[:tracking])
+
+      Notification.destroy_all
+
+      reply3 = Fabricate(:post, topic_id: pm.id)
+      PostAlerter.post_created(reply3)
+
+      # no notification cause we are tracking
+      expect(Notification.where(user_id: pm.user_id).count).to eq(0)
+
+      Notification.destroy_all
+
+      reply4 = Fabricate(:post, topic_id: pm.id, reply_to_post_number: 1)
+      PostAlerter.post_created(reply4)
+
+      # yes notification cause we were replied to
+      expect(Notification.where(user_id: pm.user_id).count).to eq(1)
+
+
+    end
+  end
+
   context "unread" do
     it "does not return whispers as unread posts" do
       op = Fabricate(:post)
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index 9cef2507fc..6e7a0227a5 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -32,32 +32,60 @@ describe UserAnonymizer do
       expect(user.user_option.mailing_list_mode).to eq(false)
     end
 
-    it "resets profile to default values" do
-      user.update_attributes( name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star" )
+    context "Site Settings do not require full name" do
+      before do
+        SiteSetting.full_name_required = false
+      end
 
-      profile = user.user_profile(true)
-      profile.update_attributes( location: "Moose Jaw",
-                                 website: "www.bim.com",
-                                 bio_raw: "I'm Bibi from Moosejaw. I sing and dance.",
-                                 bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.",
-                                 profile_background: "http://example.com/bg.jpg",
-                                 bio_cooked_version: 2,
-                                 card_background: "http://example.com/cb.jpg")
-      make_anonymous
-      user.reload
+      it "resets profile to default values" do
+        user.update_attributes( name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star" )
 
-      expect(user.name).not_to be_present
-      expect(user.date_of_birth).to eq(nil)
-      expect(user.title).not_to be_present
-      expect(user.auth_token).to eq(nil)
+        profile = user.user_profile(true)
+        profile.update_attributes( location: "Moose Jaw",
+                                   website: "www.bim.com",
+                                   bio_raw: "I'm Bibi from Moosejaw. I sing and dance.",
+                                   bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.",
+                                   profile_background: "http://example.com/bg.jpg",
+                                   bio_cooked_version: 2,
+                                   card_background: "http://example.com/cb.jpg")
 
-      profile = user.user_profile(true)
-      expect(profile.location).to eq(nil)
-      expect(profile.website).to eq(nil)
-      expect(profile.bio_cooked).to eq(nil)
-      expect(profile.profile_background).to eq(nil)
-      expect(profile.bio_cooked_version).to eq(nil)
-      expect(profile.card_background).to eq(nil)
+        prev_username = user.username
+
+        make_anonymous
+        user.reload
+
+        expect(user.username).not_to eq(prev_username)
+        expect(user.name).not_to be_present
+        expect(user.date_of_birth).to eq(nil)
+        expect(user.title).not_to be_present
+        expect(user.auth_token).to eq(nil)
+
+        profile = user.user_profile(true)
+        expect(profile.location).to eq(nil)
+        expect(profile.website).to eq(nil)
+        expect(profile.bio_cooked).to eq(nil)
+        expect(profile.profile_background).to eq(nil)
+        expect(profile.bio_cooked_version).to eq(nil)
+        expect(profile.card_background).to eq(nil)
+      end
+    end
+
+    context "Site Settings require full name" do
+      before do
+        SiteSetting.full_name_required = true
+      end
+
+      it "changes name to anonymized username" do
+        prev_username = user.username
+
+        user.update_attributes( name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star" )
+
+        make_anonymous
+        user.reload
+
+        expect(user.name).not_to eq(prev_username)
+        expect(user.name).to eq(user.username)
+      end
     end
 
     it "removes the avatar" do
diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js.es6
index b45675f1aa..9819ed8cba 100644
--- a/test/javascripts/acceptance/about-test.js.es6
+++ b/test/javascripts/acceptance/about-test.js.es6
@@ -4,8 +4,8 @@ acceptance("About");
 test("viewing", () => {
   visit("/about");
   andThen(() => {
-    ok(exists('.about.admins .user-small'), 'has admins');
-    ok(exists('.about.moderators .user-small'), 'has moderators');
+    ok(exists('.about.admins .user-info'), 'has admins');
+    ok(exists('.about.moderators .user-info'), 'has moderators');
     ok(exists('.about.stats tr td'), 'has stats');
   });
 });
diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js.es6
index abe9205fe0..77148f10fc 100644
--- a/test/javascripts/acceptance/badges-test.js.es6
+++ b/test/javascripts/acceptance/badges-test.js.es6
@@ -5,12 +5,12 @@ acceptance("Badges");
 test("Visit Badge Pages", () => {
   visit("/badges");
   andThen(() => {
-    ok(exists('.badges-listing tr'), "has a list of badges");
+    ok(exists('.badge-groups .badge-card'), "has a list of badges");
   });
 
   visit("/badges/9/autobiographer");
   andThen(() => {
-    ok(exists('.badges-listing div'), "has the badge in the listing");
-    ok(exists('.badge-user'), "has the list of users with that badge");
+    ok(exists('.badge-card'), "has the badge in the listing");
+    ok(exists('.user-info'), "has the list of users with that badge");
   });
 });
diff --git a/test/javascripts/components/home-logo-test.js.es6 b/test/javascripts/components/home-logo-test.js.es6
new file mode 100644
index 0000000000..60eefd94b9
--- /dev/null
+++ b/test/javascripts/components/home-logo-test.js.es6
@@ -0,0 +1,90 @@
+import componentTest from 'helpers/component-test';
+
+moduleForComponent('home-logo', {integration: true});
+
+const bigLogo = '/images/d-logo-sketch.png?test';
+const smallLogo = '/images/d-logo-sketch-small.png?test';
+const mobileLogo = '/images/d-logo-sketch.png?mobile';
+const title = "Cool Forum";
+
+componentTest('basics', {
+  template: '{{home-logo minimized=minimized}}',
+  setup() {
+    this.siteSettings.logo_url = bigLogo;
+    this.siteSettings.logo_small_url= smallLogo;
+    this.siteSettings.title = title;
+    this.set('minimized', false);
+  },
+
+  test(assert) {
+    assert.ok(this.$('.title').length === 1);
+    assert.ok(this.$('a[data-auto-route]').length === 1);
+
+    assert.ok(this.$('img#site-logo.logo-big').length === 1);
+    assert.equal(this.$('#site-logo').attr('src'), bigLogo);
+    assert.equal(this.$('#site-logo').attr('alt'), title);
+
+    this.set('minimized', true);
+    andThen(() => {
+      assert.ok(this.$('img.logo-small').length === 1);
+      assert.equal(this.$('img.logo-small').attr('src'), smallLogo);
+      assert.equal(this.$('img.logo-small').attr('alt'), title);
+    });
+  }
+});
+
+componentTest('no logo', {
+  template: '{{home-logo minimized=minimized}}',
+  setup() {
+    this.siteSettings.logo_url = '';
+    this.siteSettings.logo_small_url = '';
+    this.siteSettings.title = title;
+    this.set('minimized', false);
+  },
+
+  test(assert) {
+    assert.ok(this.$('a[data-auto-route]').length === 1);
+
+    assert.ok(this.$('h2#site-text-logo.text-logo').length === 1);
+    assert.equal(this.$('#site-text-logo').text(), title);
+
+    this.set('minimized', true);
+    andThen(() => {
+      assert.ok(this.$('i.fa-home').length === 1);
+    });
+  }
+});
+
+componentTest('mobile logo', {
+  template: "{{home-logo}}",
+  setup() {
+    this.siteSettings.mobile_logo_url = mobileLogo;
+    this.siteSettings.logo_small_url= smallLogo;
+    this.site.mobileView = true;
+  },
+
+  test(assert) {
+    assert.ok(this.$('img#site-logo.logo-big').length === 1);
+    assert.equal(this.$('#site-logo').attr('src'), mobileLogo);
+  }
+});
+
+componentTest('mobile without logo', {
+  template: "{{home-logo}}",
+  setup() {
+    this.siteSettings.logo_url = bigLogo;
+    this.site.mobileView = true;
+  },
+
+  test(assert) {
+    assert.ok(this.$('img#site-logo.logo-big').length === 1);
+    assert.equal(this.$('#site-logo').attr('src'), bigLogo);
+  }
+});
+
+componentTest("changing url", {
+  template: '{{home-logo targetUrl="https://www.discourse.org"}}',
+  test(assert) {
+    assert.equal(this.$('a').attr('href'), 'https://www.discourse.org');
+  }
+});
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6
index 0fd3c8d6b2..995fb47621 100644
--- a/test/javascripts/helpers/component-test.js.es6
+++ b/test/javascripts/helpers/component-test.js.es6
@@ -1,16 +1,18 @@
 import AppEvents from 'discourse/lib/app-events';
 import createStore from 'helpers/create-store';
-import { loadAllHelpers } from 'discourse/initializers/load-all-helpers';
+import { autoLoadModules } from 'discourse/initializers/auto-load-modules';
 
 export default function(name, opts) {
   opts = opts || {};
 
   test(name, function(assert) {
     const appEvents = AppEvents.create();
+    this.site = Discourse.Site.current();
+
     this.container.register('site-settings:main', Discourse.SiteSettings, { instantiate: false });
     this.container.register('app-events:main', appEvents, { instantiate: false });
     this.container.register('capabilities:main', Ember.Object);
-    this.container.register('site:main', Discourse.Site.current(), { instantiate: false });
+    this.container.register('site:main', this.site, { instantiate: false });
     this.container.injection('component', 'siteSettings', 'site-settings:main');
     this.container.injection('component', 'appEvents', 'app-events:main');
     this.container.injection('component', 'capabilities', 'capabilities:main');
@@ -18,7 +20,7 @@ export default function(name, opts) {
 
     this.siteSettings = Discourse.SiteSettings;
 
-    loadAllHelpers();
+    autoLoadModules();
 
     if (opts.setup) {
       const store = createStore();
diff --git a/test/javascripts/lib/bbcode-test.js.es6 b/test/javascripts/lib/bbcode-test.js.es6
index 34b3992b84..86ca8d685e 100644
--- a/test/javascripts/lib/bbcode-test.js.es6
+++ b/test/javascripts/lib/bbcode-test.js.es6
@@ -62,20 +62,6 @@ test('tags with arguments', function() {
   format("[b]first[/b] [b]second[/b]", "<span class=\"bbcode-b\">first</span> <span class=\"bbcode-b\">second</span>", "can bold two things on the same line");
 });
 
-test("size tags", function() {
-  format("[size=35]BIG [b]whoop[/b][/size]",
-         "<span class=\"bbcode-size-35\">BIG <span class=\"bbcode-b\">whoop</span></span>",
-         "supports [size=]");
-  format("[size=asdf]regular[/size]",
-         "<span class=\"bbcode-size-1\">regular</span>",
-         "it only supports numbers in bbcode");
-  format("[size=35]NEWLINE\n\ntest[/size]",
-         "<span class=\"bbcode-size-35\"><p>NEWLINE</p><p>test</p></span>",
-         "works with newlines");
-  format("[size=35][quote=\"user\"]quote[/quote][/size]",
-         "<span class=\"bbcode-size-35\"><aside class=\"quote\"><div class=\"title\"><div class=\"quote-controls\"></div>user:</div><blockquote><p>quote</p></blockquote></aside></span>",
-         "works with nested complex blocks");
-});
 
 test("quotes", function() {
 
diff --git a/test/javascripts/lib/markdown-test.js.es6 b/test/javascripts/lib/markdown-test.js.es6
index 59222a90a3..6e8f6e86a0 100644
--- a/test/javascripts/lib/markdown-test.js.es6
+++ b/test/javascripts/lib/markdown-test.js.es6
@@ -510,9 +510,9 @@ test("sanitize", function() {
 
   cooked("<i class=\"fa fa-bug fa-spin\" style=\"font-size:600%\"></i>\n<!-- -->", "<p><i></i><br/></p>", "it doesn't circumvent XSS with comments");
 
-  cooked("<span class=\"-bbcode-size-0 fa fa-spin\">a</span>", "<p><span>a</span></p>", "it sanitizes spans");
-  cooked("<span class=\"fa fa-spin -bbcode-size-0\">a</span>", "<p><span>a</span></p>", "it sanitizes spans");
-  cooked("<span class=\"bbcode-size-10\">a</span>", "<p><span class=\"bbcode-size-10\">a</span></p>", "it sanitizes spans");
+  cooked("<span class=\"-bbcode-s fa fa-spin\">a</span>", "<p><span>a</span></p>", "it sanitizes spans");
+  cooked("<span class=\"fa fa-spin -bbcode-s\">a</span>", "<p><span>a</span></p>", "it sanitizes spans");
+  cooked("<span class=\"bbcode-s\">a</span>", "<p><span class=\"bbcode-s\">a</span></p>", "it sanitizes spans");
 });
 
 test("URLs in BBCode tags", function() {
diff --git a/test/javascripts/models/badge-test.js.es6 b/test/javascripts/models/badge-test.js.es6
index a91b49ecd3..0b92f88ce4 100644
--- a/test/javascripts/models/badge-test.js.es6
+++ b/test/javascripts/models/badge-test.js.es6
@@ -9,32 +9,6 @@ test('newBadge', function() {
   ok(!badge2.get('newBadge'), "badges with ids are not new");
 });
 
-test('displayName', function() {
-  const badge1 = Badge.create({id: 1, name: "Test Badge 1"});
-  equal(badge1.get('displayName'), "Test Badge 1", "falls back to the original name in the absence of a translation");
-
-  sandbox.stub(I18n, "t").returnsArg(0);
-  const badge2 = Badge.create({id: 2, name: "Test Badge 2"});
-  equal(badge2.get('displayName'), "badges.badge.test_badge_2.name", "uses translation when available");
-});
-
-test('translatedDescription', function() {
-  const badge1 = Badge.create({id: 1, name: "Test Badge 1", description: "TEST"});
-  equal(badge1.get('translatedDescription'), null, "returns null when no translation exists");
-
-  const badge2 = Badge.create({id: 2, name: "Test Badge 2 **"});
-  sandbox.stub(I18n, "t").returns("description translation");
-  equal(badge2.get('translatedDescription'), "description translation", "users translated description");
-});
-
-test('displayDescription', function() {
-  const badge1 = Badge.create({id: 1, name: "Test Badge 1", description: "TEST"});
-  equal(badge1.get('displayDescription'), "TEST", "returns original description when no translation exists");
-
-  const badge2 = Badge.create({id: 2, name: "Test Badge 2 **"});
-  sandbox.stub(I18n, "t").returns("description translation");
-  equal(badge2.get('displayDescription'), "description translation", "users translated description");
-});
 
 test('createFromJson array', function() {
   const badgesJson = {"badge_types":[{"id":6,"name":"Silver 1"}],"badges":[{"id":1126,"name":"Badge 1","description":null,"badge_type_id":6}]};
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.gl.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.gl.yml
new file mode 100644
index 0000000000..0823370a17
--- /dev/null
+++ b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.gl.yml
@@ -0,0 +1,12 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+gl:
+  site_settings:
+    enable_imgur: "Activar a api de imgur para enviar, non gardar ficheiros localmente"
+    imgur_client_id: "ID do teu cliente de imgur.com, requirido para que funcione o envío de imaxes"
+    imgur_client_secret: "O teu secreto para o cliente de imgur.com. Non requirido neste intre para enviar imaxes pero quizais posteriormente."