diff --git a/.gitignore b/.gitignore
index fbaaa54386..63fc931ed1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,6 @@ public/tombstone/*
 
 # Ignore bundler config
 /.bundle
-/.vagrant
-/.vagrantfile
 /cache
 /coverage/*
 
@@ -95,9 +93,6 @@ config/fog_credentials.yml
 script/download_db
 script/refresh_db
 
-# temp directory for chef (used to configure vagrant VM)
-chef/tmp/*
-
 # .procfile
 .procfile
 
diff --git a/.tx/config b/.tx/config
index 26ec9541c4..83873e2d8c 100644
--- a/.tx/config
+++ b/.tx/config
@@ -50,6 +50,24 @@ source_file = plugins/discourse-presence/config/locales/server.en.yml
 source_lang = en
 type = YML
 
+[discourse-org.coreplugindetailsclientyml]
+file_filter = plugins/discourse-details/config/locales/client.<lang>.yml
+source_file = plugins/discourse-details/config/locales/client.en.yml
+source_lang = en
+type = YML
+
+[discourse-org.coreplugindetailsserveryml]
+file_filter = plugins/discourse-details/config/locales/server.<lang>.yml
+source_file = plugins/discourse-details/config/locales/server.en.yml
+source_lang = en
+type = YML
+
+[discourse-org.corepluginnginx-performance-reportserveryml]
+file_filter = plugins/discourse-nginx-performance-report/config/locales/server.<lang>.yml
+source_file = plugins/discourse-nginx-performance-report/config/locales/server.en.yml
+source_lang = en
+type = YML
+
 [discourse-org.403html]
 file_filter = public/403.<lang>.html
 source_file = public/403.html
diff --git a/Gemfile b/Gemfile
index 75c6438657..2f4e597291 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,8 +24,7 @@ else
   gem 'seed-fu'
 end
 
-gem 'mail'
-gem 'mime-types', require: 'mime/types/columnar'
+gem 'mail', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
@@ -59,7 +58,7 @@ gem 'aws-sdk-s3', require: false
 gem 'excon', require: false
 gem 'unf', require: false
 
-gem 'email_reply_trimmer', '0.1.10'
+gem 'email_reply_trimmer', '0.1.11'
 
 # Forked until https://github.com/toy/image_optim/pull/149 is merged
 gem 'discourse_image_optim', require: 'image_optim'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4ee395b285..0d7600cb2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,7 +91,7 @@ GEM
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    email_reply_trimmer (0.1.10)
+    email_reply_trimmer (0.1.11)
     ember-data-source (2.2.1)
       ember-source (>= 1.8, < 3.0)
     ember-handlebars-template (0.7.5)
@@ -159,20 +159,17 @@ GEM
     logstash-logger (0.25.1)
       logstash-event (~> 1.2)
     logster (1.2.9)
-    loofah (2.2.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     memory_profiler (0.9.10)
     message_bus (2.1.2)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
     mini_mime (0.1.3)
     mini_portile2 (2.3.0)
     mini_racer (0.1.15)
@@ -256,21 +253,21 @@ GEM
     public_suffix (2.0.5)
     puma (3.9.1)
     r2 (0.2.6)
-    rack (2.0.3)
-    rack-mini-profiler (0.10.7)
+    rack (2.0.4)
+    rack-mini-profiler (1.0.0)
       rack (>= 1.2.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-protection (2.0.0)
+    rack-protection (2.0.1)
       rack
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails_multisite (2.0.4)
       activerecord (> 4.2, < 6)
       railties (> 4.2, < 6)
@@ -417,7 +414,7 @@ DEPENDENCIES
   cppjieba_rb
   discourse-qunit-rails
   discourse_image_optim
-  email_reply_trimmer (= 0.1.10)
+  email_reply_trimmer (= 0.1.11)
   ember-handlebars-template (= 0.7.5)
   ember-rails (= 0.18.5)
   ember-source (= 2.13.3)
@@ -445,7 +442,6 @@ DEPENDENCIES
   mail
   memory_profiler
   message_bus
-  mime-types
   mini_mime
   mini_racer
   mini_suffix
diff --git a/README.md b/README.md
index 1069b7ee84..51b8314318 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Browse [lots more notable Discourse instances](https://www.discourse.org/custome
 
 ## Development
 
-1. If you're **brand new to Ruby and Rails**, please see [**Discourse as Your First Rails App**](http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/) or our [**Discourse Vagrant Developer Guide**](docs/VAGRANT.md), which includes a development environment in a virtual machine.
+1. If you're **brand new to Ruby and Rails**, please see [**Discourse as Your First Rails App**](http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/).
 
 2. If you're familiar with how Rails works and are comfortable setting up your own environment, use our [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md).
 
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index bac277c090..0000000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
-#
-Vagrant.configure("2") do |config|
-  config.vm.box     = 'discourse-16.04'
-  config.vm.box_url = "https://www.dropbox.com/s/2132770g1e05c6d/discourse.box?dl=1"
-
-  # Make this VM reachable on the host network as well, so that other
-  # VM's running other browsers can access our dev server.
-  config.vm.network :private_network, ip: "192.168.10.200"
-
-  # Make it so that network access from the vagrant guest is able to
-  # use SSH private keys that are present on the host without copying
-  # them into the VM.
-  config.ssh.forward_agent = true
-
-  config.vm.provider :virtualbox do |v|
-    # This setting gives the VM 1024MB of RAM instead of the default 384.
-    v.customize ["modifyvm", :id, "--memory", [ENV['DISCOURSE_VM_MEM'].to_i, 1024].max]
-
-    # Who has a single core cpu these days anyways?
-    cpu_count = 2
-
-    # Determine the available cores in host system.
-    # This mostly helps on linux, but it couldn't hurt on MacOSX.
-    if RUBY_PLATFORM =~ /linux/
-      cpu_count = `nproc`.to_i
-    elsif RUBY_PLATFORM =~ /darwin/
-      cpu_count = `sysctl -n hw.ncpu`.to_i
-    end
-
-    # Assign additional cores to the guest OS.
-    v.customize ["modifyvm", :id, "--cpus", cpu_count]
-    v.customize ["modifyvm", :id, "--ioapic", "on"]
-
-    # This setting makes it so that network access from inside the vagrant guest
-    # is able to resolve DNS using the hosts VPN connection.
-    v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-  end
-
-  config.vm.network :forwarded_port, guest: 3000, host: 4000
-  config.vm.network :forwarded_port, guest: 1080, host: 4080 # Mailcatcher
-
-  nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
-  config.vm.synced_folder ".", "/vagrant", id: "vagrant-root"
-
-end
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
index c961c6d017..28ae718afa 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
@@ -5,6 +5,8 @@ export default Ember.Controller.extend({
   maximized: false,
   section: null,
 
+  editRouteName: 'adminCustomizeThemes.edit',
+
   targets: [
     { id: 0, name: 'common'   },
     { id: 1, name: 'desktop'  },
@@ -52,7 +54,7 @@ export default Ember.Controller.extend({
 
         let fields = this.get('model.theme_fields');
         let field = fields && fields.find(f => (f.target === target));
-        this.replaceRoute('adminCustomizeThemes.edit', this.get('model.id'), target, field && field.name);
+        this.replaceRoute(this.get('editRouteName'), this.get('model.id'), target, field && field.name);
       }
     }
   },
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
index b8850b10f8..16eff82947 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -8,6 +8,8 @@ const THEME_UPLOAD_VAR = 2;
 
 export default Ember.Controller.extend({
 
+  editRouteName: 'adminCustomizeThemes.edit',
+
   @computed("model", "allThemes")
   parentThemes(model, allThemes) {
     let parents = allThemes.filter(theme =>
@@ -142,7 +144,7 @@ export default Ember.Controller.extend({
     },
 
     editTheme() {
-      let edit = ()=>this.transitionToRoute('adminCustomizeThemes.edit', this.get('model.id'), 'common', 'scss');
+      let edit = ()=>this.transitionToRoute(this.get('editRouteName'), this.get('model.id'), 'common', 'scss');
 
       if (this.get("model.remote_theme")) {
       bootbox.confirm(I18n.t("admin.customize.theme.edit_confirm"), result => {
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index d06b8dc06e..6652002fb4 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -19,6 +19,7 @@ export default Ember.Controller.extend({
   versionCheck: null,
   dashboardFetchedAt: null,
   showVersionChecks: setting('version_checks'),
+  exceptionController: Ember.inject.controller('exception'),
 
   @computed('problems.length')
   foundProblems(problemsLength) {
@@ -39,10 +40,10 @@ export default Ember.Controller.extend({
 
   fetchDashboard() {
     if (!this.get('dashboardFetchedAt') || moment().subtract(30, 'minutes').toDate() > this.get('dashboardFetchedAt')) {
-      this.set('dashboardFetchedAt', new Date());
       this.set('loading', true);
       const versionChecks = this.siteSettings.version_checks;
       AdminDashboard.find().then(d => {
+        this.set('dashboardFetchedAt', new Date());
         if (versionChecks) {
           this.set('versionCheck', VersionCheck.create(d.version_check));
         }
@@ -56,6 +57,10 @@ export default Ember.Controller.extend({
         }
 
         ATTRIBUTES.forEach(a => this.set(a, d[a]));
+      }).catch(e => {
+        this.get('exceptionController').set('thrown', e.jqXHR);
+        this.replaceRoute('exception');
+      }).finally(() => {
         this.set('loading', false);
       });
     }
diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6
deleted file mode 100644
index cab20f908f..0000000000
--- a/app/assets/javascripts/admin/controllers/admin-group.js.es6
+++ /dev/null
@@ -1,110 +0,0 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
-  adminGroupsType: Ember.inject.controller(),
-  disableSave: false,
-  savingStatus: '',
-
-  aliasLevelOptions: function() {
-    return [
-      { name: I18n.t("groups.alias_levels.nobody"), value: 0 },
-      { name: I18n.t("groups.alias_levels.mods_and_admins"), value: 2 },
-      { name: I18n.t("groups.alias_levels.members_mods_and_admins"), value: 3 },
-      { name: I18n.t("groups.alias_levels.everyone"), value: 99 }
-    ];
-  }.property(),
-
-  visibilityLevelOptions: function() {
-    return [
-      { name: I18n.t("groups.visibility_levels.public"), value: 0 },
-      { name: I18n.t("groups.visibility_levels.members"), value: 1 },
-      { name: I18n.t("groups.visibility_levels.staff"), value: 2 },
-      { name: I18n.t("groups.visibility_levels.owners"), value: 3 }
-    ];
-  }.property(),
-
-  trustLevelOptions: function() {
-    return [
-      { name: I18n.t("groups.trust_levels.none"), value: 0 },
-      { name: 1, value: 1 }, { name: 2, value: 2 }, { name: 3, value: 3 }, { name: 4, value: 4 }
-    ];
-  }.property(),
-
-  @computed('model.visibility_level', 'model.public_admission')
-  disableMembershipRequestSetting(visibility_level, publicAdmission) {
-    visibility_level = parseInt(visibility_level);
-    return (visibility_level !== 0) || publicAdmission;
-  },
-
-  @computed('model.visibility_level', 'model.allow_membership_requests')
-  disablePublicSetting(visibility_level, allowMembershipRequests) {
-    visibility_level = parseInt(visibility_level);
-    return (visibility_level !== 0) || allowMembershipRequests;
-  },
-
-  actions: {
-    removeOwner(member) {
-      const self = this,
-            message = I18n.t("admin.groups.delete_owner_confirm", { username: member.get("username"), group: this.get("model.name") });
-      return bootbox.confirm(message, I18n.t("no_value"), I18n.t("yes_value"), function(confirm) {
-        if (confirm) {
-          self.get("model").removeOwner(member);
-        }
-      });
-    },
-
-    addOwners() {
-      if (Em.isEmpty(this.get("model.ownerUsernames"))) { return; }
-      this.get("model").addOwners(this.get("model.ownerUsernames")).catch(popupAjaxError);
-      this.set("model.ownerUsernames", null);
-    },
-
-    save() {
-      const group = this.get('model'),
-            groupsController = this.get("adminGroupsType"),
-            groupType = groupsController.get("type");
-
-      this.set('disableSave', true);
-      this.set('savingStatus', I18n.t('saving'));
-
-      let promise = group.get("id") ? group.save() : group.create().then(() => groupsController.get('model').addObject(group));
-
-      promise.then(() => {
-        this.transitionToRoute("adminGroup", groupType, group.get('name'));
-        this.set('savingStatus', I18n.t('saved'));
-      }).catch(popupAjaxError)
-        .finally(() => this.set('disableSave', false));
-    },
-
-    destroy() {
-      const group = this.get('model'),
-            groupsController = this.get('adminGroupsType'),
-            self = this;
-
-      if (!group.get('id')) {
-        self.transitionToRoute('adminGroupsType.index', 'custom');
-        return;
-      }
-
-      this.set('disableSave', true);
-
-      bootbox.confirm(
-        I18n.t("admin.groups.delete_confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        function(confirmed) {
-          if (confirmed) {
-            group.destroy().then(() => {
-              groupsController.get('model').removeObject(group);
-              self.transitionToRoute('adminGroups.index');
-            }).catch(() => bootbox.alert(I18n.t("admin.groups.delete_failed")))
-              .finally(() => self.set('disableSave', false));
-          } else {
-            self.set('disableSave', false);
-          }
-        }
-      );
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-bulk-complete.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-bulk-complete.js.es6
deleted file mode 100644
index 780543b724..0000000000
--- a/app/assets/javascripts/admin/controllers/admin-groups-bulk-complete.js.es6
+++ /dev/null
@@ -1,4 +0,0 @@
-export default Ember.Controller.extend({
-  adminGroupsBulk: Ember.inject.controller(),
-  bulkAddResponse: Ember.computed.alias('adminGroupsBulk.bulkAddResponse')
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-bulk.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-bulk.js.es6
deleted file mode 100644
index 8f8b28f6b4..0000000000
--- a/app/assets/javascripts/admin/controllers/admin-groups-bulk.js.es6
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ajax } from 'discourse/lib/ajax';
-import computed from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-
-export default Ember.Controller.extend({
-  users: null,
-  groupId: null,
-  saving: false,
-  bulkAddResponse: null,
-
-  @computed('saving', 'users', 'groupId')
-  buttonDisabled(saving, users, groupId) {
-    return saving || !groupId || !users || !users.length;
-  },
-
-  actions: {
-    addToGroup() {
-      if (this.get('saving')) { return; }
-
-      const users = this.get('users').split("\n")
-                                      .uniq()
-                                      .reject(x => x.length === 0);
-
-      this.set('saving', true);
-      ajax('/admin/groups/bulk', {
-        data: { users, group_id: this.get('groupId') },
-        method: 'PUT'
-      }).then(result => {
-        this.set('bulkAddResponse', result);
-        this.transitionToRoute('adminGroups.bulkComplete');
-      }).catch(popupAjaxError).finally(() => {
-        this.set('saving', false);
-      });
-
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-type-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-type-index.js.es6
deleted file mode 100644
index ca80f093d1..0000000000
--- a/app/assets/javascripts/admin/controllers/admin-groups-type-index.js.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
-  adminGroupsType: Ember.inject.controller(),
-  sortedGroups: Ember.computed.alias("adminGroupsType.sortedGroups"),
-
-  @computed("sortedGroups")
-  messageKey(sortedGroups) {
-    return `admin.groups.${sortedGroups.length > 0 ? 'none_selected' : 'no_custom_groups'}`;
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
deleted file mode 100644
index 10d7ad01cf..0000000000
--- a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ajax } from 'discourse/lib/ajax';
-export default Ember.Controller.extend({
-  sortedGroups: Ember.computed.sort('model', 'groupSorting'),
-  groupSorting: ['name'],
-
-  refreshingAutoGroups: false,
-
-  isAuto: Ember.computed.equal('type', 'automatic'),
-
-  actions: {
-    refreshAutoGroups() {
-      this.set('refreshingAutoGroups', true);
-      ajax('/admin/groups/refresh_automatic_groups', {type: 'POST'}).then(() => {
-        this.transitionToRoute("adminGroupsType", "automatic").then(() => {
-          this.set('refreshingAutoGroups', false);
-        });
-      });
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index b80dd29cec..ee49a1c119 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -24,9 +24,13 @@ export default Ember.Controller.extend(CanCheckEmails, {
     'model.can_disable_second_factor'
   ),
 
-  automaticGroups: function() {
-    return this.get("model.automaticGroups").map((g) => g.name).join(", ");
-  }.property("model.automaticGroups"),
+  @computed("model.automaticGroups")
+  automaticGroups(automaticGroups) {
+    return automaticGroups.map(group => {
+      const name = Ember.String.htmlSafe(group.name);
+      return `<a href="/groups/${name}">${name}</a>`;
+    }).join(", ");
+  },
 
   userFields: function() {
     const siteUserFields = this.site.get('user_fields'),
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
index bd11f15fcf..9e899c4296 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -10,11 +10,11 @@ export default Ember.Controller.extend({
     return (this.get('adminWatchedWords.model') || []).findBy('nameKey', actionName);
   },
 
-  @computed('adminWatchedWords.model', 'actionNameKey')
-  filteredContent() {
-    if (!this.get('actionNameKey')) { return []; }
+  @computed('actionNameKey', 'adminWatchedWords.model')
+  filteredContent(actionNameKey) {
+    if (!actionNameKey) { return []; }
 
-    const a = this.findAction(this.get('actionNameKey'));
+    const a = this.findAction(actionNameKey);
     return a ? a.words : [];
   },
 
@@ -23,6 +23,12 @@ export default Ember.Controller.extend({
     return I18n.t('admin.watched_words.action_descriptions.' + actionNameKey);
   },
 
+  @computed('actionNameKey', 'adminWatchedWords.model')
+  wordCount(actionNameKey) {
+    const a = this.findAction(actionNameKey);
+    return a ? a.words.length : 0;
+  },
+
   actions: {
     recordAdded(arg) {
       const a = this.findAction(this.get('actionNameKey'));
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
index 7bbdaa3de5..56e43ccbd8 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
@@ -3,9 +3,13 @@ import { ajax } from 'discourse/lib/ajax';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 
+const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];
+
 export default Ember.Controller.extend(ModalFunctionality, {
   adminCustomizeThemesShow: Ember.inject.controller(),
 
+  uploadUrl: '/admin/themes/upload_asset',
+
   onShow() {
     this.set('name', null);
     this.set('fileSelected', false);
@@ -14,9 +18,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
   enabled: Em.computed.and('nameValid', 'fileSelected'),
   disabled: Em.computed.not('enabled'),
 
-  @computed('name')
-  nameValid(name) {
-    return name && name.match(/^[a-z_][a-z0-9_-]*$/i);
+  @computed('name', 'adminCustomizeThemesShow.model.theme_fields')
+  nameValid(name, themeFields) {
+    return name &&
+           name.match(/^[a-z_][a-z0-9_-]*$/i) &&
+           !themeFields.some(tf => THEME_FIELD_VARIABLE_TYPE_IDS.includes(tf.type_id) && name === tf.name);
   },
 
   @observes('name')
@@ -48,7 +54,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
       options.data.append('file', file);
 
-      ajax('/admin/themes/upload_asset', options).then(result => {
+      ajax(this.get('uploadUrl'), options).then(result => {
         const upload = {
           upload_id: result.upload_id,
           name: this.get('name'),
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
index 950df15a84..e1076667b9 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
@@ -9,6 +9,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
   selection: 'local',
   adminCustomizeThemes: Ember.inject.controller(),
   loading: false,
+  keyGenUrl: '/admin/themes/generate_key_pair',
+  importUrl: '/admin/themes/import',
 
   checkPrivate: Ember.computed.match('uploadUrl', /^git/),
 
@@ -17,7 +19,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     const checked = this.get('privateChecked');
     if (checked && !this._keyLoading) {
       this._keyLoading = true;
-      ajax('/admin/themes/generate_key_pair', {method: 'POST'})
+      ajax(this.get('keyGenUrl'), {method: 'POST'})
         .then(pair => {
           this.set('privateKey', pair.private_key);
           this.set('publicKey', pair.public_key);
@@ -52,7 +54,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       }
 
       this.set('loading', true);
-      ajax('/admin/themes/import', options).then(result=>{
+      ajax(this.get('importUrl'), options).then(result=>{
         const theme = this.store.createRecord('theme',result.theme);
         this.get('adminCustomizeThemes').send('addTheme', theme);
         this.send('closeModal');
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index af078528b7..3ed442bb0d 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -2,6 +2,7 @@ import { ajax } from 'discourse/lib/ajax';
 import round from "discourse/lib/round";
 import { fmt } from 'discourse/lib/computed';
 import { fillMissingDates } from 'discourse/lib/utilities';
+import computed from 'ember-addons/ember-computed-decorators';
 
 const Report = Discourse.Model.extend({
   reportUrl: fmt("type", "/admin/reports/%@"),
@@ -42,7 +43,8 @@ const Report = Discourse.Model.extend({
   lastSevenDaysCount:  function() { return this.valueFor(1, 7); }.property("data"),
   lastThirtyDaysCount: function() { return this.valueFor(1, 30); }.property("data"),
 
-  yesterdayTrend: function() {
+  @computed('data')
+  yesterdayTrend() {
     const yesterdayVal = this.valueAt(1);
     const twoDaysAgoVal = this.valueAt(2);
     if (yesterdayVal > twoDaysAgoVal) {
@@ -52,9 +54,10 @@ const Report = Discourse.Model.extend({
     } else {
       return "no-change";
     }
-  }.property("data"),
+  },
 
-  sevenDayTrend: function() {
+  @computed('data')
+  sevenDayTrend() {
     const currentPeriod = this.valueFor(1, 7);
     const prevPeriod = this.valueFor(8, 14);
     if (currentPeriod > prevPeriod) {
@@ -64,36 +67,39 @@ const Report = Discourse.Model.extend({
     } else {
       return "no-change";
     }
-  }.property("data"),
+  },
 
-  thirtyDayTrend: function() {
-    if (this.get("prev30Days")) {
+  @computed('prev30Days', 'data')
+  thirtyDayTrend(prev30Days) {
+    if (prev30Days) {
       const currentPeriod = this.valueFor(1, 30);
       if (currentPeriod > this.get("prev30Days")) {
         return "trending-up";
-      } else if (currentPeriod < this.get("prev30Days")) {
+      } else if (currentPeriod < prev30Days) {
         return "trending-down";
       }
     }
     return "no-change";
-  }.property("data", "prev30Days"),
+  },
 
-  icon: function() {
-    switch (this.get("type")) {
+  @computed('type')
+  icon(type) {
+    switch (type) {
       case "flags": return "flag";
       case "likes": return "heart";
       case "bookmarks": return "bookmark";
       default: return null;
     }
-  }.property("type"),
+  },
 
-  method: function() {
-    if (this.get("type") === "time_to_first_response") {
+  @computed('type')
+  method(type) {
+    if (type === "time_to_first_response") {
       return "average";
     } else {
       return "sum";
     }
-  }.property("type"),
+  },
 
   percentChangeString(val1, val2) {
     const val = ((val1 - val2) / val2) * 100;
@@ -114,21 +120,31 @@ const Report = Discourse.Model.extend({
     return title;
   },
 
-  yesterdayCountTitle: function() {
+  @computed('data')
+  yesterdayCountTitle() {
     return this.changeTitle(this.valueAt(1), this.valueAt(2), "two days ago");
-  }.property("data"),
+  },
 
-  sevenDayCountTitle: function() {
+  @computed('data')
+  sevenDayCountTitle() {
     return this.changeTitle(this.valueFor(1, 7), this.valueFor(8, 14), "two weeks ago");
-  }.property("data"),
+  },
 
-  thirtyDayCountTitle: function() {
-    return this.changeTitle(this.valueFor(1, 30), this.get("prev30Days"), "in the previous 30 day period");
-  }.property("data"),
+  @computed('prev30Days', 'data')
+  thirtyDayCountTitle(prev30Days) {
+    return this.changeTitle(this.valueFor(1, 30), prev30Days, "in the previous 30 day period");
+  },
 
-  dataReversed: function() {
-    return this.get("data").toArray().reverse();
-  }.property("data")
+  @computed('data')
+  sortedData(data) {
+    return this.get('xAxisIsDate') ? data.toArray().reverse() : data.toArray();
+  },
+
+  @computed('data')
+  xAxisIsDate() {
+    if (!this.data[0]) return false;
+    return this.data && this.data[0].x.match(/\d{4}-\d{1,2}-\d{1,2}/);
+  }
 
 });
 
@@ -145,13 +161,21 @@ Report.reopenClass({
     }).then(json => {
       // Add zero values for missing dates
       if (json.report.data.length > 0) {
-        const startDateFormatted = moment(json.report.start_date).format('YYYY-MM-DD');
-        const endDateFormatted = moment(json.report.end_date).format('YYYY-MM-DD');
+        const startDateFormatted = moment(json.report.start_date).utc().format('YYYY-MM-DD');
+        const endDateFormatted = moment(json.report.end_date).utc().format('YYYY-MM-DD');
         json.report.data = fillMissingDates(json.report.data, startDateFormatted, endDateFormatted);
       }
 
       const model = Report.create({ type: type });
       model.setProperties(json.report);
+
+      if (json.report.related_report) {
+        // TODO: fillMissingDates if xaxis is date
+        const related = Report.create({ type: json.report.related_report.type });
+        related.setProperties(json.report.related_report);
+        model.set('relatedReport', related);
+      }
+
       return model;
     });
   }
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index d2a82defec..d7c5a89fd0 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -2,10 +2,11 @@ import RestModel from 'discourse/models/rest';
 import { default as computed } from 'ember-addons/ember-computed-decorators';
 
 const THEME_UPLOAD_VAR = 2;
-const FIELDS_IDS = [0, 1];
 
 const Theme = RestModel.extend({
 
+  FIELDS_IDS: [0, 1],
+
   @computed('theme_fields')
   themeFields(fields) {
 
@@ -16,7 +17,7 @@ const Theme = RestModel.extend({
 
     let hash = {};
     fields.forEach(field => {
-      if (!field.type_id || FIELDS_IDS.includes(field.type_id)) {
+      if (!field.type_id || this.get('FIELDS_IDS').includes(field.type_id)) {
         hash[this.getKey(field)] = field;
       }
     });
diff --git a/app/assets/javascripts/admin/routes/admin-group.js.es6 b/app/assets/javascripts/admin/routes/admin-group.js.es6
deleted file mode 100644
index 0009f834e1..0000000000
--- a/app/assets/javascripts/admin/routes/admin-group.js.es6
+++ /dev/null
@@ -1,24 +0,0 @@
-import Group from 'discourse/models/group';
-
-export default Discourse.Route.extend({
-
-  model(params) {
-    if (params.name === 'new') {
-      return Group.create({ automatic: false, visibility_level: 0 });
-    }
-
-    const group = this.modelFor('adminGroupsType').findBy('name', params.name);
-
-    if (!group) { return this.transitionTo('adminGroups.index'); }
-
-    return group;
-  },
-
-  setupController(controller, model) {
-    controller.set("model", model);
-    controller.set("model.usernames", null);
-    controller.set("savingStatus", "");
-    model.findMembers();
-  }
-
-});
diff --git a/app/assets/javascripts/admin/routes/admin-groups-bulk.js.es6 b/app/assets/javascripts/admin/routes/admin-groups-bulk.js.es6
deleted file mode 100644
index 8d9554556f..0000000000
--- a/app/assets/javascripts/admin/routes/admin-groups-bulk.js.es6
+++ /dev/null
@@ -1,13 +0,0 @@
-import Group from 'discourse/models/group';
-
-export default Ember.Route.extend({
-  model() {
-    return Group.findAll().then(groups => {
-      return groups.filter(g => !g.get('automatic'));
-    });
-  },
-
-  setupController(controller, groups) {
-    controller.setProperties({ groups, groupId: null, users: null });
-  }
-});
diff --git a/app/assets/javascripts/admin/routes/admin-groups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-groups-index.js.es6
deleted file mode 100644
index e650d150fb..0000000000
--- a/app/assets/javascripts/admin/routes/admin-groups-index.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-export default Discourse.Route.extend({
-  redirect: function() {
-    this.transitionTo("adminGroupsType", "custom");
-  }
-});
diff --git a/app/assets/javascripts/admin/routes/admin-groups-type.js.es6 b/app/assets/javascripts/admin/routes/admin-groups-type.js.es6
deleted file mode 100644
index 52e383bf9a..0000000000
--- a/app/assets/javascripts/admin/routes/admin-groups-type.js.es6
+++ /dev/null
@@ -1,15 +0,0 @@
-import Group from 'discourse/models/group';
-
-export default Discourse.Route.extend({
-  model(params) {
-    this.set("type", params.type);
-    return Group.findAll().then(function(groups) {
-      return groups.filterBy("type", params.type);
-    });
-  },
-
-  setupController(controller, model){
-    controller.set("type", this.get("type"));
-    controller.set("model", model);
-  }
-});
diff --git a/app/assets/javascripts/admin/routes/admin-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-reports.js.es6
index 65771110e8..acddcff5d6 100644
--- a/app/assets/javascripts/admin/routes/admin-reports.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-reports.js.es6
@@ -12,8 +12,8 @@ export default Discourse.Route.extend({
       model: model,
       categoryId: (model.get('category_id') || 'all'),
       groupId: model.get('group_id'),
-      startDate: moment(model.get('start_date')).format('YYYY-MM-DD'),
-      endDate: moment(model.get('end_date')).format('YYYY-MM-DD')
+      startDate: moment(model.get('start_date')).utc().format('YYYY-MM-DD'),
+      endDate: moment(model.get('end_date')).utc().format('YYYY-MM-DD')
     });
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
index a6ccabc810..b4926b9a5a 100644
--- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
@@ -76,14 +76,6 @@ export default function() {
       });
     });
 
-    this.route('adminGroups', { path: '/groups', resetNamespace: true }, function() {
-      this.route('bulk');
-      this.route('bulkComplete', { path: 'bulk-complete' });
-      this.route('adminGroupsType', { path: '/:type', resetNamespace: true }, function() {
-        this.route('adminGroup', { path: '/:name', resetNamespace: true });
-      });
-    });
-
     this.route('adminUsers', { path: '/users', resetNamespace: true }, function() {
       this.route('adminUser', { path: '/:user_id/:username', resetNamespace: true }, function() {
         this.route('badges');
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index 7cea833c78..092133b7c1 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -12,7 +12,6 @@
           {{nav-item route='adminBadges' label='admin.badges.title'}}
         {{/if}}
         {{#if currentUser.admin}}
-          {{nav-item route='adminGroups' label='admin.groups.title'}}
           {{nav-item route='adminEmail' label='admin.email.title'}}
         {{/if}}
         {{nav-item route='adminFlags' label='admin.flags.title'}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-table-report.hbs b/app/assets/javascripts/admin/templates/components/admin-table-report.hbs
new file mode 100644
index 0000000000..53ea2e51c6
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-table-report.hbs
@@ -0,0 +1,17 @@
+{{#if model.sortedData}}
+  <table class="table report {{model.type}}">
+    <tr>
+      <th>{{model.xaxis}}</th>
+      <th>{{model.yaxis}}</th>
+    </tr>
+
+    {{#each model.sortedData as |row|}}
+      <tr>
+        <td class="x-value">{{row.x}}</td>
+        <td>
+          {{row.y}}
+        </td>
+      </tr>
+    {{/each}}
+  </table>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs b/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs
index 161a8f9f92..0871c5c6f1 100644
--- a/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs
+++ b/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs
@@ -3,3 +3,6 @@
 {{/if}}
 {{topic-status topic=flaggedPost.topic}}
 <a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
+{{#if flaggedPost.reply_count}}
+  <span class="flagged-post-reply-count">{{i18n 'admin.flags.replies' count=flaggedPost.reply_count}}</span>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
deleted file mode 100644
index c10ca20bb3..0000000000
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ /dev/null
@@ -1,173 +0,0 @@
-<form class="form-horizontal">
-
-  <div>
-    {{#if model.automatic}}
-      <h3>{{model.name}}</h3>
-    {{else}}
-      <label for="name">{{i18n 'groups.name'}}</label>
-      {{text-field name="name" value=model.name placeholderKey="groups.name_placeholder"}}
-    {{/if}}
-  </div>
-
-  {{#unless model.automatic}}
-    <div>
-      <label for='full_name'>{{i18n 'groups.edit.full_name'}}</label>
-      {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
-    </div>
-
-    <div>
-      <label for="bio">{{i18n 'groups.bio'}}</label>
-      {{d-editor value=model.bio_raw}}
-    </div>
-
-    {{#if model.hasOwners}}
-      <div>
-        <label for='owner-list'>{{i18n 'admin.groups.group_owners'}}</label>
-        <div class="ac-wrap clearfix" id='owner-list'>
-          {{#each model.owners as |member|}}
-            {{group-member member=member removeAction="removeOwner"}}
-          {{/each}}
-        </div>
-      </div>
-    {{/if}}
-
-    <div>
-      <label for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
-
-      {{user-selector usernames=model.ownerUsernames
-          placeholderKey="groups.selector_placeholder"
-          id="owner-selector"}}
-
-      {{#if model.id}}
-        {{d-button
-            action="addOwners"
-            class="add"
-            icon="plus"
-            label="admin.groups.add"}}
-      {{/if}}
-    </div>
-  {{/unless}}
-
-  <div>
-    {{group-members-input model=model addButton=model.id}}
-  </div>
-
-  <div>
-    <label for="visiblity">{{i18n 'groups.visibility_levels.title'}}</label>
-    {{combo-box name="alias"
-        valueAttribute="value"
-        value=model.visibility_level
-        content=visibilityLevelOptions
-        castInteger=true}}
-  </div>
-
-  {{#unless model.automatic}}
-    <div>
-      <label>
-        {{input type="checkbox"
-            checked=model.public_admission
-            disabled=disablePublicSetting}}
-
-        {{i18n 'groups.public_admission'}}
-      </label>
-    </div>
-
-    <div>
-      <label>
-        {{input type='checkbox'
-            checked=model.public_exit}}
-
-        {{i18n 'groups.public_exit'}}
-      </label>
-    </div>
-
-    <div>
-      <label>
-        {{input type="checkbox"
-            checked=model.allow_membership_requests
-            disabled=disableMembershipRequestSetting}}
-
-        {{i18n 'groups.allow_membership_requests'}}
-      </label>
-    </div>
-
-    {{#if model.allow_membership_requests}}
-      <div>
-        <label for="membership-request-template">
-          {{i18n 'groups.membership_request_template'}}
-        </label>
-
-        {{expanding-text-area name="membership-request-template"
-            value=model.membership_request_template}}
-      </div>
-    {{/if}}
-
-    <div>
-      <label>
-        {{input type="checkbox" checked=model.primary_group}}
-        {{i18n 'admin.groups.primary_group'}}
-      </label>
-    </div>
-  {{/unless}}
-
-  <div>
-    <label for="alias">{{i18n 'groups.alias_levels.mentionable'}}</label>
-    {{combo-box name="alias" valueAttribute="value" value=model.mentionable_level content=aliasLevelOptions}}
-  </div>
-
-  <div>
-    <label for="alias">{{i18n 'groups.alias_levels.messageable'}}</label>
-    {{combo-box name="alias" valueAttribute="value" value=model.messageable_level content=aliasLevelOptions}}
-  </div>
-
-  <div>
-    <label>{{i18n 'groups.notification_level'}}</label>
-    {{notifications-button i18nPrefix='groups.notifications' value=model.default_notification_level}}
-    <div class='clearfix'></div>
-  </div>
-
-  {{#unless model.automatic}}
-    <div>
-      <label for="automatic_membership">{{i18n 'admin.groups.automatic_membership_email_domains'}}</label>
-      {{list-setting name="automatic_membership" settingValue=model.emailDomains}}
-      <label>
-        {{input type="checkbox" checked=model.automatic_membership_retroactive}}
-        {{i18n 'admin.groups.automatic_membership_retroactive'}}
-      </label>
-    </div>
-
-    <div>
-      <label for="title">
-        {{i18n 'admin.groups.default_title'}}
-      </label>
-        {{input value=model.title}}
-    </div>
-
-    <div>
-      <label for="grant_trust_level">{{i18n 'groups.trust_levels.title'}}</label>
-      {{combo-box name="grant_trust_level" valueAttribute="value" value=model.grant_trust_level content=trustLevelOptions}}
-    </div>
-
-    {{#if siteSettings.email_in}}
-        <label for="incoming_email">{{i18n 'admin.groups.incoming_email'}}</label>
-        {{text-field name="incoming_email" value=model.incoming_email placeholderKey="admin.groups.incoming_email_placeholder"}}
-      {{plugin-outlet name="group-email-in" args=(hash model=model)}}
-    {{/if}}
-  {{/unless}}
-
-  {{#unless model.automatic}}
-    {{group-flair-inputs model=model}}
-  {{/unless}}
-
-  {{plugin-outlet name="group-edit" args=(hash group=model)}}
-
-  <div class='buttons'>
-    <button {{action "save"}} disabled={{disableSave}} class='btn btn-primary'>{{i18n 'admin.customize.save'}}</button>
-    {{#unless model.automatic}}
-      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}}{{i18n 'admin.customize.delete'}}</button>
-    {{/unless}}
-
-    <span class="saving {{unless savingStatus 'hidden'}}">{{savingStatus}}</span>
-  </div>
-
-</form>
diff --git a/app/assets/javascripts/admin/templates/groups-bulk-complete.hbs b/app/assets/javascripts/admin/templates/groups-bulk-complete.hbs
deleted file mode 100644
index 6a2d8b13e5..0000000000
--- a/app/assets/javascripts/admin/templates/groups-bulk-complete.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-{{#if bulkAddResponse}}
-  <p>{{{bulkAddResponse.message}}}</p>
-  {{#if bulkAddResponse.users_not_added}}
-    <p>{{i18n "admin.groups.bulk_complete_users_not_added"}}</p>
-    {{#each bulkAddResponse.users_not_added as |user|}}
-      {{user}}<br/>
-    {{/each}}
-  {{/if}}
-{{else}}
-  <p>{{i18n "admin.groups.bulk_complete"}}</p>
-{{/if}}
diff --git a/app/assets/javascripts/admin/templates/groups-bulk.hbs b/app/assets/javascripts/admin/templates/groups-bulk.hbs
deleted file mode 100644
index 337ab37cb3..0000000000
--- a/app/assets/javascripts/admin/templates/groups-bulk.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class='groups-bulk'>
-  <p>{{i18n "admin.groups.bulk_paste"}}</p>
-
-  <div class='control'>
-    {{textarea value=users class="paste-users"}}
-  </div>
-
-  <div class='control'>
-    {{combo-box filterable=true content=groups value=groupId none="admin.groups.bulk_select"}}
-  </div>
-
-  <div class='control'>
-    {{d-button disabled=buttonDisabled
-               class="btn-primary"
-               action="addToGroup"
-               icon="plus"
-               label="admin.groups.bulk"}}
-  </div>
-</div>
diff --git a/app/assets/javascripts/admin/templates/groups-type-index.hbs b/app/assets/javascripts/admin/templates/groups-type-index.hbs
deleted file mode 100644
index 196ded96d2..0000000000
--- a/app/assets/javascripts/admin/templates/groups-type-index.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="groups-type-index">
-  <p>{{i18n messageKey}}</p>
-
-  <div>
-    {{#link-to 'adminGroup' 'new' class="btn"}}
-      {{d-icon "plus"}} {{i18n 'admin.groups.new'}}
-    {{/link-to}}
-  </div>
-</div>
diff --git a/app/assets/javascripts/admin/templates/groups-type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs
deleted file mode 100644
index 47bbb1c51e..0000000000
--- a/app/assets/javascripts/admin/templates/groups-type.hbs
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class='row groups'>
-  {{#if sortedGroups}}
-    <div class='content-list'>
-      <h3>{{i18n 'admin.groups.edit'}}</h3>
-      <ul>
-        {{#each sortedGroups as |group|}}
-          <li>
-            {{#link-to "adminGroup" group.type group.name}}{{group.name}}
-              {{#if group.userCountDisplay}}
-                <span class="count">{{number group.userCountDisplay}}</span>
-              {{/if}}
-            {{/link-to}}
-          </li>
-        {{/each}}
-      </ul>
-      <div class='controls'>
-        {{#if isAuto}}
-          {{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
-        {{else}}
-          {{#link-to 'adminGroup' 'new' class="btn"}}
-            {{d-icon "plus"}} {{i18n 'admin.groups.new'}}
-          {{/link-to}}
-        {{/if}}
-      </div>
-    </div>
-  {{/if}}
-
-  <div class="content-body">
-    {{outlet}}
-  </div>
-</div>
diff --git a/app/assets/javascripts/admin/templates/groups.hbs b/app/assets/javascripts/admin/templates/groups.hbs
deleted file mode 100644
index aa7d9213ca..0000000000
--- a/app/assets/javascripts/admin/templates/groups.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#admin-nav}}
-  {{nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom'}}
-  {{nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic'}}
-  {{nav-item route='adminGroups.bulk' label='admin.groups.bulk'}}
-{{/admin-nav}}
-
-<div class="admin-container">
-  {{outlet}}
-</div>
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index b7d64f2a34..dc5405471b 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -14,6 +14,7 @@
   <table class="admin-plugins">
     <thead>
       <tr>
+        <th></th>
         <th>{{i18n "admin.plugins.name"}}</th>
         <th>{{i18n "admin.plugins.version"}}</th>
         <th>{{i18n "admin.plugins.enabled"}}</th>
@@ -23,6 +24,14 @@
     <tbody>
       {{#each model as |plugin|}}
         <tr>
+          <td>
+            {{#if plugin.is_official}}
+              {{d-icon "check-circle"
+                  title="admin.plugins.official"
+                  class="admin-plugins-official-badge"}}
+            {{/if}}
+          </td>
+
           <td>
             {{#if plugin.url}}
               <a href={{plugin.url}} target="_blank">{{plugin.name}}</a>
@@ -58,4 +67,3 @@
 {{/if}}
 
 <p><a href="https://meta.discourse.org/t/install-a-plugin/19157">{{i18n "admin.plugins.howto"}}</a></p>
-
diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs
index 3927d1e384..1a6b4bf047 100644
--- a/app/assets/javascripts/admin/templates/reports.hbs
+++ b/app/assets/javascripts/admin/templates/reports.hbs
@@ -31,20 +31,10 @@
   {{#if viewingGraph}}
     {{admin-graph model=model}}
   {{else}}
-  <table class='table report'>
-    <tr>
-      <th>{{model.xaxis}}</th>
-      <th>{{model.yaxis}}</th>
-    </tr>
+    {{admin-table-report model=model}}
+  {{/if}}
 
-    {{#each model.dataReversed as |row|}}
-      <tr>
-        <td>{{row.x}}</td>
-        <td>
-          {{row.y}}
-        </td>
-      </tr>
-    {{/each}}
-  </table>
+  {{#if model.relatedReport}}
+    {{admin-table-report model=model.relatedReport}}
   {{/if}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index a09048c759..b1e164a01b 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -56,6 +56,8 @@
     </div>
   </div>
 
+  {{plugin-outlet name="admin-user-below-names" args=(hash user=model) tagName='' connectorTagName=''}}
+
   {{#if canCheckEmails}}
     <div class='display-row email'>
       <div class='field'>{{i18n 'user.email.title'}}</div>
@@ -199,8 +201,8 @@
       <div class='value'>
         {{#if model.approved}}
           {{i18n 'admin.user.approved_by'}}
-          {{#link-to 'adminUser' approvedBy}}{{avatar model.approvedBy imageSize="small"}}{{/link-to}}
-          {{#link-to 'adminUser' approvedBy}}{{model.approvedBy.username}}{{/link-to}}
+          {{#link-to 'adminUser' model.approvedBy}}{{avatar model.approvedBy imageSize="small"}}{{/link-to}}
+          {{#link-to 'adminUser' model.approvedBy}}{{model.approvedBy.username}}{{/link-to}}
         {{else}}
           {{i18n 'no_value'}}
         {{/if}}
@@ -351,8 +353,8 @@
     <div class='display-row highlight-danger suspension-info'>
       <div class='field'>{{i18n 'admin.user.suspended_by'}}</div>
       <div class='value'>
-        {{#link-to 'adminUser' suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}}
-        {{#link-to 'adminUser' suspendedBy}}{{model.suspendedBy.username}}{{/link-to}}
+        {{#link-to 'adminUser' model.suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}}
+        {{#link-to 'adminUser' model.suspendedBy}}{{model.suspendedBy.username}}{{/link-to}}
       </div>
       <div class='controls'>
         <b>{{i18n 'admin.user.suspend_reason'}}</b>:
@@ -396,8 +398,8 @@
     <div class='display-row highlight-danger silence-info'>
       <div class='field'>{{i18n 'admin.user.silenced_by'}}</div>
       <div class='value'>
-        {{#link-to 'adminUser' silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}}
-        {{#link-to 'adminUser' silencedBy}}{{model.silencedBy.username}}{{/link-to}}
+        {{#link-to 'adminUser' model.silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}}
+        {{#link-to 'adminUser' model.silencedBy}}{{model.silencedBy.username}}{{/link-to}}
       </div>
       <div class='controls'>
         <b>{{i18n 'admin.user.silence_reason'}}</b>:
@@ -413,7 +415,7 @@
     <h1>{{i18n 'admin.groups.title'}}</h1>
       <div class='display-row'>
         <div class='field'>{{i18n 'admin.groups.automatic'}}</div>
-        <div class='value'>{{automaticGroups}}</div>
+        <div class='value'>{{{automaticGroups}}}</div>
       </div>
       <div class='display-row'>
         <div class='field'>{{i18n 'admin.groups.custom'}}</div>
diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
index d58f1a9430..ac0bc4175b 100644
--- a/app/assets/javascripts/admin/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -22,6 +22,6 @@
       <div class="watched-word-box">{{admin-watched-word word=word action="recordRemoved"}}</div>
     {{/each}}
   {{else}}
-    {{i18n 'admin.watched_words.word_count' count=model.words.length}}
+    {{i18n 'admin.watched_words.word_count' count=wordCount}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
index 4b547a6882..2900e5d670 100644
--- a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
@@ -18,13 +18,15 @@ RawHandlebars.helpers['get'] = function(context, options) {
   var firstContext =  options.contexts[0];
   var val = firstContext[context];
 
-  if (context.indexOf('controller') === 0) {
-    context = context.replace(/^controller\./, '');
+  if (context.indexOf('controller.') === 0) {
+    context = context.slice(context.indexOf('.') + 1);
   }
 
-  if (val && val.isDescriptor) { return Em.get(firstContext, context); }
-  val = val === undefined ? Em.get(firstContext, context): val;
-  return val;
+  if (val && val.isDescriptor) {
+    return Em.get(firstContext, context);
+  }
+
+  return val === undefined ? Em.get(firstContext, context) : val;
 };
 
 // adds compatability so this works with stringParams
diff --git a/app/assets/javascripts/discourse/adapters/group.js.es6 b/app/assets/javascripts/discourse/adapters/group.js.es6
new file mode 100644
index 0000000000..34134b50ea
--- /dev/null
+++ b/app/assets/javascripts/discourse/adapters/group.js.es6
@@ -0,0 +1,7 @@
+import RestAdapter from 'discourse/adapters/rest';
+
+export default RestAdapter.extend({
+  appendQueryParams(path, findArgs) {
+    return this._super(path, findArgs, '.json');
+  },
+});
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6
index c826bbefc9..e33a755970 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js.es6
+++ b/app/assets/javascripts/discourse/adapters/rest.js.es6
@@ -40,7 +40,7 @@ export default Ember.Object.extend({
     return "/";
   },
 
-  appendQueryParams(path, findArgs) {
+  appendQueryParams(path, findArgs, extension) {
     if (findArgs) {
       if (typeof findArgs === "object") {
         const queryString = Object.keys(findArgs)
@@ -48,11 +48,11 @@ export default Ember.Object.extend({
                                   .map(k => k + "=" + encodeURIComponent(findArgs[k]));
 
         if (queryString.length) {
-          return path + "?" + queryString.join('&');
+          return `${path}${extension ? extension : ''}?${queryString.join('&')}`;
         }
       } else {
         // It's serializable as a string if not an object
-        return path + "/" + findArgs;
+        return `${path}/${findArgs}${extension ? extension : ''}`;
       }
     }
     return path;
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
index e867e6ab78..3f9483595f 100644
--- a/app/assets/javascripts/discourse/components/composer-action-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
@@ -1,11 +1,19 @@
 import { default as computed } from 'ember-addons/ember-computed-decorators';
-import { PRIVATE_MESSAGE, CREATE_TOPIC, CREATE_SHARED_DRAFT, REPLY, EDIT } from "discourse/models/composer";
+import {
+  PRIVATE_MESSAGE,
+  CREATE_TOPIC,
+  CREATE_SHARED_DRAFT,
+  REPLY,
+  EDIT,
+  EDIT_SHARED_DRAFT
+} from "discourse/models/composer";
 import { iconHTML } from 'discourse-common/lib/icon-library';
 
 const TITLES = {
   [PRIVATE_MESSAGE]: 'topic.private_message',
   [CREATE_TOPIC]: 'topic.create_long',
-  [CREATE_SHARED_DRAFT]: 'composer.create_shared_draft'
+  [CREATE_SHARED_DRAFT]: 'composer.create_shared_draft',
+  [EDIT_SHARED_DRAFT]: 'composer.edit_shared_draft'
 };
 
 export default Ember.Component.extend({
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 86a9b02e50..43d33da68f 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -37,10 +37,19 @@ export default Ember.Component.extend({
     return `[${I18n.t('uploading')}]() `;
   },
 
-  @computed()
-  replyPlaceholder() {
-    const key = authorizesOneOrMoreImageExtensions() ? "reply_placeholder" : "reply_placeholder_no_images";
-    return `composer.${key}`;
+  @computed('composer.requiredCategoryMissing')
+  replyPlaceholder(requiredCategoryMissing) {
+    if (requiredCategoryMissing) {
+      return 'composer.reply_placeholder_choose_category';
+    } else {
+      const key = authorizesOneOrMoreImageExtensions() ? "reply_placeholder" : "reply_placeholder_no_images";
+      return `composer.${key}`;
+    }
+  },
+
+  @computed('composer.requiredCategoryMissing', 'composer.replyLength')
+  disableTextarea(requiredCategoryMissing, replyLength) {
+    return requiredCategoryMissing && replyLength === 0;
   },
 
   @observes('composer.uploadCancelled')
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 23d5443b0c..9fc446930a 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -53,7 +53,11 @@ export default Ember.Component.extend({
     if (this.get('autoPosted') || !this.get('watchForLink')) { return; }
 
     if (Ember.testing) {
-      this._checkForUrl();
+      Em.run.next(() =>
+        // not ideal but we don't want to run this in current
+        // runloop to avoid an error in console
+        this._checkForUrl()
+      );
     } else {
       Ember.run.debounce(this, this._checkForUrl, 500);
     }
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index c56e1b6b34..464a434bf1 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -6,7 +6,7 @@ export default Ember.Component.extend({
 
   tagName: 'button',
   classNameBindings: [':btn', 'noText', 'btnType'],
-  attributeBindings: ['disabled', 'translatedTitle:title', 'tabindex'],
+  attributeBindings: ['disabled', 'translatedTitle:title', 'translatedTitle:aria-label', 'tabindex'],
 
   btnIcon: Ember.computed.notEmpty('icon'),
 
@@ -23,7 +23,7 @@ export default Ember.Component.extend({
 
   @computed("title")
   translatedTitle(title) {
-    return title ? I18n.t(title) : this.get('translatedLabel');
+    if (title) return I18n.t(title);
   },
 
   @computed("label")
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index e59ac9d78f..c2811e5e5a 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -750,6 +750,8 @@ export default Ember.Component.extend({
     },
 
     toolbarButton(button) {
+      if (this.get('disabled')) { return; }
+
       const selected = this._getSelected(button.trimLeading);
       const toolbarEvent = {
         selected,
@@ -770,6 +772,8 @@ export default Ember.Component.extend({
     },
 
     showLinkModal() {
+      if (this.get('disabled')) { return; }
+
       this._lastSel = this._getSelected();
 
       if (this._lastSel) {
@@ -780,6 +784,8 @@ export default Ember.Component.extend({
     },
 
     formatCode() {
+      if (this.get('disabled')) { return; }
+
       const sel = this._getSelected('', { lineVal: true });
       const selValue = sel.value;
       const hasNewLine = selValue.indexOf("\n") !== -1;
@@ -833,6 +839,7 @@ export default Ember.Component.extend({
     },
 
     emoji() {
+      if (this.get('disabled')) { return; }
       this.set('emojiPickerIsActive', !this.get('emojiPickerIsActive'));
     }
   }
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
index ce4113450b..bb6cb51fe8 100644
--- a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -34,7 +34,7 @@ export default Ember.Component.extend({
 
     if (flairHexColor) style += `color: #${flairHexColor};`;
 
-    return style;
+    return Ember.String.htmlSafe(style);
   },
 
   @computed('model.flairBackgroundHexColor')
diff --git a/app/assets/javascripts/discourse/components/group-logs-filter.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
similarity index 89%
rename from app/assets/javascripts/discourse/components/group-logs-filter.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
index ba4ccc3f74..d598bc568f 100644
--- a/app/assets/javascripts/discourse/components/group-logs-filter.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
@@ -5,7 +5,7 @@ export default Ember.Component.extend({
 
   @computed('type')
   label(type) {
-    return I18n.t(`groups.logs.${type}`);
+    return I18n.t(`groups.manage.logs.${type}`);
   },
 
   @computed('value', 'type')
diff --git a/app/assets/javascripts/discourse/components/group-logs-row.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
similarity index 100%
rename from app/assets/javascripts/discourse/components/group-logs-row.js.es6
rename to app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6 b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
new file mode 100644
index 0000000000..1055dc8913
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
@@ -0,0 +1,25 @@
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  saving: null,
+
+  @computed('saving')
+  savingText(saving) {
+    if (saving) return I18n.t("saving");
+    return saving ? I18n.t("saving") : I18n.t("save");
+  },
+
+  actions: {
+    save() {
+      this.set('saving', true);
+
+      return this.get('model').save()
+        .then(() => {
+          this.set("saved", true);
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set('saving', false));
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
index 92ad1966ec..0ba9bb5d1c 100644
--- a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
@@ -5,7 +5,7 @@ import computed from "ember-addons/ember-computed-decorators";
 export default DropdownButton.extend({
   buttonExtraClasses: 'no-text',
   title: '',
-  text: iconHTML('ellipsis-h'),
+  text: iconHTML('wrench'),
   classNames: ['group-member-dropdown'],
 
   @computed("member.owner")
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index 691eb051bb..1bb3ca048d 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -55,7 +55,7 @@ export default Ember.Component.extend({
     },
 
     removeMember(member) {
-      const message = I18n.t("groups.edit.delete_member_confirm",{
+      const message = I18n.t("groups.manage.delete_member_confirm",{
         username: member.get("username"),
         group: this.get("model.name")
       });
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
index 167eade276..52478ada28 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -3,6 +3,8 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 import showModal from 'discourse/lib/show-modal';
 
 export default Ember.Component.extend({
+  classNames: ["group-membership-button"],
+
   @computed("model.public_admission", "userIsGroupUser")
   canJoinGroup(publicAdmission, userIsGroupUser) {
     return publicAdmission && !userIsGroupUser;
diff --git a/app/assets/javascripts/discourse/components/group-navigation-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-navigation-dropdown.js.es6
deleted file mode 100644
index 263fc426e4..0000000000
--- a/app/assets/javascripts/discourse/components/group-navigation-dropdown.js.es6
+++ /dev/null
@@ -1,25 +0,0 @@
-import DropdownSelectBox from "select-kit/components/dropdown-select-box";
-
-export default DropdownSelectBox.extend({
-  classNames: ["group-navigation-dropdown", "pull-right"],
-  nameProperty: "label",
-  headerIcon: ["bars"],
-  showFullTitle: false,
-
-  computeContent() {
-    const content = [];
-
-    content.push({
-      id: "manageMembership",
-      icon: "user-plus",
-      label: I18n.t("groups.add_members.title"),
-      description:  I18n.t("groups.add_members.description"),
-    });
-
-    return content;
-  },
-
-  mutateValue(value) {
-    this.get(value)(this.get('model'));
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
new file mode 100644
index 0000000000..8316c6069c
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
@@ -0,0 +1,23 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  visibilityLevelOptions: [
+    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.public"), value: 0 },
+    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.members"), value: 1 },
+    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.staff"), value: 2 },
+    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.owners"), value: 3 }
+  ],
+
+  aliasLevelOptions: [
+    { name: I18n.t("groups.alias_levels.nobody"), value: 0 },
+    { name: I18n.t("groups.alias_levels.only_admins"), value: 1 },
+    { name: I18n.t("groups.alias_levels.mods_and_admins"), value: 2 },
+    { name: I18n.t("groups.alias_levels.members_mods_and_admins"), value: 3 },
+    { name: I18n.t("groups.alias_levels.everyone"), value: 99 }
+  ],
+
+  @computed('siteSettings.email_in', 'model.automatic', 'currentUser.admin')
+  showEmailSettings(emailIn, automatic, isAdmin) {
+    return emailIn && isAdmin && !automatic;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
new file mode 100644
index 0000000000..e9c7e8a37e
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
@@ -0,0 +1,20 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  trustLevelOptions: [
+    { name: I18n.t("admin.groups.manage.membership.trust_levels_none"), value: 0 },
+    { name: 1, value: 1 }, { name: 2, value: 2 }, { name: 3, value: 3 }, { name: 4, value: 4 }
+  ],
+
+  @computed('model.visibility_level', 'model.public_admission')
+  disableMembershipRequestSetting(visibility_level, publicAdmission) {
+    visibility_level = parseInt(visibility_level);
+    return (visibility_level !== 0) || publicAdmission;
+  },
+
+  @computed('model.visibility_level', 'model.allow_membership_requests')
+  disablePublicSetting(visibility_level, allowMembershipRequests) {
+    visibility_level = parseInt(visibility_level);
+    return (visibility_level !== 0) || allowMembershipRequests;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
new file mode 100644
index 0000000000..c62f771098
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
@@ -0,0 +1,89 @@
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import User from "discourse/models/user";
+import InputValidation from 'discourse/models/input-validation';
+import debounce from 'discourse/lib/debounce';
+
+export default Ember.Component.extend({
+  disableSave: null,
+  nameInput: null,
+
+  didInsertElement() {
+    this._super();
+    const name = this.get('model.name');
+
+    if (name) {
+      this.set("nameInput", name);
+    } else {
+      this.set('disableSave', true);
+    }
+  },
+
+  @computed('basicNameValidation', 'uniqueNameValidation')
+  nameValidation(basicNameValidation, uniqueNameValidation) {
+    return uniqueNameValidation ? uniqueNameValidation : basicNameValidation;
+  },
+
+  @observes("nameInput")
+  _validateName() {
+    name = this.get('nameInput');
+    if (name === this.get('model.name')) return;
+
+    if (name === undefined) {
+      return this._failedInputValidation();
+    };
+
+    if (name === "") {
+      this.set('uniqueNameValidation', null);
+      return this._failedInputValidation(I18n.t('admin.groups.new.name.blank'));
+    }
+
+    if (name.length < this.siteSettings.min_username_length) {
+      return this._failedInputValidation(I18n.t('admin.groups.new.name.too_short'));
+    }
+
+    if (name.length > this.siteSettings.max_username_length) {
+      return this._failedInputValidation(I18n.t('admin.groups.new.name.too_long'));
+    }
+
+    this.checkGroupName();
+
+    return this._failedInputValidation(I18n.t('admin.groups.new.name.checking'));
+  },
+
+  checkGroupName: debounce(function() {
+    name = this.get('nameInput');
+    if (Ember.isEmpty(name)) return;
+
+    User.checkUsername(name).then(response => {
+      const validationName = 'uniqueNameValidation';
+
+      if (response.available) {
+        this.set(validationName, InputValidation.create({
+          ok: true,
+          reason: I18n.t('admin.groups.new.name.available')
+        }));
+
+        this.set('disableSave', false);
+        this.set('model.name', this.get('nameInput'));
+      } else {
+        let reason;
+
+        if (response.errors) {
+          reason = response.errors.join(' ');
+        } else {
+          reason = I18n.t('admin.groups.new.name.not_available');
+        }
+
+        this.set(validationName, this._failedInputValidation(reason));
+      }
+    });
+  }, 500),
+
+  _failedInputValidation(reason) {
+    this.set('disableSave', true);
+
+    const options = { failed: true };
+    if (reason) options.reason = reason;
+    this.set('basicNameValidation', InputValidation.create(options));
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index 888eb3c28c..5c3b21d3b2 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -3,9 +3,9 @@ import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
   tagName: 'li',
-  classNameBindings: ['active', 'content.hasIcon:has-icon', 'content.classNames'],
+  classNameBindings: ['active', 'content.hasIcon:has-icon', 'content.classNames', 'hidden'],
   attributeBindings: ['content.title:title'],
-  hidden: Em.computed.not('content.visible'),
+  hidden: false,
   rerenderTriggers: ['content.count'],
 
   @computed("content.filterMode", "filterMode")
@@ -27,6 +27,12 @@ export default Ember.Component.extend(bufferedRender({
       }
     }
 
+    if (!this.get('active') && this.currentUser && this.currentUser.trust_level > 0 && (content.get('name') === "new" || content.get('name') === "unread") && (content.get('count') < 1)) {
+      this.set('hidden', true);
+    } else {
+      this.set('hidden', false);
+    }
+
     buffer.push(`<a href='${href}'>`);
     if (content.get('hasIcon')) {
       buffer.push("<span class='" + content.get('name') + "'></span>");
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 74d6b378b7..79acf11184 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -54,8 +54,7 @@ export default MountWidget.extend({
     const scrollTop = $body.scrollTop();
 
     // This hack is for when swapping out many cloaked views at once
-    // when using keyboard navigation. It could suddenly move the
-    // scroll
+    // when using keyboard navigation. It could suddenly move the scroll
     if (this.prevHeight === height && scrollTop !== this.prevScrollTop) {
       $body.scrollTop(this.prevScrollTop);
     }
@@ -80,7 +79,7 @@ export default MountWidget.extend({
     const postsWrapperTop = $('.posts-wrapper').offset().top;
     const $posts = this.$('.onscreen-post, .cloaked-post');
     const viewportTop = windowTop - slack;
-    const topView = findTopView($posts, viewportTop, postsWrapperTop, 0, $posts.length-1);
+    const topView = findTopView($posts, viewportTop, postsWrapperTop, 0, $posts.length - 1);
 
     let windowBottom = windowTop + windowHeight;
     let viewportBottom = windowBottom + slack;
@@ -93,7 +92,7 @@ export default MountWidget.extend({
     let percent = null;
 
     const offset = offsetCalculator();
-    const topCheck = Math.ceil(windowTop + offset);
+    const topCheck = Math.ceil(windowTop + offset + 5);
 
     // uncomment to debug the eyeline
     /*
@@ -102,7 +101,7 @@ export default MountWidget.extend({
       $('body').prepend('<div class="debug-eyeline"></div>');
       $eyeline = $('.debug-eyeline');
     }
-    $eyeline.css({ height: '1px', width: '100%', backgroundColor: 'blue', position: 'absolute', top: `${topCheck}px` });
+    $eyeline.css({ height: '5px', width: '100%', backgroundColor: 'blue', position: 'absolute', top: `${topCheck}px`, zIndex: 999999 });
     */
 
     let allAbove = true;
@@ -115,7 +114,7 @@ export default MountWidget.extend({
       if (!$post) { break; }
 
       const viewTop = $post.offset().top;
-      const postHeight = $post.height();
+      const postHeight = $post.outerHeight(true);
       const viewBottom = Math.ceil(viewTop + postHeight);
 
       allAbove = allAbove && (viewTop < topCheck);
@@ -170,7 +169,7 @@ export default MountWidget.extend({
         this.sendAction('topVisibleChanged', { post: first, refresh: topRefresh });
       }
 
-      const last = posts.objectAt(onscreen[onscreen.length-1]);
+      const last = posts.objectAt(onscreen[onscreen.length - 1]);
       if (this._bottomVisible !== last) {
         this._bottomVisible = last;
         this.sendAction('bottomVisibleChanged', { post: last, refresh });
@@ -184,7 +183,7 @@ export default MountWidget.extend({
       }
 
       if (percent !== null) {
-        if (percent > 1.0) { percent = 1.0; }
+        percent = Math.max(0.0, Math.min(1.0, percent));
 
         if (changedPost || (this._currentPercent !== percent)) {
           this._currentPercent = percent;
diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6 b/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
index a9f35cb8ab..0fb51515c3 100644
--- a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
+++ b/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
@@ -1,5 +1,4 @@
 import computed from 'ember-addons/ember-computed-decorators';
-import { ajax } from 'discourse/lib/ajax';
 
 export default Ember.Component.extend({
   tagName: '',
@@ -13,10 +12,7 @@ export default Ember.Component.extend({
 
   actions: {
     updateDestinationCategory(category) {
-      ajax(`/t/${this.get('topic.id')}/shared-draft`, {
-        method: 'PUT',
-        data: { category_id: category.get('id') }
-      });
+      return this.get('topic').updateDestinationCategory(category.get('id'));
     },
 
     publish() {
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index f9b3cd38b7..b521ea876b 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -33,6 +33,11 @@ export default Ember.Component.extend(bufferedRender({
   attributeBindings: ['data-topic-id'],
   'data-topic-id': Em.computed.alias('topic.id'),
 
+  @computed
+  newDotText() {
+    return (this.currentUser && this.currentUser.trust_level > 0) ? "" : I18n.t('filters.new.lower_title');
+  },
+
   actions: {
     toggleBookmark() {
       this.get('topic').toggleBookmark().finally(() => this.rerenderBuffer());
@@ -58,8 +63,15 @@ export default Ember.Component.extend(bufferedRender({
       classes.push('has-excerpt');
     }
 
+    if (topic.get('unseen')) {
+      classes.push("unseen-topic");
+    }
 
-    ['liked', 'archived', 'bookmarked', 'pinned'].forEach(name => {
+    if (topic.get('displayNewPosts')) {
+      classes.push("new-posts");
+    }
+
+    ['liked', 'archived', 'bookmarked', 'pinned', 'closed'].forEach(name => {
       if (topic.get(name)) {
         classes.push(name);
       }
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6 b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
index 9eb07ade4f..f125c839b2 100644
--- a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
@@ -13,9 +13,10 @@ export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['url', 'unread', 'newPosts', 'unseen'],
 
   buildBuffer(buffer) {
+    const newDotText = (this.currentUser && this.currentUser.trust_level > 0) ? " " : I18n.t('filters.new.lower_title');
     const url = this.get('url');
     link(buffer, this.get('unread'), url, 'unread', 'unread_posts');
     link(buffer, this.get('newPosts'), url, 'new-posts', 'new_posts');
-    link(buffer, this.get('unseen'), url, 'new-topic', 'new', I18n.t('filters.new.lower_title'));
+    link(buffer, this.get('unseen'), url, 'new-topic', 'new', newDotText);
   }
 }));
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 99f485ef1b..53ca960699 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -111,48 +111,48 @@ export default Ember.Component.extend({
       const style = `border-right-width: ${borderSize}; width: ${progressWidth}px`;
       $topicProgress.append(`<div class='bg' style="${style}">&nbsp;</div>`);
     } else {
-      $bg.css("border-right-width", borderSize).width(progressWidth);
+      $bg.css("border-right-width", borderSize).width(progressWidth - 2);
     }
   },
 
   _dock() {
-    let maximumOffset = $('#topic-bottom').offset();
-    let composerHeight = $('#reply-control').height() || 0;
-    let $topicProgressWrapper = this.$();
-    let offset = window.pageYOffset || $('html').scrollTop();
+    const $topicProgressWrapper = this.$();
+    if (!$topicProgressWrapper || $topicProgressWrapper.length === 0) return;
 
-    if (!$topicProgressWrapper || $topicProgressWrapper.length === 0) {
-      return;
-    }
+    // on desktop, we want the topic-progress after the last post
+    // on mobile, we want it right before the end of the last post
+    const progressHeight = this.site.mobileView ? 0 : $("#topic-progress").outerHeight();
 
-    // Right position
-    let $replyArea = $('#reply-control .reply-area');
+    const maximumOffset = $('#topic-bottom').offset();
+    const composerHeight = $('#reply-control').height() || 0;
+    const offset = window.pageYOffset || $('html').scrollTop();
+
+    const $replyArea = $('#reply-control .reply-area');
     if ($replyArea && $replyArea.length) {
-      let rightPos = $replyArea.offset().left;
-      $topicProgressWrapper.css('right', `${rightPos}px`);
+      $topicProgressWrapper.css('right', `${$replyArea.offset().left}px`);
     } else {
       $topicProgressWrapper.css('right', `1em`);
     }
 
     let isDocked = false;
     if (maximumOffset) {
-      let threshold = maximumOffset.top;
-      let windowHeight = $(window).height();
-      let headerHeight = $('header').outerHeight(true);
+      const threshold = maximumOffset.top + progressHeight;
+      const windowHeight = $(window).height();
 
       if (this.capabilities.isIOS) {
+        const headerHeight = $('header').outerHeight(true);
         isDocked = offset >= (threshold - windowHeight - headerHeight + composerHeight);
       } else {
         isDocked = offset >= (threshold - windowHeight + composerHeight);
       }
     }
 
-    let dockPos = $(document).height() - $('#topic-bottom').offset().top;
+    const dockPos = $(document).height() - maximumOffset.top - progressHeight;
     if (composerHeight > 0) {
       if (isDocked) {
         $topicProgressWrapper.css('bottom', dockPos);
       } else {
-        let height = composerHeight + "px";
+        const height = composerHeight + "px";
         if ($topicProgressWrapper.css('bottom') !== height) {
           $topicProgressWrapper.css('bottom', height);
         }
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 16ea751834..98c9ad1c30 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -54,7 +54,7 @@ export default Ember.Component.extend(bufferedRender({
       }, options);
     }
 
-    buffer.push(I18n.t(this._noticeKey(), options));
+    buffer.push(`<span>${I18n.t(this._noticeKey(), options)}</span>`);
     buffer.push('</h3>');
 
     // TODO Sam: concerned this can cause a heavy rerender loop
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 9d5b9e7a18..414e117897 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -519,7 +519,7 @@ export default Ember.Controller.extend({
       if (result.responseJson.action === "create_post" || this.get('replyAsNewTopicDraft') || this.get('replyAsNewPrivateMessageDraft')) {
         this.destroyDraft();
       }
-      if (this.get('model.action') === 'edit') {
+      if (this.get('model.editingPost')) {
         this.appEvents.trigger('post-stream:refresh', { id: parseInt(result.responseJson.id) });
         if (result.responseJson.post.post_number === 1) {
           this.appEvents.trigger('header:update-topic', composer.get('topic'));
@@ -779,11 +779,19 @@ export default Ember.Controller.extend({
 
   @computed('model.categoryId', 'lastValidatedAt')
   categoryValidation(categoryId, lastValidatedAt) {
-    if( !this.siteSettings.allow_uncategorized_topics && !categoryId) {
+    if(!this.siteSettings.allow_uncategorized_topics && !categoryId) {
       return InputValidation.create({ failed: true, reason: I18n.t('composer.error.category_missing'), lastShownAt: lastValidatedAt });
     }
   },
 
+  @computed('model.category', 'model.tags', 'lastValidatedAt')
+  tagValidation(category, tags, lastValidatedAt) {
+    const tagsArray = tags || [];
+    if (this.site.get('can_tag_topics') && category && category.get('minimum_required_tags') > tagsArray.length) {
+      return InputValidation.create({ failed: true, reason: I18n.t('composer.error.tags_missing', {count: category.get('minimum_required_tags')}), lastShownAt: lastValidatedAt });
+    }
+  },
+
   collapse() {
     this._saveDraft();
     this.set('model.composeState', Composer.DRAFT);
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 8d3f4b4b86..344b79baff 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -137,11 +137,12 @@ const controllerOpts = {
   footerEducation: function() {
     if (!this.get('allLoaded') || this.get('model.topics.length') > 0 || !this.currentUser) { return; }
 
-    const split = (this.get('model.filter') || '').split('/');
+    const segments = (this.get('model.filter') || '').split('/');
 
-    if (split[0] !== 'new' && split[0] !== 'unread') { return; }
+    const tab = segments[segments.length - 1];
+    if (tab !== 'new' && tab !== 'unread') { return; }
 
-    return I18n.t("topics.none.educate." + split[0], {
+    return I18n.t("topics.none.educate." + tab, {
       userPrefsUrl: userPath(`${this.currentUser.get('username_lower')}/preferences`)
     });
   }.property('allLoaded', 'model.topics.length')
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index a33492a997..0273b7eaca 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -174,7 +174,7 @@ export default Ember.Controller.extend({
 
   @computed('expanded')
   searchAdvancedIcon(expanded) {
-    return iconHTML(expanded ? "caret-down" : "caret-right");
+    return iconHTML(expanded ? "caret-down fa-fw" : "caret-right fa-fw");
   },
 
   @computed('page')
diff --git a/app/assets/javascripts/discourse/controllers/group-membership.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
similarity index 74%
rename from app/assets/javascripts/discourse/controllers/group-membership.js.es6
rename to app/assets/javascripts/discourse/controllers/group-add-members.js.es6
index 8c22d2765e..ac65416c5c 100644
--- a/app/assets/javascripts/discourse/controllers/group-membership.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
@@ -1,18 +1,20 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import computed from 'ember-addons/ember-computed-decorators';
 import { extractError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
 
 export default Ember.Controller.extend(ModalFunctionality, {
   loading: false,
   setAsOwner: false,
 
-  @computed('model.usernames')
-  disableAddButton(usernames) {
-    return !usernames || !(usernames.length > 0);
+  @computed('model.usernames', 'loading')
+  disableAddButton(usernames, loading) {
+    return loading || !usernames || !(usernames.length > 0);
   },
 
   actions: {
     addMembers() {
+      this.set('loading', true);
+
       const model = this.get('model');
       const usernames = model.get('usernames');
       if (Em.isEmpty(usernames)) { return; }
@@ -30,10 +32,14 @@ export default Ember.Controller.extend(ModalFunctionality, {
           this.get('model.name'),
           { queryParams: { filter: usernames } }
         );
+
         model.set("usernames", null);
         this.send('closeModal');
       })
-      .catch(error => this.flash(extractError(error), 'error'));
+      .catch(error => {
+        this.flash(extractError(error), 'error');
+      })
+      .finally(() => this.set('loading', false));
     },
   },
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6 b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
new file mode 100644
index 0000000000..5469cc1235
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
@@ -0,0 +1,45 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { extractError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import { ajax } from 'discourse/lib/ajax';
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  loading: false,
+
+  @computed('input', 'loading', 'result')
+  disableAddButton(input, loading, result) {
+    return loading || Ember.isEmpty(input) || (input.length <= 0) || result;
+  },
+
+  actions: {
+    cancel() {
+      this.set('result', null);
+    },
+
+    add() {
+      this.setProperties({
+        loading: true,
+        result: null,
+      });
+
+      const users = this.get('input').split("\n")
+        .uniq()
+        .reject(x => x.length === 0);
+
+      ajax('/admin/groups/bulk', {
+        data: { users, group_id: this.get('model.id') },
+        method: 'PUT'
+      }).then(result => {
+        this.set('result', result);
+
+        if (result.users_not_added) {
+          this.set('result.invalidUsers', result.users_not_added.join(", "));
+        }
+      }).catch(error => {
+        this.flash(extractError(error), 'error');
+      }).finally(() => {
+        this.set('loading', false);
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-edit.js.es6 b/app/assets/javascripts/discourse/controllers/group-edit.js.es6
deleted file mode 100644
index 32277430af..0000000000
--- a/app/assets/javascripts/discourse/controllers/group-edit.js.es6
+++ /dev/null
@@ -1,23 +0,0 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
-  @computed('saving')
-  savingText(saving) {
-    if (saving !== undefined) {
-      return saving ? I18n.t('saving') : I18n.t('saved');
-    }
-  },
-
-  actions: {
-    save() {
-      this.set('saving', true);
-
-      this.get('model').save().catch(error => {
-        popupAjaxError(error);
-      }).finally(() => {
-        this.set('saving', false);
-      });
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/controllers/group-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/group-logs.js.es6
rename to app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
new file mode 100644
index 0000000000..17df28ceb0
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Controller.extend({
+  saving: null,
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
new file mode 100644
index 0000000000..9d100f63e6
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
@@ -0,0 +1,25 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Controller.extend({
+  application: Ember.inject.controller(),
+
+  @computed("model.automatic")
+  tabs(automatic) {
+    const defaultTabs = [
+      { route: 'group.manage.interaction', title: 'groups.manage.interaction.title' },
+      { route: 'group.manage.logs', title: 'groups.manage.logs.title' },
+    ];
+
+    if (!automatic) {
+      defaultTabs.splice(0, 0,
+        { route: 'group.manage.profile', title: 'groups.manage.profile.title' }
+      );
+
+      defaultTabs.splice(1, 0,
+        { route: 'group.manage.membership', title: 'groups.manage.membership.title' }
+      );
+    }
+
+    return defaultTabs;
+  },
+});
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index 46faf5ae8b..e9bf3bde7d 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -13,9 +13,10 @@ export default Ember.Controller.extend({
   application: Ember.inject.controller(),
   counts: null,
   showing: 'members',
+  destroying: null,
 
-  @computed('showMessages', 'model.user_count')
-  tabs(showMessages, userCount) {
+  @computed('showMessages', 'model.user_count', 'canManageGroup')
+  tabs(showMessages, userCount, canManageGroup) {
     const membersTab = Tab.create({
       name: 'members',
       route: 'group.index',
@@ -36,15 +37,12 @@ export default Ember.Controller.extend({
       }));
     }
 
-    if (this.currentUser && this.currentUser.canManageGroup(this.model)) {
-      defaultTabs.push(...[
+    if (canManageGroup) {
+      defaultTabs.push(
         Tab.create({
-          name: 'edit', i18nKey: 'edit.title', icon: 'pencil'
-        }),
-        Tab.create({
-          name: 'logs', i18nKey: 'logs.title', icon: 'list-alt'
+          name: 'manage', i18nKey: 'manage.title', icon: 'wrench'
         })
-      ]);
+      );
     }
 
     return defaultTabs;
@@ -84,14 +82,40 @@ export default Ember.Controller.extend({
     return this.currentUser && messageable;
   },
 
-  @computed('model')
-  canManageGroup(model) {
-    return this.currentUser && this.currentUser.canManageGroup(model);
+  @computed('model', 'model.automatic')
+  canManageGroup(model, automatic) {
+    return this.currentUser && (
+      this.currentUser.canManageGroup(model) ||
+      (this.currentUser.admin && automatic)
+    );
   },
 
   actions: {
     messageGroup() {
       this.send('createNewMessageViaParams', this.get('model.name'));
-    }
+    },
+
+    destroy() {
+      const group = this.get('model');
+      this.set('destroying', true);
+
+      bootbox.confirm(
+        I18n.t("admin.groups.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        confirmed => {
+          if (confirmed) {
+            group.destroy().then(() => {
+              this.transitionToRoute('groups.index');
+            }).catch(error => {
+              Ember.Logger.error(error);
+              bootbox.alert(I18n.t("admin.groups.delete_failed"));
+            }).finally(() => this.set('destroying', false));
+          } else {
+            this.set('destroying', false);
+          }
+        }
+      );
+    },
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/groups.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
similarity index 93%
rename from app/assets/javascripts/discourse/controllers/groups.js.es6
rename to app/assets/javascripts/discourse/controllers/groups-index.js.es6
index 006dd3baab..e8f4098ae8 100644
--- a/app/assets/javascripts/discourse/controllers/groups.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
@@ -35,6 +35,10 @@ export default Ember.Controller.extend({
   actions: {
     loadMore() {
       this.get('model').loadMore();
+    },
+
+    new() {
+      this.transitionToRoute("groups.new");
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/groups-new.js.es6
new file mode 100644
index 0000000000..17e81c5da8
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/groups-new.js.es6
@@ -0,0 +1,17 @@
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+
+export default Ember.Controller.extend({
+  saving: null,
+
+  actions: {
+    save() {
+      this.set('saving', true);
+      const group = this.get('model');
+
+      group.create().then(() => {
+        this.transitionToRoute("group.members", group.name);
+      }).catch(popupAjaxError)
+        .finally(() => this.set('saving', false));
+    },
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index 94ccc5595a..06fae57eb8 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -6,10 +6,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   actions: {
     jump() {
-      let where = parseInt(this.get('postNumber'));
-      if (where < 1) { where = 1; }
-      const max = this.get('topic.postStream.filteredPostsCount');
-      if (where > max) { where = max; }
+      const max   = this.get("topic.postStream.filteredPostsCount");
+      const where = Math.min(max, Math.max(1, parseInt(this.get("postNumber"))));
 
       this.jumpToIndex(where);
       this.send('closeModal');
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index a89a97d412..e370efdfaf 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -7,12 +7,13 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 
 export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController, {
 
-  saveAttrNames: ['name'],
+  saveAttrNames: ['name', 'title'],
 
   canEditName: setting('enable_names'),
   canSaveUser: true,
 
   newNameInput: null,
+  newTitleInput: null,
 
   passwordProgress: null,
 
@@ -30,9 +31,9 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
     return I18n.t(this.siteSettings.full_name_required ? 'user.name.instructions_required' : 'user.name.instructions');
   },
 
-  @computed("model.has_title_badges")
-  canSelectTitle(hasTitleBadges) {
-    return this.siteSettings.enable_badges && hasTitleBadges;
+  @computed('model.availableTitles')
+  canSelectTitle(availableTitles) {
+    return availableTitles.length > 0;
   },
 
   @computed()
@@ -52,6 +53,7 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
       const model = this.get('model');
 
       model.set('name', this.get('newNameInput'));
+      model.set('title', this.get('newTitleInput'));
 
       return model.save(this.get('saveAttrNames')).then(() => {
         this.set('saved', true);
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 5887bed927..3a8782ab4a 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -409,16 +409,29 @@ export default Ember.Controller.extend(BufferedContent, {
       }
 
       const composer = this.get("composer");
+      let topic = this.get('model');
       const composerModel = composer.get("model");
+      let editingFirst = composerModel && (post.get('firstPost') || composerModel.get('editingFirstPost'));
+
+      let editingSharedDraft = false;
+      let draftsCategoryId = this.get('site.shared_drafts_category_id');
+      if (draftsCategoryId && draftsCategoryId === topic.get('category.id')) {
+        editingSharedDraft = post.get('firstPost');
+      }
+
       const opts = {
         post,
-        action: Composer.EDIT,
+        action: editingSharedDraft ? Composer.EDIT_SHARED_DRAFT : Composer.EDIT,
         draftKey: post.get("topic.draft_key"),
         draftSequence: post.get("topic.draft_sequence")
       };
 
+      if (editingSharedDraft) {
+        opts.destinationCategoryId = topic.get('destination_category_id');
+      }
+
       // Cancel and reopen the composer for the first post
-      if (composerModel && (post.get('firstPost') || composerModel.get('editingFirstPost'))) {
+      if (editingFirst) {
         composer.cancelComposer().then(() => composer.open(opts));
       } else {
         composer.open(opts);
@@ -439,17 +452,17 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     jumpToIndex(index) {
-      this._jumpToPostId(this.get('model.postStream.stream')[index - 1]);
+      this._jumpToIndex(index);
     },
 
     jumpToPostPrompt() {
       const postText = prompt(I18n.t('topic.progress.jump_prompt_long'));
       if (postText === null) { return; }
 
-      const postNumber = parseInt(postText, 10);
-      if (postNumber === 0) { return; }
+      const postIndex = parseInt(postText, 10);
+      if (postIndex === 0) { return; }
 
-      this._jumpToPostId(this.get('model.postStream').findPostIdForPostNumber(postNumber));
+      this._jumpToIndex(postIndex);
     },
 
     jumpToPost(postNumber) {
@@ -742,6 +755,12 @@ export default Ember.Controller.extend(BufferedContent, {
     }
   },
 
+  _jumpToIndex(index) {
+    const stream = this.get("model.postStream.stream");
+    index = Math.max(1, Math.min(stream.length, index));
+    this._jumpToPostId(stream[index - 1]);
+  },
+
   _jumpToPostId(postId) {
     if (!postId) {
       Ember.Logger.warn("jump-post code broken - requested an index outside the stream array");
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index c8fce33d5a..ecde47f23b 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -10,9 +10,15 @@ export default Ember.Controller.extend(CanCheckEmails, {
   currentPath: Ember.computed.alias('application.currentPath'),
   adminTools: optionalService(),
 
-  @computed("content.username")
+  @computed('model.username')
   viewingSelf(username) {
-    return username === User.currentProp('username');
+    let currentUser = this.currentUser;
+    return currentUser && username === currentUser.get('username');
+  },
+
+  @computed('viewingSelf')
+  canExpandProfile(viewingSelf) {
+    return viewingSelf;
   },
 
   @computed('model.profileBackground')
@@ -91,6 +97,10 @@ export default Ember.Controller.extend(CanCheckEmails, {
   },
 
   actions: {
+    collapseProfile() {
+      this.set('forceExpand', false);
+    },
+
     expandProfile() {
       this.set('forceExpand', true);
     },
diff --git a/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6 b/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6
new file mode 100644
index 0000000000..715b0eed3d
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6
@@ -0,0 +1,20 @@
+// A small helper to inject theme settings into
+// context objects of handlebars templates used
+// in themes
+
+import { registerHelper } from 'discourse-common/lib/helpers';
+
+function inject(context, key, value) {
+  if (typeof value === "string") {
+    value = value.replace(/\\u0022/g, '"');
+  }
+
+  if (!context.get("themeSettings")) {
+    context.set("themeSettings", {});
+  }
+  context.set(`themeSettings.${key}`, value);
+}
+
+registerHelper('theme-setting-injector', function(arr, hash) {
+  inject(hash.context, hash.key, hash.value);
+});
diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
index c539469475..bb1bff2b7c 100644
--- a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
+++ b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
@@ -2,27 +2,25 @@ export default {
   name: 'register-service-worker',
 
   initialize() {
-    window.addEventListener('load', () => {
-      const isSecured = (document.location.protocol === 'https:') ||
-        (location.hostname === "localhost");
+    const isSecured = (document.location.protocol === 'https:') ||
+          (location.hostname === "localhost");
 
-      const isSupported= isSecured && ('serviceWorker' in navigator);
+    const isSupported= isSecured && ('serviceWorker' in navigator);
 
-      if (isSupported) {
-        if (Discourse.ServiceWorkerURL) {
-          navigator.serviceWorker
-            .register(`${Discourse.BaseUri}/${Discourse.ServiceWorkerURL}`)
-            .catch(error => {
-              Ember.Logger.info(`Failed to register Service Worker: ${error}`);
-            });
-        } else {
-          navigator.serviceWorker.getRegistrations().then(registrations => {
-            for(let registration of registrations) {
-              registration.unregister();
-            };
+    if (isSupported) {
+      if (Discourse.ServiceWorkerURL) {
+        navigator.serviceWorker
+          .register(`${Discourse.BaseUri}/${Discourse.ServiceWorkerURL}`)
+          .catch(error => {
+            Ember.Logger.info(`Failed to register Service Worker: ${error}`);
           });
-        }
+      } else {
+        navigator.serviceWorker.getRegistrations().then(registrations => {
+          for(let registration of registrations) {
+            registration.unregister();
+          };
+        });
       }
-    });
+    }
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
index afe7dbe6bd..9b952941d1 100644
--- a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
+++ b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
@@ -21,7 +21,7 @@ export default {
     }
 
     DiscourseURL.rewrite(/^\/u\/([^\/]+)\/?$/, "/u/$1/summary", {
-      exceptions: ['/u/account-created', '/users/account-created']
+      exceptions: ['/u/account-created', '/users/account-created', '/u/password-reset', '/users/password-reset']
     });
   }
 };
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 18453287e6..6a1ddbdf9f 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -1,6 +1,6 @@
 import DiscourseURL from 'discourse/lib/url';
 import Composer from 'discourse/models/composer';
-import { scrollTopFor } from 'discourse/lib/offset-calculator';
+import { minimumOffset } from 'discourse/lib/offset-calculator';
 
 const bindings = {
   '!':               {postAction: 'showFlags'},
@@ -311,52 +311,36 @@ export default {
   _moveSelection(direction) {
     const $articles = this._findArticles();
 
-    if (typeof $articles === 'undefined') {
-      return;
-    }
+    if (typeof $articles === 'undefined') return;
 
     const $selected = ($articles.filter('.selected').length !== 0)
       ? $articles.filter('.selected')
       : $articles.filter('[data-islastviewedtopic=true]');
+
     let index = $articles.index($selected);
 
-    if ($selected.length !== 0) { //boundries check
-      // loop is not allowed
-      if (direction === -1 && index === 0) { return; }
-      if (direction === 1 && index === ($articles.length - 1) ) { return; }
+    if ($selected.length !== 0) {
+      if (direction === -1 && index === 0) return;
+      if (direction ===  1 && index === $articles.length - 1) return;
     }
 
-    // if nothing is selected go to the first post on screen
+    // when nothing is selected
     if ($selected.length === 0) {
-      const scrollTop = $(document).scrollTop();
-
-      index = 0;
-      $articles.each(function() {
-        const top = $(this).position().top;
-        if (top >= scrollTop) {
-          return false;
-        }
-        index += 1;
-      });
-
-      if (index >= $articles.length) {
-        index = $articles.length - 1;
-      }
-
+      // select the first post with its top visible
+      const offset = minimumOffset();
+      index = $articles.toArray().findIndex(article => article.getBoundingClientRect().top > offset);
       direction = 0;
     }
 
     const $article = $articles.eq(index + direction);
 
     if ($article.length > 0) {
-
       $articles.removeClass('selected');
       $article.addClass('selected');
 
       if ($article.is('.topic-post')) {
         $('a.tabLoc', $article).focus();
         this._scrollToPost($article);
-
       } else {
         this._scrollList($article, direction);
       }
@@ -364,8 +348,11 @@ export default {
   },
 
   _scrollToPost($article) {
-    const pos = $article.offset();
-    $(window).scrollTop(scrollTopFor(pos.top));
+    if ($article.find("#post_1").length > 0) {
+      $(window).scrollTop(0);
+    } else {
+      $(window).scrollTop($article.offset().top - minimumOffset());
+    }
   },
 
   _scrollList($article) {
@@ -393,14 +380,13 @@ export default {
 
 
   _findArticles() {
-    const $topicList = $('.topic-list'),
-        $topicArea = $('.posts-wrapper');
+    const $topicList = $(".topic-list");
+    const $postsWrapper = $(".posts-wrapper");
 
-    if ($topicArea.length > 0) {
-      return $('.posts-wrapper .topic-post, .topic-list tbody tr');
-    }
-    else if ($topicList.length > 0) {
-      return $topicList.find('.topic-list-item');
+    if ($postsWrapper.length > 0) {
+      return $(".posts-wrapper .topic-post, .topic-list tbody tr");
+    } else if ($topicList.length > 0) {
+      return $topicList.find(".topic-list-item");
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js.es6 b/app/assets/javascripts/discourse/lib/lock-on.js.es6
index 111b713a35..fe20031ab3 100644
--- a/app/assets/javascripts/discourse/lib/lock-on.js.es6
+++ b/app/assets/javascripts/discourse/lib/lock-on.js.es6
@@ -1,13 +1,13 @@
-import { scrollTopFor } from 'discourse/lib/offset-calculator';
+import { minimumOffset } from "discourse/lib/offset-calculator";
 
-// Dear traveller, you are entering a zone where we are at war with the browser
-// the browser is insisting on positioning scrollTop per the location it was in
-// the past, we are insisting on it being where we want it to be
-// The hack is just to keep trying over and over to position the scrollbar (up to 1 minute)
+// Dear traveller, you are entering a zone where we are at war with the browser.
+// The browser is insisting on positioning scrollTop per the location it was in
+// the past, we are insisting on it being where we want it to be.
+// The hack is just to keep trying over and over to position the scrollbar (up to 1 second).
 //
 // The root cause is that a "refresh" on a topic page will almost never be at the
 // same position it was in the past, the URL points to the post at the top of the
-// page, so a refresh will try to bring that post into view causing drift
+// page, so a refresh will try to bring that post into view causing drift.
 //
 // Additionally if you loaded multiple batches of posts, on refresh they will not
 // be loaded.
@@ -18,29 +18,29 @@ import { scrollTopFor } from 'discourse/lib/offset-calculator';
 // 1. onbeforeunload ensure we are scrolled to the right spot
 // 2. give up on the scrollbar and implement it ourselves (something that will happen)
 
+const LOCK_DURATION_MS = 1000;
 const SCROLL_EVENTS = "scroll.lock-on touchmove.lock-on mousedown.lock-on wheel.lock-on DOMMouseScroll.lock-on mousewheel.lock-on keyup.lock-on";
+const SCROLL_TYPES  = ["mousedown", "mousewheel", "touchmove", "wheel"];
 
 function within(threshold, x, y) {
-  return Math.abs(x-y) < threshold;
+  return Math.abs(x - y) < threshold;
 }
 
 export default class LockOn {
   constructor(selector, options) {
     this.selector = selector;
     this.options = options || {};
-    this.offsetTop = null;
   }
 
   elementTop() {
-    const selected = $(this.selector);
-    if (selected && selected.offset && selected.offset()) {
-      const result = selected.offset().top;
-      return scrollTopFor(result);
+    const $selected = $(this.selector);
+    if ($selected && $selected.offset && $selected.offset()) {
+      return $selected.offset().top - minimumOffset();
     }
   }
 
   clearLock(interval) {
-    $('body,html').off(SCROLL_EVENTS);
+    $("body, html").off(SCROLL_EVENTS);
     clearInterval(interval);
     if (this.options.finished) {
       this.options.finished();
@@ -54,9 +54,7 @@ export default class LockOn {
     $(window).scrollTop(previousTop);
 
     const interval = setInterval(() => {
-      let top = this.elementTop();
-      if (top < 0) { top = 0; }
-
+      const top = Math.max(0, this.elementTop());
       const scrollTop = $(window).scrollTop();
 
       if (typeof(top) === "undefined" || isNaN(top)) {
@@ -68,20 +66,14 @@ export default class LockOn {
         previousTop = top;
       }
 
-      // We commit suicide after 3s just to clean up
-      const nowTime = new Date().getTime();
-      if (nowTime - startedAt > 1000) {
+      // Commit suicide after a little while
+      if (new Date().getTime() - startedAt > LOCK_DURATION_MS) {
         return this.clearLock(interval);
       }
     }, 50);
 
-    $('body,html').off(SCROLL_EVENTS).on(SCROLL_EVENTS, e => {
-      if ( e.which > 0 ||
-           e.type === "mousedown" ||
-           e.type === "mousewheel" ||
-           e.type === "touchmove" ||
-           e.type === "wheel"
-      ) {
+    $("body, html").off(SCROLL_EVENTS).on(SCROLL_EVENTS, e => {
+      if (e.which > 0 || SCROLL_TYPES.includes(e.type)) {
         this.clearLock(interval);
       }
     });
diff --git a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6 b/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
index b354e271b4..41d50903bc 100644
--- a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
+++ b/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
@@ -1,50 +1,36 @@
 export function scrollTopFor(y) {
-  return y - offsetCalculator(y);
+  return y - offsetCalculator();
 }
 
-export default function offsetCalculator(y) {
-  const $header = $('header');
-  const $container = $('.posts-wrapper');
-  const containerOffset = $container.offset();
-
-  let titleHeight = 0;
-  const scrollTop = y || $(window).scrollTop();
-
-  if (!containerOffset || scrollTop < containerOffset.top) {
-    titleHeight = $('#topic-title').height() || 0;
-  }
-
-  const rawWinHeight = $(window).height();
-  const windowHeight = rawWinHeight - titleHeight;
-
-  const eyeTarget = (windowHeight / 10);
-  const headerHeight = $header.outerHeight(true);
-  const expectedOffset = titleHeight - ($header.find('.contents').height() || 0) + (eyeTarget * 2);
-  const ideal = headerHeight + ((expectedOffset < 0) ? 0 : expectedOffset);
-
-  if ($container.length === 0) { return expectedOffset; }
-
-  const topPos = $container.offset().top;
-
-  const docHeight = $(document).height();
-  let scrollPercent = Math.min((scrollTop / (docHeight-rawWinHeight)), 1.0);
-
-  let inter = topPos - scrollTop + ($container.height() * scrollPercent);
-  if (inter < headerHeight + eyeTarget) {
-    inter = headerHeight + eyeTarget;
-  }
-
-  if (inter > ideal) {
-    const bottom = $('#topic-bottom').offset().top;
-    const switchPos = bottom - rawWinHeight - ideal;
-
-    if (scrollTop > switchPos) {
-      const p = Math.max(Math.min((scrollTop + inter - switchPos) / rawWinHeight, 1.0), 0.0);
-      return ((1 - p) * ideal) + (p * inter);
-    } else {
-      return ideal;
-    }
-  }
-
-  return inter;
+export function minimumOffset() {
+  const $header = $("header.d-header");
+  const headerHeight = $header.outerHeight(true) || 0;
+  const headerPositionTop = $header.position().top;
+  return headerHeight + headerPositionTop;
+}
+
+export default function offsetCalculator() {
+  const min = minimumOffset();
+
+  // on mobile, just use the header
+  if ($("html").hasClass("mobile-view")) return min;
+
+  const $window = $(window);
+  const windowHeight = $window.height();
+  const documentHeight = $(document).height();
+  const topicBottomOffsetTop = $("#topic-bottom").offset().top;
+
+  // the footer is bigger than the window, we can scroll down past the last post
+  if (documentHeight - windowHeight > topicBottomOffsetTop) return min;
+
+  const scrollTop = $window.scrollTop();
+  const visibleBottomHeight = scrollTop + windowHeight - topicBottomOffsetTop;
+
+  if (visibleBottomHeight > 0) {
+    const bottomHeight = documentHeight - topicBottomOffsetTop;
+    const offset = (windowHeight - bottomHeight) * visibleBottomHeight / bottomHeight;
+    return Math.max(min, offset);
+  }
+
+  return min;
 }
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 1eca95047e..e30a2ba7dd 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -108,7 +108,8 @@ const Category = RestModel.extend({
         num_featured_topics: this.get('num_featured_topics'),
         default_view: this.get('default_view'),
         subcategory_list_style: this.get('subcategory_list_style'),
-        default_top_period: this.get('default_top_period')
+        default_top_period: this.get('default_top_period'),
+        minimum_required_tags: this.get('minimum_required_tags')
       },
       type: id ? 'PUT' : 'POST'
     });
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 2726e0fc2d..8e4c6b60ae 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -10,6 +10,7 @@ import { escapeExpression, tinyAvatar } from 'discourse/lib/utilities';
 export const
   CREATE_TOPIC = 'createTopic',
   CREATE_SHARED_DRAFT = 'createSharedDraft',
+  EDIT_SHARED_DRAFT = 'editSharedDraft',
   PRIVATE_MESSAGE = 'privateMessage',
   NEW_PRIVATE_MESSAGE_KEY = 'new_private_message',
   REPLY = 'reply',
@@ -17,6 +18,10 @@ export const
   REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic",
   REPLY_AS_NEW_PRIVATE_MESSAGE_KEY = "reply_as_new_private_message";
 
+function isEdit(action) {
+  return action === EDIT || action === EDIT_SHARED_DRAFT;
+}
+
 const CLOSED = 'closed',
   SAVING = 'saving',
   OPEN = 'open',
@@ -52,11 +57,13 @@ const SAVE_LABELS = {
   [REPLY]: 'composer.reply',
   [CREATE_TOPIC]: 'composer.create_topic',
   [PRIVATE_MESSAGE]: 'composer.create_pm',
-  [CREATE_SHARED_DRAFT]: 'composer.create_shared_draft'
+  [CREATE_SHARED_DRAFT]: 'composer.create_shared_draft',
+  [EDIT_SHARED_DRAFT]: 'composer.save_edit'
 };
 
 const SAVE_ICONS = {
   [EDIT]: 'pencil',
+  [EDIT_SHARED_DRAFT]: 'clipboard',
   [REPLY]: 'reply',
   [CREATE_TOPIC]: 'plus',
   [PRIVATE_MESSAGE]: 'envelope',
@@ -98,6 +105,11 @@ const Composer = RestModel.extend({
     return categoryId ? this.site.categories.findBy('id', categoryId) : null;
   },
 
+  @computed('category')
+  minimumRequiredTags(category) {
+    return (category && category.get('minimum_required_tags') > 0) ? category.get('minimum_required_tags') : null;
+  },
+
   creatingTopic: Em.computed.equal('action', CREATE_TOPIC),
   creatingSharedDraft: Em.computed.equal('action', CREATE_SHARED_DRAFT),
   creatingPrivateMessage: Em.computed.equal('action', PRIVATE_MESSAGE),
@@ -116,13 +128,14 @@ const Composer = RestModel.extend({
 
   topicFirstPost: Em.computed.or('creatingTopic', 'editingFirstPost'),
 
-  editingPost: Em.computed.equal('action', EDIT),
+  @computed('action')
+  editingPost: isEdit,
+
   replyingToTopic: Em.computed.equal('action', REPLY),
 
   viewOpen: Em.computed.equal('composeState', OPEN),
   viewDraft: Em.computed.equal('composeState', DRAFT),
 
-
   composeStateChanged: function() {
     var oldOpen = this.get('composerOpened');
 
@@ -212,7 +225,7 @@ const Composer = RestModel.extend({
       if (!this.site.mobileView) {
         const originalUserName = post.get('reply_to_user.username');
         const originalUserAvatar = post.get('reply_to_user.avatar_template');
-        if (originalUserName && originalUserAvatar && action === EDIT) {
+        if (originalUserName && originalUserAvatar && isEdit(action)) {
           options.originalUser = {
             username: originalUserName,
             avatar: tinyAvatar(originalUserAvatar)
@@ -238,31 +251,48 @@ const Composer = RestModel.extend({
     return options;
   },
 
-  // whether to disable the post button
-  cantSubmitPost: function() {
+  @computed
+  isStaffUser() {
+    const currentUser = Discourse.User.current();
+    return currentUser && currentUser.get('staff');
+  },
+
+  @computed('loading', 'canEditTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryId', 'missingReplyCharacters', 'tags', 'topicFirstPost', 'minimumRequiredTags', 'isStaffUser')
+  cantSubmitPost(loading, canEditTitle, titleLength, targetUsernames, replyLength, categoryId, missingReplyCharacters, tags, topicFirstPost, minimumRequiredTags, isStaffUser) {
 
     // can't submit while loading
-    if (this.get('loading')) return true;
+    if (loading) return true;
 
     // title is required when
     //  - creating a new topic/private message
     //  - editing the 1st post
-    if (this.get('canEditTitle') && !this.get('titleLengthValid')) return true;
+    if (canEditTitle && !this.get('titleLengthValid')) return true;
 
     // reply is always required
-    if (this.get('missingReplyCharacters') > 0) return true;
+    if (missingReplyCharacters > 0) return true;
+
+    if (this.site.get('can_tag_topics') && !isStaffUser && topicFirstPost && minimumRequiredTags) {
+      const tagsArray = tags || [];
+      if (tagsArray.length < minimumRequiredTags) {
+        return true;
+      }
+    }
 
     if (this.get("privateMessage")) {
       // need at least one user when sending a PM
-      return this.get('targetUsernames') && (this.get('targetUsernames').trim() + ',').indexOf(',') === 0;
+      return targetUsernames && (targetUsernames.trim() + ',').indexOf(',') === 0;
     } else {
       // has a category? (when needed)
-      return this.get('canCategorize') &&
-            !this.siteSettings.allow_uncategorized_topics &&
-            !this.get('categoryId') &&
-            !this.user.get('admin');
+      return this.get('requiredCategoryMissing');
     }
-  }.property('loading', 'canEditTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryId', 'missingReplyCharacters'),
+  },
+
+  @computed('canCategorize', 'categoryId')
+  requiredCategoryMissing(canCategorize, categoryId) {
+    return canCategorize && !categoryId &&
+      !this.siteSettings.allow_uncategorized_topics &&
+      !this.user.get('admin');
+  },
 
   titleLengthValid: function() {
     if (this.user.get('admin') && this.get('post.static_doc') && this.get('titleLength') > 0) return true;
@@ -471,11 +501,11 @@ const Composer = RestModel.extend({
 
     const composer = this;
     if (!replyBlank &&
-        ((opts.reply || opts.action === EDIT) && this.get('replyDirty'))) {
+        ((opts.reply || isEdit(opts.action)) && this.get('replyDirty'))) {
       return;
     }
 
-    if (opts.action === REPLY && this.get('action') === EDIT) this.set('reply', '');
+    if (opts.action === REPLY && isEdit(this.get('action'))) this.set('reply', '');
     if (!opts.draftKey) throw 'draft key is required';
     if (opts.draftSequence === null) throw 'draft sequence is required';
 
@@ -527,11 +557,15 @@ const Composer = RestModel.extend({
     }
 
     // If we are editing a post, load it.
-    if (opts.action === EDIT && opts.post) {
+    if (isEdit(opts.action) && opts.post) {
 
       const topicProps = this.serialize(_edit_topic_serializer);
       topicProps.loading = true;
 
+      // When editing a shared draft, use its category
+      if (opts.action === EDIT_SHARED_DRAFT && opts.destinationCategoryId) {
+        topicProps.categoryId = opts.destinationCategoryId;
+      }
       this.setProperties(topicProps);
 
       this.store.find('post', opts.post.get('id')).then(function(post) {
@@ -591,21 +625,25 @@ const Composer = RestModel.extend({
 
   // When you edit a post
   editPost(opts) {
-    const post = this.get('post'),
-          oldCooked = post.get('cooked'),
-          self = this;
+    let post = this.get('post');
+    let oldCooked = post.get('cooked');
+    let promise = Ember.RSVP.resolve();
 
-    let promise;
-
-    // Update the title if we've changed it, otherwise consider it a
-    // successful resolved promise
+    // Update the topic if we're editing the first post
     if (this.get('title') &&
         post.get('post_number') === 1 &&
         this.get('topic.details.can_edit')) {
       const topicProps = this.getProperties(Object.keys(_edit_topic_serializer));
-      promise = Topic.update(this.get('topic'), topicProps);
-    } else {
-      promise = Ember.RSVP.resolve();
+
+      let topic = this.get('topic');
+
+      // If we're editing a shared draft, keep the original category
+      if (this.get('action') === EDIT_SHARED_DRAFT) {
+        let destinationCategoryId = topicProps.categoryId;
+        promise = promise.then(() => topic.updateDestinationCategory(destinationCategoryId));
+        topicProps.categoryId = topic.get('category.id');
+      }
+      promise = promise.then(() => Topic.update(topic, topicProps));
     }
 
     const props = {
@@ -617,18 +655,18 @@ const Composer = RestModel.extend({
 
     this.set('composeState', SAVING);
 
-    var rollback = throwAjaxError(function(){
+    let rollback = throwAjaxError(() => {
       post.set('cooked', oldCooked);
-      self.set('composeState', OPEN);
+      this.set('composeState', OPEN);
     });
 
-    return promise.then(function() {
+    return promise.then(() => {
       // rest model only sets props after it is saved
       post.set("cooked", props.cooked);
-      return post.save(props).then(function(result) {
-        self.clearState();
+      return post.save(props).then(result => {
+        this.clearState();
         return result;
-      }).catch(function(error) {
+      }).catch(error => {
         throw error;
       });
     }).catch(rollback);
@@ -867,6 +905,8 @@ Composer.reopenClass({
 
   // The actions the composer can take
   CREATE_TOPIC,
+  CREATE_SHARED_DRAFT,
+  EDIT_SHARED_DRAFT,
   PRIVATE_MESSAGE,
   REPLY,
   EDIT,
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 4ad96c34fb..1fe9a1999f 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -124,16 +124,21 @@ const Group = RestModel.extend({
     return mentionableLevel === '99';
   },
 
+  @computed("visibility_level")
+  isPrivate(visibilityLevel) {
+    return visibilityLevel !== 0;
+  },
+
   @observes("visibility_level", "canEveryoneMention")
   _updateAllowMembershipRequests() {
-    if (this.get('visibility_level') !== 0 || !this.get('canEveryoneMention')) {
+    if (this.get('isPrivate') || !this.get('canEveryoneMention')) {
       this.set ('allow_membership_requests', false);
     }
   },
 
   @observes("visibility_level")
   _updatePublic() {
-    if (this.get('visibility_level') !== 0) {
+    if (this.get('isPrivate')) {
       this.set('public', false);
       this.set('allow_membership_requests', false);
     }
@@ -185,10 +190,7 @@ const Group = RestModel.extend({
   },
 
   save() {
-    const id = this.get('id');
-    const url = this.get('is_group_owner') ? `/groups/${id}` : `/admin/groups/${id}`;
-
-    return ajax(url, {
+    return ajax(`/groups/${this.get('id')}`, {
       type: "PUT",
       data: { group: this.asJSON() }
     });
@@ -250,10 +252,6 @@ Group.reopenClass({
     });
   },
 
-  find(name) {
-    return ajax("/groups/" + name + ".json").then(result => Group.create(result.basic_group));
-  },
-
   loadMembers(name, offset, limit, params) {
     return ajax('/groups/' + name + '/members.json', {
       data: _.extend({
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index d198883b58..efd364ed34 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -107,6 +107,11 @@ export default Ember.Object.extend({
     var adapter = this.adapterFor(type);
     return adapter.find(this, type, findArgs, opts).then(result => {
       var hydrated = this._hydrateFindResults(result, type, findArgs, opts);
+
+      if (result.extras) {
+        hydrated.set('extras', result.extras);
+      }
+
       if (adapter.cache) {
         const stale = adapter.findStale(this, type, findArgs, opts);
         hydrated = this._updateStale(stale, hydrated);
diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js.es6
index cfbd83e164..f433038abb 100644
--- a/app/assets/javascripts/discourse/models/tag-group.js.es6
+++ b/app/assets/javascripts/discourse/models/tag-group.js.es6
@@ -24,7 +24,8 @@ const TagGroup = RestModel.extend({
         name: this.get('name'),
         tag_names: this.get('tag_names'),
         parent_tag_name: this.get('parent_tag_name') ? this.get('parent_tag_name') : undefined,
-        one_per_topic: this.get('one_per_topic')
+        one_per_topic: this.get('one_per_topic'),
+        permissions: this.get('visible_only_to_staff') ? {"staff": "1"} : {"everyone": "1"}
       },
       type: isNew ? 'POST' : 'PUT'
     }).then(function(result) {
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 7ca45bb022..6df5cbe8c2 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -488,6 +488,14 @@ const Topic = RestModel.extend({
     }).catch(popupAjaxError);
   },
 
+  updateDestinationCategory(categoryId) {
+    this.set('destination_category_id', categoryId);
+    return ajax(`/t/${this.get('id')}/shared-draft`, {
+      method: 'PUT',
+      data: { category_id: categoryId }
+    });
+  },
+
   convertTopic(type) {
     return ajax(`/t/${this.get('id')}/convert-topic/${type}`, {type: 'PUT'}).then(() => {
       window.location.reload();
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index e6aeb9f676..19e3ebcd14 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -218,6 +218,7 @@ const User = RestModel.extend({
       'website',
       'location',
       'name',
+      'title',
       'locale',
       'custom_fields',
       'user_fields',
@@ -283,6 +284,12 @@ const User = RestModel.extend({
       }
     });
 
+    ['muted_tags', 'tracked_tags', 'watched_tags', 'watching_first_post_tags'].forEach(prop => {
+      if (fields === undefined || fields.includes(prop)) {
+        data[prop] = this.get(prop) ? this.get(prop).join(',') : '';
+      }
+    });
+
     // TODO: We can remove this when migrated fully to rest model.
     this.set('isSaving', true);
     return ajax(userPath(`${this.get('username_lower')}.json`), {
@@ -563,6 +570,25 @@ const User = RestModel.extend({
 
   canManageGroup(group) {
     return group.get('automatic') ? false : (this.get('admin') || group.get('is_group_owner'));
+  },
+
+  @computed('groups.@each.title', 'badges.@each')
+  availableTitles() {
+    let titles = [];
+
+    _.each(this.get('groups'), group => {
+      if (group.get('title')) {
+        titles.push(group.get('title'));
+      }
+    });
+
+    _.each(this.get('badges'), badge => {
+      if (badge.get('allow_title')) {
+        titles.push(badge.get('name'));
+      }
+    });
+
+    return _.uniq(titles).sort();
   }
 });
 
diff --git a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
index 40faddcde2..6d35e0800f 100644
--- a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
@@ -1,4 +1,11 @@
+import { default as computed } from "ember-addons/ember-computed-decorators";
+
 export default Ember.Object.extend({
   postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts'),
-  showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent')
+  showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent'),
+
+  @computed
+  newDotText() {
+    return (this.currentUser && this.currentUser.trust_level > 0) ? "" : I18n.t('filters.new.lower_title');
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
index 4ed43977d7..f489faf4bb 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -49,7 +49,9 @@ export default function() {
     this.route('categoryWithID', { path: '/c/:parentSlug/:slug/:id' });
   });
 
-  this.route('groups', { resetNamespace: true });
+  this.route('groups', { resetNamespace: true }, function() {
+    this.route("new", { path: "custom/new" });
+  });
 
   this.route('group', { path: '/groups/:name', resetNamespace: true }, function() {
     this.route('members');
@@ -60,8 +62,13 @@ export default function() {
       this.route('mentions');
     });
 
-    this.route('logs');
-    this.route('edit');
+    this.route('manage', function() {
+      this.route('profile');
+      this.route('membership');
+      this.route('interaction');
+      this.route('members');
+      this.route('logs');
+    });
 
     this.route('messages', function() {
       this.route('inbox');
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index 169d50cd94..42595a0956 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -17,7 +17,7 @@ const DiscourseRoute = Ember.Route.extend({
   refresh() {
     if (!this.refreshQueryWithoutTransition) { return this._super(); }
 
-    if (!this.router.router.activeTransition) {
+    if (!this.router._routerMicrolib.activeTransition) {
       const controller = this.controller,
             model = controller.get('model'),
             params = this.controller.getProperties(Object.keys(this.queryParams));
diff --git a/app/assets/javascripts/discourse/routes/group-edit.js.es6 b/app/assets/javascripts/discourse/routes/group-edit.js.es6
deleted file mode 100644
index 7f3dc02cec..0000000000
--- a/app/assets/javascripts/discourse/routes/group-edit.js.es6
+++ /dev/null
@@ -1,21 +0,0 @@
-export default Discourse.Route.extend({
-  titleToken() {
-    return I18n.t('groups.edit.title');
-  },
-
-  model() {
-    return this.modelFor('group');
-  },
-
-  afterModel(group) {
-    if (!this.currentUser || !this.currentUser.canManageGroup(group)) {
-      this.transitionTo("group.members", group);
-    }
-  },
-
-  setupController(controller, model) {
-    this.controllerFor('group-edit').setProperties({ model });
-    this.controllerFor("group").set("showing", 'edit');
-    model.findMembers();
-  }
-});
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6
index 815308f20a..2792291dc3 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-index.js.es6
@@ -1,3 +1,5 @@
+import showModal from 'discourse/lib/show-modal';
+
 export default Discourse.Route.extend({
   titleToken() {
     return I18n.t('groups.members.title');
@@ -20,6 +22,14 @@ export default Discourse.Route.extend({
   },
 
   actions: {
+    showAddMembersModal() {
+      showModal('group-add-members', { model: this.modelFor('group') });
+    },
+
+    showBulkAddModal() {
+      showModal('group-bulk-add', { model: this.modelFor('group') });
+    },
+
     didTransition() {
       this.controllerFor("group-index").set("filterInput", this._params.filter);
       return true;
diff --git a/app/assets/javascripts/discourse/routes/group-manage-index.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
new file mode 100644
index 0000000000..f5b26ccd0c
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-index.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  beforeModel() {
+    this.transitionTo("group.manage.profile");
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
new file mode 100644
index 0000000000..7d0d44b6b8
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t('groups.manage.interaction.title');
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
similarity index 51%
rename from app/assets/javascripts/discourse/routes/group-logs.js.es6
rename to app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
index 9658160fee..85ee4dfae9 100644
--- a/app/assets/javascripts/discourse/routes/group-logs.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
@@ -1,6 +1,6 @@
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('groups.logs.title');
+    return I18n.t('groups.manage.logs.title');
   },
 
   model() {
@@ -8,13 +8,12 @@ export default Discourse.Route.extend({
   },
 
   setupController(controller, model) {
-    this.controllerFor('group-logs').setProperties({ model });
-    this.controllerFor("group").set("showing", 'logs');
+    this.controllerFor('group-manage-logs').setProperties({ model });
   },
 
   actions: {
     willTransition() {
-      this.controllerFor('group-logs').reset();
+      this.controllerFor('group-manage-logs').reset();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
new file mode 100644
index 0000000000..eb47fec87d
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
@@ -0,0 +1,11 @@
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t('groups.manage.membership.title');
+  },
+
+  afterModel(group) {
+    if (group.get('automatic')) {
+      this.replaceWith("group.manage.interaction", group);
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
new file mode 100644
index 0000000000..7886d867be
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
@@ -0,0 +1,11 @@
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t('groups.manage.profile.title');
+  },
+
+  afterModel(group) {
+    if (group.get('automatic')) {
+      this.replaceWith("group.manage.interaction", group);
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js.es6
new file mode 100644
index 0000000000..e80cab1089
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/group-manage.js.es6
@@ -0,0 +1,23 @@
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t('groups.manage.title');
+  },
+
+  model() {
+    return this.modelFor('group');
+  },
+
+  afterModel(group) {
+    if (!this.currentUser ||
+        !(this.currentUser.admin && group.get('automatic')) &&
+        !this.currentUser.canManageGroup(group)) {
+
+      this.transitionTo("group.members", group);
+    }
+  },
+
+  setupController(controller, model) {
+    this.controllerFor('group-manage').setProperties({ model });
+    this.controllerFor("group").set("showing", 'manage');
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js.es6
index 6bb9610aed..11926198cc 100644
--- a/app/assets/javascripts/discourse/routes/group.js.es6
+++ b/app/assets/javascripts/discourse/routes/group.js.es6
@@ -1,14 +1,10 @@
-import Group from 'discourse/models/group';
-import showModal from 'discourse/lib/show-modal';
-
 export default Discourse.Route.extend({
-
   titleToken() {
     return [ this.modelFor('group').get('name') ];
   },
 
   model(params) {
-    return Group.find(params.name);
+    return this.store.find("group", params.name);
   },
 
   serialize(model) {
@@ -16,13 +12,6 @@ export default Discourse.Route.extend({
   },
 
   setupController(controller, model) {
-    controller.setProperties({ model, counts: this.get('counts') });
-  },
-
-  actions: {
-    showGroupMembershipModal(model) {
-      showModal('group-membership', { model });
-      this.controllerFor('modal').set('modalClass', 'group-membership-modal');
-    },
+    controller.setProperties({ model });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/groups.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js.es6
similarity index 100%
rename from app/assets/javascripts/discourse/routes/groups.js.es6
rename to app/assets/javascripts/discourse/routes/groups-index.js.es6
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js.es6
new file mode 100644
index 0000000000..24d0e96858
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/groups-new.js.es6
@@ -0,0 +1,21 @@
+import Group from 'discourse/models/group';
+
+export default Discourse.Route.extend({
+  titleToken() {
+    return I18n.t('admin.groups.new.title');
+  },
+
+  model() {
+    return Group.create({ automatic: false, visibility_level: 0 });
+  },
+
+  setupController(controller, model) {
+    controller.set("model", model);
+  },
+
+  afterModel() {
+    if (!(this.currentUser && this.currentUser.admin)) {
+      this.transitionTo("groups");
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 b/app/assets/javascripts/discourse/routes/preferences-account.js.es6
index bde67c6ce9..29200b6fd1 100644
--- a/app/assets/javascripts/discourse/routes/preferences-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-account.js.es6
@@ -1,13 +1,27 @@
+import UserBadge from 'discourse/models/user-badge';
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
   showFooter: true,
 
+  model: function() {
+    const user = this.modelFor('user');
+    if (this.siteSettings.enable_badges) {
+      return UserBadge.findByUsername(this.modelFor('user').get('username')).then(userBadges => {
+        user.set('badges', userBadges.map(ub => ub.badge));
+        return user;
+      });
+    } else {
+     return user;
+    }
+  },
+
   setupController(controller, user) {
     controller.reset();
     controller.setProperties({
       model: user,
-      newNameInput: user.get('name')
+      newNameInput: user.get('name'),
+      newTitleInput: user.get('title')
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
index 6b2fa60e29..3ab2439e86 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
@@ -2,6 +2,7 @@ import createPMRoute from "discourse/routes/build-private-messages-route";
 
 export default createPMRoute('tags', 'private-messages-tags').extend({
     model(params) {
+      this.controllerFor('user-private-messages').set('tagId', params.id);
       const username = this.modelFor("user").get("username_lower");
       return this.store.findFiltered("topicList", {
         filter: `topics/private-messages-tags/${username}/${params.id}`
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index 511961d8f1..ebf9a3d856 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -16,6 +16,7 @@
   onExpandPopupMenuOptions="onExpandPopupMenuOptions"
   onPopupMenuAction=onPopupMenuAction
   popupMenuOptions=popupMenuOptions
+  disabled=disableTextarea
   outletArgs=(hash composer=composer editorType="composer")}}
 
 {{#if site.mobileView}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 06c636c2b7..be1f2d50da 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -9,7 +9,7 @@
 </div>
 
 <div class='d-editor-container'>
-  <div class="d-editor-textarea-wrapper">
+  <div class="d-editor-textarea-wrapper {{if disabled "disabled"}}">
     <div class='d-editor-button-bar'>
       {{#each toolbar.groups as |group|}}
         {{#each group.buttons as |b|}}
@@ -39,7 +39,7 @@
     </div>
 
     {{conditional-loading-spinner condition=loading}}
-    {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated}}
+    {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated disabled=disabled}}
     {{popup-input-tip validation=validation}}
     {{plugin-outlet name="after-d-editor" tagName="" args=outletArgs}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index 2c9735d40c..2e657aa156 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -152,4 +152,13 @@
   </section>
 {{/unless}}
 
+{{#if siteSettings.tagging_enabled}}
+  <section class='field minimum-required-tags'>
+    <label>
+      {{i18n 'category.minimum_required_tags'}}
+      {{text-field value=category.minimum_required_tags type="number"}}
+    </label>
+  </section>
+{{/if}}
+
 {{plugin-outlet name="category-custom-settings" args=(hash category=category)}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
index 5693422c4d..ad0530ba8e 100644
--- a/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-flair-inputs.hbs
@@ -1,36 +1,35 @@
-<div class="group-flair-left">
-  <div>
-    <label for="flair_url">{{i18n 'groups.flair_url'}}</label>
-    {{text-field name="flair_url"
-        value=model.flair_url
-        placeholderKey="groups.flair_url_placeholder"}}
-  </div>
+<div class='control-group'>
+  <label class="control-label" for="flair_url">{{i18n 'groups.flair_url'}}</label>
 
-  <div>
-    <label for="flair_bg_color">{{i18n 'groups.flair_bg_color'}}</label>
-    {{text-field name="flair_bg_color"
-        class="group-flair-bg-color"
-        value=model.flair_bg_color
-        placeholderKey="groups.flair_bg_color_placeholder"}}
-  </div>
-
-  {{#if flairPreviewIcon}}
-    <div>
-      <label for="flair_color">{{i18n 'groups.flair_color'}}</label>
-      {{text-field name="flair_color"
-          class="group-flair-color"
-          value=model.flair_color
-          placeholderKey="groups.flair_color_placeholder"}}
-    </div>
-  {{/if}}
-
-  <div>
-    <strong>{{i18n 'groups.flair_note'}}</strong>
-  </div>
+  {{text-field name="flair_url"
+      class="input-xxlarge"
+      value=model.flair_url
+      placeholderKey="groups.flair_url_placeholder"}}
 </div>
 
-<div class="group-flair-right">
-  <label>{{flairPreviewLabel}}</label>
+<div class='control-group'>
+  <label class="control-label" for="flair_bg_color">{{i18n 'groups.flair_bg_color'}}</label>
+
+  {{text-field name="flair_bg_color"
+      class="group-flair-bg-color input-xxlarge"
+      value=model.flair_bg_color
+      placeholderKey="groups.flair_bg_color_placeholder"}}
+</div>
+
+{{#if flairPreviewIcon}}
+  <div class='control-group'>
+    <label class="control-label" for="flair_color">{{i18n 'groups.flair_color'}}</label>
+
+    {{text-field name="flair_color"
+        class="group-flair-color input-xxlarge"
+        value=model.flair_color
+        placeholderKey="groups.flair_color_placeholder"}}
+  </div>
+{{/if}}
+
+<div class='control-group'>
+  <label class='control-label'>{{flairPreviewLabel}}</label>
+
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
       <img width="45" height="45" src="{{demoAvatarUrl}}" class="avatar actor">
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
similarity index 53%
rename from app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
rename to app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
index f9f13474c7..1625fa5fc9 100644
--- a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
@@ -1,5 +1,5 @@
 {{#if value}}
-  {{#d-button class="btn-small group-logs-filter" action="clearFilter" actionParam=type}}
+  {{#d-button class="btn-small group-manage-logs-filter" action="clearFilter" actionParam=type}}
     <span>{{label}}</span>: {{filterText}}
     {{d-icon "times-circle"}}
   {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
similarity index 80%
rename from app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
rename to app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
index 6fe9bfd858..da955686e1 100644
--- a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
@@ -1,4 +1,4 @@
-<tr class="group-logs-row">
+<tr class="group-manage-logs-row">
   <td>
     {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.action key="action")}}
       {{log.actionTitle}}
@@ -33,7 +33,7 @@
 
   <td>{{bound-date log.created_at}}</td>
 
-  <td {{action "toggleDetails"}} class="group-logs-expand-details">
+  <td {{action "toggleDetails"}} class="group-manage-logs-expand-details">
     {{#if log.prev_value}}
       {{#if expandDetails}}
         {{d-icon 'ellipsis-v'}}
@@ -48,11 +48,11 @@
   <tr>
     <td colspan='6'>
       <p>
-        <strong>{{i18n 'groups.logs.from'}}</strong>: <code>{{log.prev_value}}</code>
+        <strong>{{i18n 'groups.manage.logs.from'}}</strong>: <code>{{log.prev_value}}</code>
       </p>
 
       <p>
-        <strong>{{i18n 'groups.logs.to'}}</strong>: <code>{{log.new_value}}</code>
+        <strong>{{i18n 'groups.manage.logs.to'}}</strong>: <code>{{log.new_value}}</code>
       </p>
     </td>
   </tr>
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
new file mode 100644
index 0000000000..0276ac16e5
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
@@ -0,0 +1,12 @@
+<div class='control-group buttons'>
+  {{#d-button action="save"
+      disabled=saving
+      class='btn btn-primary group-manage-save'}}
+
+      {{savingText}}
+  {{/d-button}}
+
+  {{#if saved}}
+    <span>{{i18n 'saved'}}</span>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
index fc0e9667b8..036bf9b1ca 100644
--- a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
@@ -24,7 +24,7 @@
           class="add"
           icon="plus"
           disabled=disableAddButton
-          label="groups.edit.add_members"}}
+          label="groups.manage.add_members"}}
     {{/if}}
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
index 435f77fa52..2bd1956492 100644
--- a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -11,21 +11,9 @@
       label="groups.leave"
       disabled=updatingMembership}}
 {{else if model.allow_membership_requests}}
-  {{#if userIsGroupUser}}
-    {{#if showMembershipStatus}}
-      {{d-button
-          class="btn-primary"
-          icon="user"
-          label="groups.is_group_user"
-          disabled=true}}
-    {{/if}}
-  {{else}}
-    {{d-button action="showRequestMembershipForm"
-        class="group-index-request"
-        disabled=loading
-        icon="user-plus"
-        label="groups.request"}}
-  {{/if}}
-{{else}}
-  {{yield}}
+  {{d-button action="showRequestMembershipForm"
+      class="group-index-request"
+      disabled=loading
+      icon="user-plus"
+      label="groups.request"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
index b97cdfa040..29ad6b7f1e 100644
--- a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
@@ -1,4 +1,14 @@
 {{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=currentPath}}
+  {{#if site.mobileView}}
+    <li>
+      {{#link-to "groups.index"}}
+        {{i18n "groups.index.all"}}
+      {{/link-to}}
+    </li>
+  {{else}}
+    {{group-dropdown content=group.extras.visible_group_names value=group.name}}
+  {{/if}}
+
   {{#each tabs as |tab|}}
     <li>
       {{#link-to tab.route group title=tab.message class=tab.name}}
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
new file mode 100644
index 0000000000..5ed87a5c02
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
@@ -0,0 +1,58 @@
+{{#if currentUser.admin}}
+  <div class="control-group">
+    <label class="control-label">{{i18n 'admin.groups.manage.interaction.visibility'}}</label>
+    <label for="visiblity">{{i18n 'admin.groups.manage.interaction.visibility_levels.title'}}</label>
+
+    {{combo-box name="alias"
+        valueAttribute="value"
+        value=model.visibility_level
+        content=visibilityLevelOptions
+        castInteger=true
+        class="groups-form-visibility-level"}}
+  </div>
+{{/if}}
+
+<div class="control-group">
+  <label class="control-label">{{i18n 'groups.manage.interaction.posting'}}</label>
+  <label for="alias">{{i18n 'groups.alias_levels.mentionable'}}</label>
+
+  {{combo-box name="alias"
+      valueAttribute="value"
+      value=model.mentionable_level
+      content=aliasLevelOptions
+      class="groups-form-mentionable-level"}}
+</div>
+
+<div class="control-group">
+  <label for="alias">{{i18n 'groups.alias_levels.messageable'}}</label>
+
+  {{combo-box name="alias"
+      valueAttribute="value"
+      value=model.messageable_level
+      content=aliasLevelOptions
+      class="groups-form-messageable-level"}}
+</div>
+
+{{#if showEmailSettings}}
+  <div class="control-group">
+    <label class="control-label">{{i18n 'admin.groups.manage.interaction.email'}}</label>
+    <label for="incoming_email">{{i18n 'admin.groups.manage.interaction.incoming_email'}}</label>
+
+    {{text-field name="incoming_email"
+        class="input-xxlarge groups-form-incoming-email"
+        value=model.incoming_email
+        placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder"}}
+
+    {{plugin-outlet name="group-email-in" args=(hash model=model)}}
+  </div>
+{{/if}}
+
+<label class="control-label">{{i18n 'groups.manage.interaction.notification'}}</label>
+
+<div class="control-group">
+  <label>{{i18n 'groups.notification_level'}}</label>
+
+  {{notifications-button i18nPrefix='groups.notifications'
+      value=model.default_notification_level
+      class="groups-form-default-notification-level"}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
new file mode 100644
index 0000000000..03f5755d8f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-membership-fields.hbs
@@ -0,0 +1,82 @@
+{{#if currentUser.admin}}
+  <div class="control-group">
+    <label class="control-label">{{i18n "admin.groups.manage.membership.automatic"}}</label>
+
+    <label for="automatic_membership">
+      {{i18n 'admin.groups.manage.membership.automatic_membership_email_domains'}}
+    </label>
+
+    {{list-setting name="automatic_membership"
+        settingValue=model.emailDomains
+        class="group-form-automatic-membership-automatic"}}
+
+    <label>
+      {{input type="checkbox"
+          checked=model.automatic_membership_retroactive
+          class="groups-form-automatic-membership-retroactive"}}
+
+      {{i18n 'admin.groups.manage.membership.automatic_membership_retroactive'}}
+    </label>
+
+    <label>
+      {{input type="checkbox"
+          checked=model.primary_group
+          class="groups-form-primary-group"}}
+
+      {{i18n 'admin.groups.manage.membership.primary_group'}}
+    </label>
+  </div>
+
+  <div class="control-group">
+    <label class="control-label">{{i18n "admin.groups.manage.membership.trust_level"}}</label>
+    <label for="grant_trust_level">{{i18n 'admin.groups.manage.membership.trust_levels_title'}}</label>
+
+    {{combo-box name="grant_trust_level"
+        valueAttribute="value"
+        value=model.grant_trust_level
+        content=trustLevelOptions
+        class="groups-form-grant-trust-level"}}
+  </div>
+{{/if}}
+
+<div class="control-group">
+  <label class="control-label">{{i18n "groups.manage.membership.access"}}</label>
+
+  <label>
+    {{input type="checkbox"
+        class="group-form-public-admission"
+        checked=model.public_admission
+        disabled=disablePublicSetting}}
+
+    {{i18n 'groups.public_admission'}}
+  </label>
+
+  <label>
+    {{input type='checkbox'
+        class='group-form-public-exit'
+        checked=model.public_exit}}
+
+    {{i18n 'groups.public_exit'}}
+  </label>
+
+  <label>
+    {{input type="checkbox"
+        class="group-form-allow-membership-requests"
+        checked=model.allow_membership_requests
+        disabled=disableMembershipRequestSetting}}
+
+    {{i18n 'groups.allow_membership_requests'}}
+  </label>
+
+  {{#if model.allow_membership_requests}}
+    <div>
+      <label for="membership-request-template">
+        {{i18n 'groups.membership_request_template'}}
+      </label>
+
+      {{expanding-text-area name="membership-request-template"
+          class='group-form-membership-request-template input-xxlarge'
+          value=model.membership_request_template}}
+    </div>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
new file mode 100644
index 0000000000..81de113225
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/groups-form-profile-fields.hbs
@@ -0,0 +1,47 @@
+{{#if this.currentUser.admin}}
+  <div class="control-group">
+    <label class="control-label" for="name">{{i18n 'groups.name'}}</label>
+
+    {{text-field name="name"
+        class="input-xxlarge group-form-name"
+        value=nameInput
+        placeholderKey="admin.groups.name_placeholder"}}
+
+    {{input-tip validation=nameValidation}}
+  </div>
+{{/if}}
+
+<div class="control-group">
+  <label class="control-label" for='full_name'>{{i18n 'groups.manage.full_name'}}</label>
+
+  {{text-field name='full_name'
+      class="input-xxlarge group-form-full-name"
+      value=model.full_name}}
+</div>
+
+{{#if this.currentUser.admin}}
+  <div class="control-group">
+    <label class="control-label" for="title">
+      {{i18n 'admin.groups.default_title'}}
+    </label>
+
+    {{input value=model.title name="title" class="input-xxlarge"}}
+
+    <div class="control-instructions">
+      {{i18n 'admin.groups.default_title_description'}}
+    </div>
+  </div>
+{{/if}}
+
+<div class="control-group">
+  <label class="control-label" for="bio">{{i18n 'groups.bio'}}</label>
+  {{d-editor value=model.bio_raw class="group-form-bio input-xxlarge"}}
+</div>
+
+{{yield}}
+
+<div class="control-group">
+  {{group-flair-inputs model=model}}
+</div>
+
+{{plugin-outlet name="group-edit" args=(hash group=model)}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index e07a6eddf8..204c01ac72 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -9,7 +9,6 @@
       {{composer-messages composer=model
                           messageCount=messageCount
                           addLinkLookup="addLinkLookup"}}
-
       {{#if model.viewOpen}}
         <div class="reply-area {{if canEditTags 'with-tags'}}">
           <div class='composer-fields'>
@@ -65,7 +64,8 @@
                   </div>
                 {{/if}}
                 {{#if canEditTags}}
-                  {{mini-tag-chooser tags=model.tags tabindex="4" categoryId=model.categoryId}}
+                  {{mini-tag-chooser tags=model.tags tabindex="4" categoryId=model.categoryId minimum=model.minimumRequiredTags}}
+                  {{popup-input-tip validation=tagValidation}}
                 {{/if}}
 
 
@@ -105,11 +105,18 @@
                                      label=model.saveLabel
                                      disableSubmit=disableSubmit}}
             {{#if site.mobileView}}
-              <a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">{{d-icon "trash-o"}}</a>
+              <a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">
+                {{#if canEdit}}
+                  {{d-icon "times"}}
+                {{else}}
+                  {{d-icon "trash-o"}}
+                {{/if}}
+              </a>
             {{else}}
               <a href {{action "cancel"}} class='cancel' tabindex="6" >{{i18n 'cancel'}}</a>
             {{/if}}
 
+
               {{#if site.mobileView}}
                 {{#if whisperOrUnlistTopic}}
                   <span class='whisper'>
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 01edd14023..68d2869183 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -1,163 +1,198 @@
 {{#d-section pageClass="search" class="search-container"}}
-  {{scroll-tracker name="full-page-search" tag=searchTerm}}
-  <div class="search row clearfix">
-    <div class="search-bar">
-    {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}}
-    {{d-button action="search" icon="search" class="btn-primary" disabled=searching}}
-    </div>
-    <div class='search-advanced'>
-      <button class="search-advanced-btn btn" {{action "toggleAdvancedSearch"}}>
-        {{{searchAdvancedIcon}}}
-        {{i18n "search.advanced.title"}}
-      </button>
+  {{scroll-tracker name="full-page-search" tag=searchTerm class="hidden"}}
 
-      {{#if expanded}}
-        {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}}
+  <div class="search-advanced">
+    {{#unless site.mobileView}}
+      <div class="search-bar">
+        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" action="search" hasAutofocus=hasAutofocus}}
+        {{d-button action="search" icon="search" class="btn-primary search-cta" disabled=searching}}
+      </div>
+    {{/unless}}
+
+    <div class="search-notice">
+      {{#if invalidSearch}}
+        <div class="fps-invalid">
+          {{i18n "search.too_short"}}
+        </div>
+      {{/if}}
+    </div>
+
+    <div class="search-context">
+      {{#if context}}
+        <div class='fps-search-context'>
+          <label>
+            {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
+          </label>
+        </div>
       {{/if}}
     </div>
 
     {{#if hasResults}}
-      {{create-topic-button canCreateTopic=canCreateTopic action=(action "createTopic" searchTerm)}}
+      <div class='search-title'>
+        {{#if hasResults}}
+          {{create-topic-button canCreateTopic=canCreateTopic action=(action "createTopic" searchTerm)}}
+        {{/if}}
+
+        {{#if canBulkSelect}}
+          {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}
+          {{bulk-select-button selected=selected action="search"}}
+        {{/if}}
+
+        {{#if bulkSelectEnabled}}
+          <div class='fps-select'>
+            <a {{action "selectAll"}}>{{i18n "search.select_all"}}</a>
+            <a {{action "clearAll"}}>{{i18n "search.clear_all"}}</a>
+          </div>
+        {{/if}}
+      </div>
+
+      <div class='search-info'>
+        <div class='result-count'>
+          {{{resultCountLabel}}}
+        </div>
+        <div class='sort-by'>
+          <span class='desc'>
+            {{i18n "search.sort_by"}}
+          </span>
+          {{combo-box value=sortOrder content=sortOrders castInteger=true}}
+        </div>
+      </div>
     {{/if}}
 
-    {{#if canBulkSelect}}
-      {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}
-      {{bulk-select-button selected=selected action="search"}}
-    {{/if}}
+    <div class="search-results">
+      {{#load-more selector=".fps-result" action="loadMore"}}
+        {{#each model.posts as |result|}}
+          <div class='fps-result'>
+            <div class='author'>
+              <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+                {{avatar result imageSize="large"}}
+              </a>
+            </div>
+
+            <div class='fps-topic'>
+              <div class='topic'>
+                {{#if bulkSelectEnabled}}
+                  {{track-selected selectedList=selected selectedId=result.topic}}
+                {{/if}}
+
+                <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
+                  {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+                </a>
+
+                <div class='search-category'>
+                  {{#if result.topic.category.parentCategory}}
+                  {{category-link result.topic.category.parentCategory}}
+                  {{/if}}
+                  {{category-link result.topic.category hideParent=true}}
+                  {{#each result.topic.tags as |tag|}}
+                    {{discourse-tag tag}}
+                  {{/each}}
+                  {{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
+                </div>
+              </div>
+
+              <div class='blurb container'>
+                <span class='date'>
+                  {{format-age result.created_at}}
+                  {{#if result.blurb}}
+                  -
+                  {{/if}}
+                </span>
+
+                {{#if result.blurb}}
+                  {{#highlight-text highlight=highlightQuery}}
+                    {{{unbound result.blurb}}}
+                  {{/highlight-text}}
+                {{/if}}
+              </div>
+
+              {{#if showLikeCount}}
+                {{#if result.like_count}}
+                  <span class='like-count'>
+                    {{result.like_count}} {{d-icon "heart"}}
+                  </span>
+                {{/if}}
+              {{/if}}
+            </div>
+          </div>
+        {{/each}}
+
+        {{#conditional-loading-spinner condition=loading }}
+          {{#unless hasResults}}
+            {{#if searchActive}}
+              <h3>{{i18n "search.no_results"}}</h3>
+
+              {{#if showSuggestion}}
+                <div class="no-results-suggestion">
+                  {{i18n "search.cant_find"}}
+                  {{#if canCreateTopic}}
+                    <a href {{action "createTopic" searchTerm}}>{{i18n "search.start_new_topic"}}</a>
+                    {{#unless siteSettings.login_required}}
+                      {{i18n "search.or_search_google"}}
+                    {{/unless}}
+                  {{else}}
+                    {{i18n "search.search_google"}}
+                  {{/if}}
+                </div>
+
+                {{google-search searchTerm=searchTerm}}
+              {{/if}}
+            {{/if}}
+          {{/unless}}
+
+          {{#if hasResults}}
+            {{#unless loading}}
+              <h3 class="search-footer">
+                {{#if model.grouped_search_result.more_full_page_results}}
+                  {{#if isLastPage }}
+                    {{i18n "search.more_results"}}
+                  {{/if}}
+                {{else}}
+                  {{i18n "search.no_more_results"}}
+                {{/if}}
+              </h3>
+            {{/unless}}
+          {{/if}}
+        {{/conditional-loading-spinner}}
+      {{/load-more}}
+    </div>
   </div>
 
-  {{#if bulkSelectEnabled}}
-    <div class='fps-select'>
-      <a {{action "selectAll"}}>{{i18n "search.select_all"}}</a>
-      <a {{action "clearAll"}}>{{i18n "search.clear_all"}}</a>
-    </div>
-  {{/if}}
-
-  {{#if invalidSearch}}
-    <div class='fps-invalid'>
-      {{i18n "search.too_short"}}
-    </div>
-  {{/if}}
-
-  {{#if context}}
-    <div class='fps-search-context'>
-      <label>
-        {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
-      </label>
-    </div>
-  {{/if}}
-
-  {{#if hasResults}}
-    <div class='search-title clearfix'>
-      <div class='result-count'>
-        <span>
-          {{{resultCountLabel}}}
-        </span>
+  <div class="search-advanced-sidebar">
+    {{#if site.mobileView}}
+      <div class="search-bar">
+        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" action="search" hasAutofocus=hasAutofocus}}
+        {{d-button action="search" icon="search" class="btn-primary search-cta" disabled=searching}}
       </div>
-      <div class='sort-by'>
-        <span class='desc'>
-          {{i18n "search.sort_by"}}
-        </span>
-        {{combo-box value=sortOrder content=sortOrders castInteger=true}}
-      </div>
-    </div>
-  {{/if}}
+    {{/if}}
 
-  {{#load-more selector=".fps-result" action="loadMore"}}
-    {{#each model.posts as |result|}}
-      <div class='fps-result'>
-        <div class='author'>
-          <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
-            {{avatar result imageSize="large"}}
-          </a>
+    {{#if site.mobileView}}
+      <button class="search-advanced-title btn" {{action "toggleAdvancedSearch"}}>
+        {{{searchAdvancedIcon}}} {{i18n "search.advanced.title"}}
+      </button>
+    {{else}}
+      <span class="search-advanced-title">
+        {{i18n "search.advanced.title"}}
+      </span>
+    {{/if}}
+
+    {{#if site.mobileView}}
+      {{#if expanded}}
+        <div class="search-advanced-filters">
+          {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}}
         </div>
-
-        <div class='fps-topic'>
-          <div class='topic'>
-            {{#if bulkSelectEnabled}}
-              {{track-selected selectedList=selected selectedId=result.topic}}
-            {{/if}}
-
-            <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
-              {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
-            </a>
-
-            <div class='search-category'>
-              {{#if result.topic.category.parentCategory}}
-              {{category-link result.topic.category.parentCategory}}
-              {{/if}}
-              {{category-link result.topic.category hideParent=true}}
-              {{#each result.topic.tags as |tag|}}
-                {{discourse-tag tag}}
-              {{/each}}
-              {{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
-            </div>
-          </div>
-
-          <div class='blurb container'>
-            <span class='date'>
-              {{format-age result.created_at}}
-              {{#if result.blurb}}
-              -
-              {{/if}}
-            </span>
-
-            {{#if result.blurb}}
-              {{#highlight-text highlight=highlightQuery}}
-                {{{unbound result.blurb}}}
-              {{/highlight-text}}
-            {{/if}}
-          </div>
-
-          {{#if showLikeCount}}
-            {{#if result.like_count}}
-              <span class='like-count'>
-                {{result.like_count}} {{d-icon "heart"}}
-              </span>
-            {{/if}}
-          {{/if}}
-        </div>
-      </div>
-    {{/each}}
-
-    {{#conditional-loading-spinner condition=loading }}
-      {{#unless hasResults}}
-        {{#if searchActive}}
-          <h3>{{i18n "search.no_results"}}</h3>
-
-          {{#if showSuggestion}}
-            <div class="no-results-suggestion">
-              {{i18n "search.cant_find"}}
-              {{#if canCreateTopic}}
-                <a href {{action "createTopic" searchTerm}}>{{i18n "search.start_new_topic"}}</a>
-                {{#unless siteSettings.login_required}}
-                  {{i18n "search.or_search_google"}}
-                {{/unless}}
-              {{else}}
-                {{i18n "search.search_google"}}
-              {{/if}}
-            </div>
-
-            {{google-search searchTerm=searchTerm}}
-          {{/if}}
-        {{/if}}
-      {{/unless}}
-
-      {{#if hasResults}}
-        {{#unless loading}}
-          <h3 class="search-footer">
-            {{#if model.grouped_search_result.more_full_page_results}}
-              {{#if isLastPage }}
-                {{i18n "search.more_results"}}
-              {{/if}}
-            {{else}}
-              {{i18n "search.no_more_results"}}
-            {{/if}}
-          </h3>
-        {{/unless}}
       {{/if}}
-    {{/conditional-loading-spinner}}
-
-  {{/load-more}}
+    {{else}}
+      <div class="search-advanced-filters">
+        {{search-advanced-options searchTerm=searchTerm isExpanded=true}}
 
+        {{d-button
+          label="submit"
+          action="search"
+          icon="search"
+          class="btn-primary search-cta"
+          disabled=searching}}
+      </div>
+    {{/if}}
+  </div>
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/group-edit.hbs b/app/assets/javascripts/discourse/templates/group-edit.hbs
deleted file mode 100644
index 7e56a0ead2..0000000000
--- a/app/assets/javascripts/discourse/templates/group-edit.hbs
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class='group-edit'>
-  <form class="form-horizontal">
-    <div class="control-group">
-      <label for='full_name'>{{i18n 'groups.edit.full_name'}}</label>
-      {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
-    </div>
-
-    <div class="control-group">
-      <label for='bio'>{{i18n 'groups.bio'}}</label>
-      {{d-editor value=model.bio_raw class="group-edit-bio"}}
-    </div>
-
-    <div class="control-group">
-      {{group-flair-inputs model=model}}
-    </div>
-
-    <div class="control-group">
-      <label>
-        {{input type='checkbox'
-            checked=model.public_admission
-            class="group-edit-public-admission"
-            disabled=model.allow_membership_requests}}
-
-        {{i18n 'groups.public_admission'}}
-      </label>
-    </div>
-
-    <div class="control-group">
-      <label>
-        {{input type='checkbox'
-            checked=model.public_exit
-            class="group-edit-public-exit"}}
-
-        {{i18n 'groups.public_exit'}}
-      </label>
-    </div>
-
-    <div class="control-group">
-      <label>
-        {{input type='checkbox'
-            checked=model.allow_membership_requests
-            class="group-edit-allow-membership-requests"
-            disabled=model.public_admission}}
-
-        {{i18n 'groups.allow_membership_requests'}}
-      </label>
-    </div>
-
-    {{#if model.allow_membership_requests}}
-      <div>
-        <label for="membership-request-template">
-          {{i18n 'groups.membership_request_template'}}
-        </label>
-
-        {{expanding-text-area name="membership-request-template"
-            value=model.membership_request_template
-            class="group-edit-membership-request-template"}}
-      </div>
-    {{/if}}
-
-    {{plugin-outlet name="group-edit" args=(hash group=model)}}
-
-    {{d-button action="save" class="btn-primary" disabled=saving label="save"}}
-    {{savingText}}
-  </form>
-</div>
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index e3d578ac96..c0cf37140c 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -1,12 +1,27 @@
-{{text-field value=filterInput
-    placeholderKey=filterPlaceholder
-    class="group-username-filter no-blur"}}
+<div class="group-members-actions">
+  {{text-field value=filterInput
+      placeholderKey=filterPlaceholder
+      class="group-username-filter no-blur"}}
+
+  {{#if canManageGroup}}
+    {{#if currentUser.admin}}
+      {{group-members-dropdown
+          showAddMembersModal="showAddMembersModal"
+          showBulkAddModal="showBulkAddModal"}}
+    {{else}}
+      {{d-button icon="plus"
+          label="groups.add_members.title"
+          class="group-members-add"}}
+    {{/if}}
+  {{/if}}
+</div>
 
 {{#if hasMembers}}
   {{#load-more selector=".group-members tr" action="loadMore"}}
     <table class='group-members'>
       <thead>
         {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
+        <th class='group-owner'>{{i18n "groups.members.owner"}}</th>
         {{group-index-toggle order=order desc=desc field='last_posted_at' i18nKey='last_post'}}
         {{group-index-toggle order=order desc=desc field='last_seen_at'  i18nKey='last_seen'}}
         <th></th>
@@ -16,10 +31,17 @@
         {{#each model.members as |m|}}
           <tr>
             <td class='avatar'>
-              {{#user-info user=m skipName=skipName}}
-                {{#if m.owner}}<strong class="group-owner-label">{{i18n "groups.owner"}}</strong>{{/if}}
-              {{/user-info}}
+              {{user-info user=m skipName=skipName}}
             </td>
+
+            <td class='group-owner'>
+              {{#if m.owner}}
+                <strong class="group-owner-label">
+                  {{d-icon "shield"}}
+                </strong>
+              {{/if}}
+            </td>
+
             <td>
               <span class="text">{{bound-date m.last_posted_at}}</span>
             </td>
diff --git a/app/assets/javascripts/discourse/templates/group-logs.hbs b/app/assets/javascripts/discourse/templates/group-logs.hbs
deleted file mode 100644
index 154b78d678..0000000000
--- a/app/assets/javascripts/discourse/templates/group-logs.hbs
+++ /dev/null
@@ -1,33 +0,0 @@
-{{#if model.logs}}
-  <div class="group-logs-controls">
-    {{group-logs-filter clearFilter="clearFilter" value=filters.action type="action"}}
-    {{group-logs-filter clearFilter="clearFilter" value=filters.acting_user type="acting_user"}}
-    {{group-logs-filter clearFilter="clearFilter" value=filters.target_user type="target_user"}}
-    {{group-logs-filter clearFilter="clearFilter" value=filters.subject type="subject"}}
-  </div>
-
-  {{#load-more selector=".group-logs .group-logs-row" action="loadMore"}}
-    <table class="group-logs">
-      <thead>
-        <th>{{i18n 'groups.logs.action'}}</th>
-        <th>{{i18n 'groups.logs.acting_user'}}</th>
-        <th>{{i18n 'groups.logs.target_user'}}</th>
-        <th>{{i18n 'groups.logs.subject'}}</th>
-        <th>{{i18n 'groups.logs.when'}}</th>
-        <th></th>
-      </thead>
-
-      <tbody>
-        {{#each model.logs as |log|}}
-          {{group-logs-row
-              log=log
-              filters=filters}}
-        {{/each}}
-      </tbody>
-    </table>
-  {{/load-more}}
-
-  {{conditional-loading-spinner condition=loading}}
-{{else}}
-  <div>{{i18n "groups.empty.logs"}}</div>
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 6fc009b830..53fb6bf976 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -1,12 +1,5 @@
 {{plugin-outlet name="before-group-container" args=(hash group=model)}}
 
-{{#link-to "groups"}}
-  {{d-icon 'arrow-left'}}
-  {{i18n "groups.index.title"}}
-{{/link-to}}
-
-<hr>
-
 <div class="container group {{model.name}}">
   <div class='group-details-container'>
     <div class='group-info'>
@@ -36,27 +29,34 @@
         <p>{{{model.bio_cooked}}}</p>
       </div>
     {{/if}}
+
+    <div class="group-details-button">
+      {{group-membership-button
+          class="inline"
+          model=model
+          showLogin='showLogin'}}
+
+      {{#if displayGroupMessageButton}}
+        {{d-button
+            action="messageGroup"
+            class="btn-primary group-message-button inline"
+            icon="envelope"
+            label="groups.message"}}
+      {{/if}}
+
+      {{#if currentUser.admin}}
+        {{d-button action="destroy"
+            disabled=destroying
+            icon="trash"
+            class='btn-danger'
+            label="admin.groups.delete"}}
+      {{/if}}
+    </div>
   </div>
 
   <div class="list-controls">
     <div class="container">
       {{group-navigation group=model currentPath=application.currentPath tabs=tabs}}
-
-      {{#if canManageGroup}}
-        {{group-navigation-dropdown
-            model=model
-            manageMembership=(route-action "showGroupMembershipModal")}}
-      {{/if}}
-
-      {{#if displayGroupMessageButton}}
-        {{d-button
-            action="messageGroup"
-            class="btn-primary group-message-button"
-            icon="envelope"
-            label="groups.message"}}
-      {{/if}}
-
-      {{group-membership-button model=model showLogin='showLogin'}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index 957c08e939..06dd803657 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,5 +1,5 @@
 <div class='group-activity container'>
-  {{#mobile-nav class='group-activity-nav' desktopClass="pull-left nav nav-stacked" currentPath=application.currentPath}}
+  {{#mobile-nav class='group-activity-nav group-navigation' desktopClass="pull-left nav nav-stacked" currentPath=application.currentPath}}
     {{group-activity-filter filter="posts" categoryId=category_id}}
     {{group-activity-filter filter="topics" categoryId=category_id}}
     {{#if siteSettings.enable_mentions}}
diff --git a/app/assets/javascripts/discourse/templates/group/manage.hbs b/app/assets/javascripts/discourse/templates/group/manage.hbs
new file mode 100644
index 0000000000..0f1e4c9f88
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage.hbs
@@ -0,0 +1,15 @@
+<div class='group-manage container'>
+  {{#mobile-nav class='group-navigation' desktopClass='pull-left nav nav-stacked' currentPath=application.currentPath}}
+    {{#each tabs as |tab|}}
+      <li>
+        {{#link-to tab.route model.name}}
+          {{i18n tab.title}}
+        {{/link-to}}
+      </li>
+    {{/each}}
+  {{/mobile-nav}}
+
+  <div class="{{if site.mobileView "" "pull-left"}} group-manage-outlet">
+    {{outlet}}
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/group/manage/interaction.hbs b/app/assets/javascripts/discourse/templates/group/manage/interaction.hbs
new file mode 100644
index 0000000000..8879b9000c
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage/interaction.hbs
@@ -0,0 +1,4 @@
+<form class="groups-form form-vertical">
+  {{groups-form-interaction-fields model=model}}
+  {{group-manage-save-button model=model}}
+</form>
diff --git a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
new file mode 100644
index 0000000000..d21a3a98ae
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
@@ -0,0 +1,33 @@
+{{#if model.logs}}
+  <div class="group-manage-logs-controls">
+    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.action type="action"}}
+    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.acting_user type="acting_user"}}
+    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.target_user type="target_user"}}
+    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.subject type="subject"}}
+  </div>
+
+  {{#load-more selector=".group-manage-logs .group-manage-logs-row" action="loadMore"}}
+    <table class="group-manage-logs">
+      <thead>
+        <th>{{i18n 'groups.manage.logs.action'}}</th>
+        <th>{{i18n 'groups.manage.logs.acting_user'}}</th>
+        <th>{{i18n 'groups.manage.logs.target_user'}}</th>
+        <th>{{i18n 'groups.manage.logs.subject'}}</th>
+        <th>{{i18n 'groups.manage.logs.when'}}</th>
+        <th></th>
+      </thead>
+
+      <tbody>
+        {{#each model.logs as |log|}}
+          {{group-manage-logs-row
+              log=log
+              filters=filters}}
+        {{/each}}
+      </tbody>
+    </table>
+  {{/load-more}}
+
+  {{conditional-loading-spinner condition=loading}}
+{{else}}
+  <div>{{i18n "groups.empty.logs"}}</div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group/manage/membership.hbs b/app/assets/javascripts/discourse/templates/group/manage/membership.hbs
new file mode 100644
index 0000000000..bb0a12982f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage/membership.hbs
@@ -0,0 +1,4 @@
+<form class="groups-form form-vertical">
+  {{groups-form-membership-fields model=model}}
+  {{group-manage-save-button model=model}}
+</form>
diff --git a/app/assets/javascripts/discourse/templates/group/manage/profile.hbs b/app/assets/javascripts/discourse/templates/group/manage/profile.hbs
new file mode 100644
index 0000000000..4c4ab73ba1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/group/manage/profile.hbs
@@ -0,0 +1,4 @@
+<form class="groups-form form-vertical">
+  {{groups-form-profile-fields model=model disableSave=saving}}
+  {{group-manage-save-button model=model saving=saving}}
+</form>
diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs
index 5d86ab3df4..923a6017d0 100644
--- a/app/assets/javascripts/discourse/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/group/messages.hbs
@@ -1,5 +1,6 @@
 <div class='group-activity container'>
-  {{#mobile-nav class='group-messages-nav' desktopClass='pull-left nav nav-stacked' currentPath=application.currentPath}}
+  {{#mobile-nav class='group-navigation' desktopClass='pull-left nav nav-stacked' currentPath=application.currentPath}}
+
     <li>
       {{#link-to 'group.messages.inbox' model.name}}
         {{i18n 'user.messages.inbox'}}
diff --git a/app/assets/javascripts/discourse/templates/groups.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
similarity index 55%
rename from app/assets/javascripts/discourse/templates/groups.hbs
rename to app/assets/javascripts/discourse/templates/groups/index.hbs
index 2bfc5d1f5a..d4f9a95dc2 100644
--- a/app/assets/javascripts/discourse/templates/groups.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -1,16 +1,24 @@
 {{#d-section pageClass="groups"}}
-  <h1>{{i18n "groups.index.title"}}</h1>
+  <div class="groups-header">
+    {{#if currentUser.admin}}
+      {{d-button action="new"
+          class="groups-header-new pull-right"
+          icon="plus"
+          label="admin.groups.new.title"}}
+    {{/if}}
 
-  <div class="groups-filter">
-    {{combo-box value=type
-                content=types
-                clearable=true
-                none="groups.index.all_groups"
-                class="groups-type-filter"}}
+    <div class="groups-header-filters">
+      {{text-field value=filterInput
+          placeholderKey="groups.index.all_groups"
+          class="groups-header-filters-name no-blur"}}
 
-    {{text-field value=filterInput
-        placeholderKey="groups.filter_name"
-        class="groups-name-filter no-blur"}}
+      {{combo-box value=type
+                  content=types
+                  clearable=true
+                  allowAutoSelectFirst=false
+                  noneLabel="groups.index.filter"
+                  class="groups-header-filters-type"}}
+    </div>
   </div>
 
   {{#if model}}
@@ -19,10 +27,10 @@
         <div class='container'>
           <table class="groups-table">
             <thead>
-              <th></th>
+              {{directory-toggle field="name" labelKey="groups.group_name" order=order asc=asc}}
               {{directory-toggle field="user_count" labelKey="groups.user_count" order=order asc=asc}}
+              <th>{{i18n "groups.index.group_type"}}</th>
               <th>{{i18n "groups.membership"}}</th>
-              <th></th>
             </thead>
 
             <tbody>
@@ -58,25 +66,33 @@
 
                   <td class="groups-user-count">{{group.user_count}}</td>
 
-                  <td>
-                    {{#group-membership-button model=group
-                        showMembershipStatus=true
-                        showLogin='showLogin'}}
-
-                      {{d-button icon="ban"
-                          label=(if group.automatic 'groups.automatic_group' 'groups.close_group')
-                          disabled=true}}
-                    {{/group-membership-button}}
+                  <td class="groups-table-type">
+                    {{#if group.public_admission}}
+                      {{i18n 'groups.index.public'}}
+                    {{else if group.isPrivate}}
+                      {{d-icon "eye-slash"}}
+                      {{i18n 'groups.index.private'}}
+                    {{else}}
+                      {{#if group.automatic}}
+                        {{i18n 'groups.index.automatic'}}
+                      {{else}}
+                        {{i18n 'groups.index.closed'}}
+                      {{/if}}
+                    {{/if}}
                   </td>
 
-                  <td class="group-user-status">
-                    {{#if group.is_group_user}}
-                      {{d-icon "user" title="groups.is_group_user"}}
+                  <td class="groups-table-membership">
+                    {{#if group.is_group_owner}}
+                      <span>
+                        {{i18n "groups.index.is_group_owner"}}
+                      </span>
+                    {{else if group.is_group_user}}
+                      <span>
+                        {{i18n "groups.index.is_group_user"}}
+                      </span>
                     {{/if}}
 
-                    {{#if group.is_group_owner}}
-                      {{d-icon "shield" title="groups.is_group_owner"}}
-                    {{/if}}
+                    {{group-membership-button model=group showLogin='showLogin'}}
                   </td>
                 </tr>
               {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/templates/groups/new.hbs
new file mode 100644
index 0000000000..2501e0be9f
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/groups/new.hbs
@@ -0,0 +1,41 @@
+{{#d-section pageClass="groups-new"}}
+  <h1>{{i18n "admin.groups.new.title"}}</h1>
+
+  <hr/>
+
+  <form class="groups-form form-vertical">
+    {{#groups-form-profile-fields model=model disableSave=saving}}
+      <div class="control-group">
+        <label class="control-label" for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
+
+        {{user-selector usernames=model.ownerUsernames
+            class="input-xxlarge"
+            placeholderKey="groups.selector_placeholder"
+            id="owner-selector"}}
+      </div>
+
+      <div class="control-group">
+        <label class="control-label" for="member-selector">{{i18n 'groups.members.title'}}</label>
+
+        {{user-selector usernames=model.usernames
+            class="input-xxlarge"
+            placeholderKey="groups.selector_placeholder"
+            id="member-selector"}}
+      </div>
+    {{/groups-form-profile-fields}}
+
+    {{groups-form-membership-fields model=model}}
+    {{groups-form-interaction-fields model=model}}
+
+    <div class='control-group buttons'>
+      {{d-button action="save"
+          disabled=saving
+          class='btn btn-primary group-form-save'
+          label="admin.groups.new.create"}}
+
+      {{#link-to "groups"}}
+        {{i18n 'cancel'}}
+      {{/link-to}}
+    </div>
+  </form>
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
index 56a994a551..5bb3d82280 100644
--- a/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs
@@ -1 +1 @@
-<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}"><a href="{{topic.lastPostUrl}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a></{{tagName}}>
+<{{tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{{topic.bumpedAtTitle}}}"><a class="post-activity" href="{{topic.lastPostUrl}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a></{{tagName}}>
diff --git a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
index 4e41ba326b..f997dcbff0 100644
--- a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
@@ -1,5 +1,5 @@
 {{#if view.showBadges}}
-  {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}}
+  {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
 {{else}}
   {{raw "list/posts-count-column" topic=topic tagName="div"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index 942e3f8d82..2831237bc5 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -14,7 +14,7 @@
     {{/if}}
     {{raw-plugin-outlet name="topic-list-after-title"}}
     {{#if showTopicPostBadges}}
-      {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}}
+      {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
     {{/if}}
   </span>
 
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
index cc0751fc36..b1c05322a1 100644
--- a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -2,6 +2,20 @@
     placeholderKey=filterPlaceholder
     class="group-username-filter no-blur"}}
 
+<div class="group-members-manage">
+  {{#if canManageGroup}}
+    {{#if currentUser.admin}}
+      {{group-members-dropdown
+          showAddMembersModal="showAddMembersModal"
+          showBulkAddModal="showBulkAddModal"}}
+    {{else}}
+      {{d-button icon="plus"
+          label="groups.add_members.title"
+          class="group-members-add"}}
+    {{/if}}
+  {{/if}}
+</div>
+
 {{#if hasMembers}}
   {{#load-more selector=".group-members .user-info" action="loadMore"}}
     <div class="group-members">
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 483a42827d..c2cfea754d 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -79,7 +79,7 @@
           <tr class="password-confirmation">
             <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
             <td>
-              {{input type="password" value=accountPasswordConfirm id="new-account-confirmation"}}
+              {{input type="password" value=accountPasswordConfirm id="new-account-confirmation" autocomplete="false"}}
               {{input value=accountChallenge id="new-account-challenge"}}
             </td>
           </tr>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index dd24392734..f2d00aac48 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -12,7 +12,7 @@
       {{d-button action="resetPassword"
                  label="forgot_password.reset"
                  disabled=submitDisabled
-                 class="btn-primary"}}
+                 class="btn-primary forgot-password-reset"}}
     {{else}}
       {{d-button class="btn-large btn-primary"
                  label="forgot_password.button_ok"
diff --git a/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
new file mode 100644
index 0000000000..59db581299
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
@@ -0,0 +1,35 @@
+{{#d-modal-body title="groups.add_members.title"}}
+  <form class="form-vertical group-add-members">
+    <div class="control-group">
+      <label class="control-label">
+        {{i18n "groups.add_members.usernames"}}
+      </label>
+
+      {{user-selector
+          class="input-xxlarge"
+          usernames=model.usernames
+          placeholderKey="groups.selector_placeholder"
+          id="group-add-members-user-selector"}}
+    </div>
+
+    {{#if currentUser.admin}}
+      <div class="control-group group-add-members-make-owner">
+        <label>
+          {{input type="checkbox"
+              class="inline"
+              checked=setAsOwner
+              disabled=bulkAdd}}
+          {{i18n "admin.groups.add_members.as_owner"}}
+        </label>
+      </div>
+    {{/if}}
+  </form>
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button action="addMembers"
+      class="add btn-primary"
+      icon="plus"
+      disabled=disableAddButton
+      label="groups.add"}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
new file mode 100644
index 0000000000..887e5a9011
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
@@ -0,0 +1,38 @@
+{{#d-modal-body title="admin.groups.bulk_add.title"}}
+  {{#if result}}
+    {{#if result.message}}
+      <div class="alert alert-success">
+        {{result.message}}
+      </div>
+    {{/if}}
+
+    {{#if result.invalidUsers}}
+      <div class="alert alert-error">
+        {{i18n "admin.groups.bulk_add.complete_users_not_added"}}
+        {{result.invalidUsers}}
+      </div>
+    {{/if}}
+
+    <div class="">
+      <a {{action 'cancel'}}>{{i18n 'cancel'}}</a>
+    </div>
+  {{else}}
+    <form class="form-vertical group-bulk-add">
+      <div class="control-group">
+        <label class="control-label">
+          {{i18n "admin.groups.bulk_add.paste"}}
+        </label>
+
+        {{textarea value=input}}
+      </div>
+    </form>
+  {{/if}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button action="add"
+      class="add btn-primary"
+      icon="plus"
+      disabled=disableAddButton
+      label="groups.add"}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/group-membership.hbs b/app/assets/javascripts/discourse/templates/modal/group-membership.hbs
deleted file mode 100644
index 92c35ab9f0..0000000000
--- a/app/assets/javascripts/discourse/templates/modal/group-membership.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-{{#d-modal-body class='group-membership' title="groups.add_members.title"}}
-  <div class="control-group">
-    <label>{{i18n "groups.add_members.usernames"}}</label>
-
-    {{user-selector
-        usernames=model.usernames
-        placeholderKey="groups.selector_placeholder"
-        id="group-membership-user-selector"}}
-  </div>
-
-  {{#if this.currentUser.admin}}
-    <div class="control-group group-membership-make-owner">
-      <label class="inline">{{i18n "groups.add_members.as_owner"}}</label>
-      {{input type="checkbox" class="inline" checked=setAsOwner}}
-    </div>
-  {{/if}}
-{{/d-modal-body}}
-
-<div class="modal-footer">
-  {{d-button action="addMembers"
-      class="add btn-primary"
-      icon="plus"
-      disabled=disableAddButton
-      label="groups.add"}}
-</div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 6862fac382..c9a6b01105 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -100,8 +100,10 @@
   <div class="control-group pref-title">
     <label class="control-label">{{i18n 'user.title.title'}}</label>
     <div class="controls">
-      <span class="static">{{model.title}}</span>
-      {{#link-to "preferences.badgeTitle" class="btn btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
+      {{combo-box
+        value=newTitleInput
+        content=model.availableTitles
+        none="user.title.none"}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
index 0a7dc1ef70..55dea80a7c 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
@@ -15,7 +15,7 @@
     {{tag-chooser
       tags=model.parent_tag_name
       everyTag=true
-      limit=1
+      maximum=1
       allowCreate=true
       filterPlaceholder="tagging.groups.parent_tag_placeholder"}}
     <span class="description">{{i18n 'tagging.groups.parent_tag_description'}}</span>
@@ -28,6 +28,13 @@
     </label>
   </section>
 
+  <section class="group-visibility">
+    <label>
+      {{input type="checkbox" checked=model.visible_only_to_staff name="visible_only_to_staff"}}
+      {{i18n 'tagging.groups.visible_only_to_staff'}}
+    </label>
+  </section>
+
   <button {{action "save"}} disabled={{model.disableSave}} class='btn'>{{i18n 'tagging.groups.save'}}</button>
   <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'tagging.groups.delete'}}</button>
   <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
diff --git a/app/assets/javascripts/discourse/templates/topic-post-badges.raw.hbs b/app/assets/javascripts/discourse/templates/topic-post-badges.raw.hbs
index b2076113c3..2cbf0f9b69 100644
--- a/app/assets/javascripts/discourse/templates/topic-post-badges.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-post-badges.raw.hbs
@@ -6,6 +6,6 @@
     <a href='{{url}}' class='badge badge-notification new-posts' title='{{i18n "topic.total_unread_posts" count=newPosts}}'>{{newPosts}}</a>
   {{/if}}
   {{#if unseen ~}}
-    <a href='{{url}}' class='badge badge-notification new-topic' title='{{i18n "topic.new"}}'>{{i18n 'filters.new.lower_title'}}</a>
+    <a href='{{url}}' class='badge badge-notification new-topic' title='{{i18n "topic.new"}}'>{{newDotText}}</a>
   {{/if}}
 </span>
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 469dc53953..09e41badad 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -67,12 +67,19 @@
                               connectorTagName="li"
                               args=(hash model=model)}}
 
-              {{#if collapsedInfo}}
-              {{#if viewingSelf}}
-              <li><a {{action "expandProfile"}} href class="btn">{{d-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
+              {{#if canExpandProfile}}
+                <li>
+                  {{#if collapsedInfo}}
+                    <a {{action "expandProfile"}} href class="btn">
+                      {{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}}
+                    </a>
+                  {{else}}
+                    <a {{action "collapseProfile"}} href class="btn">
+                      {{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}}
+                    </a>
+                  {{/if}}
+                </li>
               {{/if}}
-              {{/if}}
-
             </ul>
           </section>
 
@@ -144,23 +151,23 @@
       <div class='secondary'>
         <dl>
           {{#if model.created_at}}
-            <dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd>
+            <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd></div>
           {{/if}}
           {{#if model.last_posted_at}}
-            <dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd>
+            <div><dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd></div>
           {{/if}}
           {{#if model.last_seen_at}}
-            <dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd>
+            <div><dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd></div>
           {{/if}}
-          <dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd>
+          <div><dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd></div>
           {{#if model.invited_by}}
-            <dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd>
+            <div><dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd></div>
           {{/if}}
           {{#if model.trust_level}}
-            <dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd>
+            <div><dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd></div>
           {{/if}}
           {{#if canCheckEmails}}
-            <dt>{{i18n 'user.email.title'}}</dt>
+            <div><dt>{{i18n 'user.email.title'}}</dt>
             <dd title={{model.email}}>
               {{#if model.email}}
                 {{model.email}}
@@ -168,10 +175,11 @@
                 {{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" class="btn-primary"}}
               {{/if}}
             </dd>
+            </div>
           {{/if}}
 
           {{#if model.displayGroups}}
-            <dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
+            <div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
             <dd class='groups'>
               {{#each model.displayGroups as |group|}}
                 <span>{{#link-to 'group' group.name class="group-link"}}{{group.name}}{{/link-to}}</span>
@@ -181,10 +189,11 @@
                 ...
               {{/link-to}}
             </dd>
+            </div>
           {{/if}}
-
+          
           {{#if canDeleteUser}}
-            {{d-button action="adminDelete" icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}
+            <div>{{d-button action="adminDelete" icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
           {{/if}}
         </dl>
         {{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 1a8982ae74..0e53780129 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -40,10 +40,17 @@
 
     {{#if pmTaggingEnabled}}
       <li class="noGlyph">
-      {{#link-to 'userPrivateMessages.tags' model}}
-        {{i18n 'user.messages.tags'}}
-      {{/link-to}}
-    </li>
+        {{#link-to 'userPrivateMessages.tags' model}}
+          {{i18n 'user.messages.tags'}}
+        {{/link-to}}
+      </li>
+      {{#if tagId}}
+        <li class="archive">
+          {{#link-to 'userPrivateMessages.tagsShow' tagId}}
+            {{tagId}}
+          {{/link-to}}
+        </li>
+      {{/if}}
     {{/if}}
   {{/mobile-nav}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6
index aa65deae5e..1794c0ab85 100644
--- a/app/assets/javascripts/discourse/widgets/button.js.es6
+++ b/app/assets/javascripts/discourse/widgets/button.js.es6
@@ -28,15 +28,14 @@ export const ButtonClass = {
 
   buildAttributes() {
     const attrs = this.attrs;
+    const attributes = {};
 
-    let title;
     if (attrs.title) {
-      title = I18n.t(attrs.title, attrs.titleOptions);
-    } else if (attrs.label) {
-      title = I18n.t(attrs.label, attrs.labelOptions);
+      const title = I18n.t(attrs.title, attrs.titleOptions);
+      attributes["aria-label"] = title;
+      attributes.title = title;
     }
 
-    const attributes = { "aria-label": title, title };
     if (attrs.disabled) { attributes.disabled = "true"; }
 
     if (attrs.data) {
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index 77e8b33186..d221407768 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -116,7 +116,7 @@ export default createWidget('hamburger-menu', {
       links.push({ route: 'users', className: 'user-directory-link', label: 'directory.title' });
     }
 
-    if (this.siteSettings.enable_group_directory) {
+    if (this.siteSettings.enable_group_directory || (this.currentUser && this.currentUser.staff)) {
       links.push({ route: 'groups', className: 'groups-link', label: 'groups.index.title' });
     }
 
diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
index 83f0c368fa..1b5892fff7 100644
--- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
@@ -101,10 +101,8 @@ createWidget('notification-item', {
 
     let { data } = attrs;
     let infoKey = notName === 'custom' ? data.message : notName;
-    let title = I18n.t(`notifications.alt.${infoKey}`);
-    let icon = iconNode(`notification.${infoKey}`, { title });
-
     let text = emojiUnescape(this.text(notificationType, notName));
+    let icon = iconNode(`notification.${infoKey}`);
 
     // We can use a `<p>` tag here once other languages have fixed their HTML
     // translations.
@@ -113,7 +111,7 @@ createWidget('notification-item', {
     let contents = [ icon, html ];
 
     const href = this.url();
-    return href ? h('a', { attributes: { href, title, 'data-auto-route': true } }, contents) : contents;
+    return href ? h('a', { attributes: { href, 'data-auto-route': true } }, contents) : contents;
   },
 
   click(e) {
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 46b9819457..c60f506b51 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -69,11 +69,15 @@ registerButton('like-count', attrs => {
     const title = attrs.liked
       ? count === 1 ? 'post.has_likes_title_only_you' : 'post.has_likes_title_you'
       : 'post.has_likes_title';
+      const icon = attrs.yours ? 'heart' : '';
+      const additionalClass = attrs.yours ? 'my-likes' : 'regular-likes';
 
     return { action: 'toggleWhoLiked',
       title,
-      className: 'like-count highlight-action',
-      contents: I18n.t("post.has_likes", { count }),
+      className: `like-count highlight-action ${additionalClass}`,
+      contents: count,
+      icon,
+      iconRight: true,
       titleOptions: {count: attrs.liked ? (count-1) : count }
     };
   }
@@ -281,15 +285,18 @@ export default createWidget('post-menu', {
       replaceButton(orderedButtons, 'reply', 'wiki-edit');
     }
 
-    orderedButtons.forEach(i => {
-      const button = this.attachButton(i, attrs);
-      if (button) {
-        allButtons.push(button);
+    orderedButtons
+      .filter(x => x !== "like-count" && x !== "like")
+      .forEach(i => {
+        const button = this.attachButton(i, attrs);
 
-        if ((attrs.yours && button.attrs.alwaysShowYours) || (hiddenButtons.indexOf(i) === -1)) {
-          visibleButtons.push(button);
+        if (button) {
+          allButtons.push(button);
+
+          if ((attrs.yours && button.attrs.alwaysShowYours) || (hiddenButtons.indexOf(i) === -1)) {
+            visibleButtons.push(button);
+          }
         }
-      }
     });
 
     if (!this.settings.collapseButtons) {
@@ -310,6 +317,11 @@ export default createWidget('post-menu', {
       visibleButtons.splice(visibleButtons.length - 1, 0, showMore);
     }
 
+    visibleButtons.unshift(h('div.like-button', [
+      this.attachButton("like-count", attrs),
+      this.attachButton("like", attrs)
+    ]));
+
     Object.keys(_extraButtons).forEach(k => {
       const builder = _extraButtons[k];
       if (builder) {
@@ -384,6 +396,9 @@ export default createWidget('post-menu', {
 
   showMoreActions() {
     this.state.collapsed = false;
+    if (!this.state.likedUsers.length) {
+      return this.getWhoLiked();
+    }
   },
 
   like() {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
index fd59b7328b..97ad98445d 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
@@ -62,7 +62,7 @@ const rule = {
     if (primaryGroupName && primaryGroupName.length !== 0) {
       token.attrs.push(['class', `quote group-${primaryGroupName}`]);
     } else {
-      token.attrs.push(['class', 'quote']);
+      token.attrs.push(['class', 'quote no-group']);
     }
 
     if (postNumber) {
@@ -153,7 +153,8 @@ export function setup(helper) {
   helper.whiteList({
     custom(tag, name, value) {
       if (tag === 'aside' && name === 'class') {
-        return !!/^quote group\-(.+)$/.exec(value);
+        return value === "quote no-group" ||
+          !!/^quote group\-(.+)$/.exec(value);
       }
     }
   });
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
index debffeb966..cbfaa32961 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -18,8 +18,8 @@ export default ComboBoxComponent.extend({
   noCategoriesLabel: I18n.t("categories.no_subcategory"),
   mutateAttributes() {},
   fullWidthOnMobile: true,
-  caretDownIcon: "caret-right fa-fw",
-  caretUpIcon: "caret-down fa-fw",
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
 
   init() {
     this._super();
diff --git a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
index ff97c4b12d..602369f521 100644
--- a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
@@ -3,7 +3,7 @@ import NotificationOptionsComponent from "select-kit/components/notifications-bu
 export default NotificationOptionsComponent.extend({
   pluginApiIdentifiers: ["category-notifications-button"],
   classNames: "category-notifications-button",
-  isHidden: Ember.computed.or("category.deleted", "site.isMobileDevice"),
+  isHidden: Ember.computed.or("category.deleted"),
   headerIcon: Ember.computed.alias("iconForSelectedDetails"),
   i18nPrefix: "category.notifications",
   showFullTitle: false,
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js.es6
index 8d1c8cd3ed..74f146e51c 100644
--- a/app/assets/javascripts/select-kit/components/category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-row.js.es6
@@ -20,6 +20,12 @@ export default SelectKitRowComponent.extend({
     return displayCategoryDescription;
   },
 
+  @computed("description", "category.name")
+  title(categoryDescription, categoryName) {
+    if (categoryDescription) return categoryDescription;
+    return categoryName;
+  },
+
   @computed("computedContent.value", "computedContent.name")
   category(value, name) {
     if (Ember.isEmpty(value)) {
@@ -76,6 +82,8 @@ export default SelectKitRowComponent.extend({
 
   @computed("category.description")
   description(description) {
-    return `${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}`;
+    if (description) {
+      return `${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}`;
+    }
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-kit/components/combo-box.js.es6
index e3bba9697c..a43839a6ee 100644
--- a/app/assets/javascripts/select-kit/components/combo-box.js.es6
+++ b/app/assets/javascripts/select-kit/components/combo-box.js.es6
@@ -7,8 +7,8 @@ export default SingleSelectComponent.extend({
   autoFilterable: true,
   headerComponent: "combo-box/combo-box-header",
 
-  caretUpIcon: "caret-up fa-fw",
-  caretDownIcon: "caret-down fa-fw",
+  caretUpIcon: "caret-up",
+  caretDownIcon: "caret-down",
   clearable: false,
 
   computeHeaderContent() {
@@ -25,7 +25,7 @@ export default SingleSelectComponent.extend({
   @on("didReceiveAttrs")
   _setComboBoxOptions() {
     this.get("headerComponentOptions").setProperties({
-      clearable: this.get("clearable"),
+      clearable: this.get("clearable")
     });
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
new file mode 100644
index 0000000000..b2939b0278
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
@@ -0,0 +1,44 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DiscourseURL from "discourse/lib/url";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["group-dropdown"],
+  classNames: "group-dropdown",
+  content: Ember.computed.alias("groups"),
+  tagName: "li",
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
+  allowAutoSelectFirst: false,
+  valueAttribute: 'name',
+
+  @computed("content")
+  filterable(content) {
+    return content && content.length >= 10;
+  },
+
+  computeHeaderContent() {
+    let content = this._super();
+
+    if (!this.get("hasSelection")) {
+      content.label = `<span>${I18n.t("groups.index.all")}</span>`;
+    }
+
+    return content;
+  },
+
+  @computed
+  collectionHeader() {
+    return `
+      <a href="${Discourse.getURL("/groups")}" class="group-dropdown-filter">
+        ${I18n.t("groups.index.all").toLowerCase()}
+      </a>
+    `.htmlSafe();
+  },
+
+  actions: {
+    onSelect(groupName) {
+      DiscourseURL.routeTo(Discourse.getURL(`/groups/${groupName}`));
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6
new file mode 100644
index 0000000000..cda2720a25
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/group-members-dropdown.js.es6
@@ -0,0 +1,33 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: "group-members-dropdown",
+  headerIcon: ["bars", "caret-down"],
+  showFullTitle: false,
+  allowInitialValueMutation: false,
+  autoHighlight() {},
+
+  computeContent() {
+    const items = [
+      {
+        id: "showAddMembersModal",
+        name: I18n.t("groups.add_members.title"),
+        icon: "user-plus"
+      }
+    ];
+
+    if (this.currentUser.admin) {
+      items.push({
+        id: "showBulkAddModal",
+        name: I18n.t("admin.groups.bulk_add.title"),
+        icon: "users"
+      });
+    }
+
+    return items;
+  },
+
+  mutateValue(value) {
+    this.sendAction(value);
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
index b3c6929a12..740fd9e61b 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -34,17 +34,17 @@ export default ComboBox.extend(Tags, {
       });
     });
 
-    this.set("limit", parseInt(this.get("limit") || this.get("siteSettings.max_tags_per_topic")));
+    this.set("maximum", parseInt(this.get("limit") || this.get("maximum") || this.get("siteSettings.max_tags_per_topic")));
   },
 
-  @computed("hasReachedLimit")
-  caretIcon(hasReachedLimit) {
-    return hasReachedLimit ? null : "plus fa-fw";
+  @computed("hasReachedMaximum")
+  caretIcon(hasReachedMaximum) {
+    return hasReachedMaximum ? null : "plus fa-fw";
   },
 
   @computed("tags")
   selection(tags) {
-    return makeArray(tags);
+    return makeArray(tags).map(c => this.computeContentItem(c));
   },
 
   filterComputedContent(computedContent) {
@@ -56,7 +56,7 @@ export default ComboBox.extend(Tags, {
 
     this.$(".select-kit-body").on("click.mini-tag-chooser", ".selected-tag", (event) => {
       event.stopImmediatePropagation();
-      this.destroyTags($(event.target).attr("data-value"));
+      this.destroyTags(this.computeContentItem($(event.target).attr("data-value")));
     });
 
     this.$(".select-kit-header").on("focus.mini-tag-chooser", ".selected-name", (event) => {
@@ -110,7 +110,7 @@ export default ComboBox.extend(Tags, {
       }
 
       tags.map((tag) => {
-        const isHighlighted = highlightedSelection.includes(tag);
+        const isHighlighted = highlightedSelection.map(s => get(s, "value")).includes(tag);
         output += `
           <button aria-label="${tag}" title="${tag}" class="selected-tag ${isHighlighted ? 'is-highlighted' : ''}" data-value="${tag}">
             ${tag}
@@ -125,7 +125,9 @@ export default ComboBox.extend(Tags, {
   computeHeaderContent() {
     let content = this._super();
 
-    const joinedTags = this.get("selection").join(", ");
+    const joinedTags = this.get("selection")
+                           .map(s => Ember.get(s, "value"))
+                           .join(", ");
 
     if (isEmpty(this.get("selection"))) {
       content.label = I18n.t("tagging.choose_for_topic");
@@ -133,6 +135,12 @@ export default ComboBox.extend(Tags, {
       content.label = joinedTags;
     }
 
+    if (!this.get("hasReachedMinimum") && isEmpty(this.get("selection"))) {
+      const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
+      const label = I18n.t(key, { count: this.get("minimum") });
+      content.title = content.name = content.label = label;
+    }
+
     content.title = content.name = content.value = joinedTags;
 
     return content;
@@ -144,7 +152,13 @@ export default ComboBox.extend(Tags, {
       limit: this.get("siteSettings.max_tag_search_results"),
       categoryId: this.get("categoryId")
     };
-    if (this.get("selection")) data.selected_tags = this.get("selection").slice(0, 100);
+
+    if (this.get("selection")) {
+      data.selected_tags = this.get("selection")
+                               .map(s => Ember.get(s, "value"))
+                               .slice(0, 100);
+    }
+
     if (!this.get("everyTag")) data.filterForInput = true;
 
     this.searchTags("/tags/filter/search", data, this._transformJson);
@@ -161,13 +175,22 @@ export default ComboBox.extend(Tags, {
 
     results = results.filter(r => !context.get("selection").includes(r.id));
 
-    return results.map(result => {
+    results = results.map(result => {
       return { id: result.text, name: result.text, count: result.count };
     });
+
+    // if forbidden we probably have an existing tag which is not in the list of
+    // returned tags, so we manually add it at the top
+    if (json.forbidden) {
+      results.unshift({ id: json.forbidden, name: json.forbidden, count: 0 });
+    }
+
+    return results;
   },
 
   destroyTags(tags) {
-    tags = Ember.makeArray(tags);
+    tags = Ember.makeArray(tags).map(c => get(c, "value"));
+
     // work around usage with buffered proxy
     // it does not listen on array changes, similar hack already on select
     // TODO: FIX buffered-proxy.js to support arrays
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6
index 0635f8b906..9a9453445b 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -140,10 +140,23 @@ export default SelectKitComponent.extend({
   },
 
   computeHeaderContent() {
-    return {
+    let content = {
       title: this.get("title"),
       selection: this.get("selection")
     };
+
+    if (this.get("noneLabel")) {
+      if (!this.get("hasSelection")) {
+        content.title = content.name = content.label = I18n.t(this.get("noneLabel"));
+      }
+    } else {
+      if (!this.get("hasReachedMinimum")) {
+        const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
+        content.title = content.name = content.label = I18n.t(key, { count: this.get("minimum") });
+      }
+    }
+
+    return content;
   },
 
   @computed("filter")
@@ -154,7 +167,7 @@ export default SelectKitComponent.extend({
   },
 
   validateSelect() {
-    return this._super() && !this.get("hasReachedLimit");
+    return this._super() && !this.get("hasReachedMaximum");
   },
 
   @computed("computedValues.[]", "computedContent.[]")
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
index 0a31c0a7c7..0ab99cd42b 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
@@ -1,6 +1,12 @@
 import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default DropdownSelectBoxRowComponent.extend({
   layoutName: "select-kit/templates/components/period-chooser/period-chooser-row",
-  classNames: "period-chooser-row"
+  classNames: "period-chooser-row",
+
+  @computed("computedContent")
+  title(computedContent) {
+    return I18n.t(`filters.top.${computedContent.name || 'this_week'}`).title;
+  }
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 9054fa50fc..a45da128fd 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -25,7 +25,8 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     "isLeftAligned",
     "isRightAligned",
     "hasSelection",
-    "hasReachedLimit",
+    "hasReachedMaximum",
+    "hasReachedMinimum",
   ],
   isDisabled: false,
   isExpanded: false,
@@ -71,6 +72,10 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   collectionHeader: null,
   allowAutoSelectFirst: true,
   highlightedSelection: null,
+  maximum: null,
+  minimum: null,
+  minimumLabel: null,
+  maximumLabel: null,
 
   init() {
     this._super();
@@ -188,14 +193,22 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     }
   },
 
-  validateCreate() { return !this.get("hasReachedLimit"); },
+  validateCreate() { return !this.get("hasReachedMaximum"); },
 
-  validateSelect() { return !this.get("hasReachedLimit"); },
+  validateSelect() { return !this.get("hasReachedMaximum"); },
 
-  @computed("limit", "selection.[]")
-  hasReachedLimit(limit, selection) {
-    if (!limit) return false;
-    return selection.length >= limit;
+  @computed("maximum", "selection.[]")
+  hasReachedMaximum(maximum, selection) {
+    if (!maximum) return false;
+    selection = makeArray(selection);
+    return selection.length >= maximum;
+  },
+
+  @computed("minimum", "selection.[]")
+  hasReachedMinimum(minimum, selection) {
+    if (!minimum) return true;
+    selection = makeArray(selection);
+    return selection.length >= minimum;
   },
 
   @computed("shouldFilter", "allowAny", "filter")
@@ -212,10 +225,16 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     }
   },
 
-  @computed("hasReachedLimit", "limit")
-  maxContentRow(hasReachedLimit, limit) {
-    if (hasReachedLimit) {
-      return I18n.t("select_kit.max_content_reached", { count: limit });
+  @computed("hasReachedMaximum", "hasReachedMinimum", "isExpanded")
+  validationMessage(hasReachedMaximum, hasReachedMinimum) {
+    if (hasReachedMaximum && this.get("maximum")) {
+      const key = this.get("maximumLabel") || "select_kit.max_content_reached";
+      return I18n.t(key, { count: this.get("maximum") });
+    }
+
+    if (!hasReachedMinimum && this.get("minimum")) {
+      const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
+      return I18n.t(key, { count: this.get("minimum") });
     }
   },
 
@@ -227,9 +246,9 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     return false;
   },
 
-  @computed("computedValue", "filter", "collectionComputedContent.[]", "hasReachedLimit", "isLoading")
-  shouldDisplayCreateRow(computedValue, filter, collectionComputedContent, hasReachedLimit, isLoading) {
-    if (isLoading || hasReachedLimit) return false;
+  @computed("computedValue", "filter", "collectionComputedContent.[]", "hasReachedMaximum", "isLoading")
+  shouldDisplayCreateRow(computedValue, filter, collectionComputedContent, hasReachedMaximum, isLoading) {
+    if (isLoading || hasReachedMaximum) return false;
     if (collectionComputedContent.map(c => c.value).includes(filter)) return false;
     if (this.get("allowAny") && filter.length > 0 && this.validateCreate(filter)) return true;
     return false;
@@ -262,7 +281,8 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
 
   @computed("none")
   noneRowComputedContent(none) {
-    if (isNone(none)) { return null; }
+    if (isNone(none)) return null;
+
     let noneRowComputedContent;
 
     switch (typeof none) {
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
index 75e3eab0b1..d719c1ca66 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
@@ -4,7 +4,7 @@ const { isEmpty, makeArray } = Ember;
 export default Ember.Component.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-header",
   classNames: ["select-kit-header"],
-  classNameBindings: ["isFocused"],
+  classNameBindings: ["isFocused", "isNone"],
   attributeBindings: [
     "tabindex",
     "ariaLabel:aria-label",
@@ -14,6 +14,8 @@ export default Ember.Component.extend({
     "name:data-name",
   ],
 
+  isNone: Ember.computed.none("computedContent.value"),
+
   ariaHasPopup: true,
 
   ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title"),
diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js.es6
index ca6878d813..65e73840ad 100644
--- a/app/assets/javascripts/select-kit/components/single-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -84,12 +84,18 @@ export default SelectKitComponent.extend({
   },
 
   computeHeaderContent() {
-    return {
+    let content = {
       title: this.get("title"),
       icons: makeArray(this.getWithDefault("headerIcon", [])),
       value: this.get("selection.value"),
       name: this.get("selection.name") || this.get("noneRowComputedContent.name")
     };
+
+    if (this.get("noneLabel") && !this.get("hasSelection")) {
+      content.title = content.name = I18n.t(this.get("noneLabel"));
+    }
+
+    return content;
   },
 
   @computed("computedAsyncContent.[]", "computedValue")
@@ -128,7 +134,7 @@ export default SelectKitComponent.extend({
     return selection !== this.get("noneRowComputedContent") && !isNone(selection);
   },
 
-  @computed("computedValue", "filter", "collectionComputedContent.[]", "hasReachedLimit")
+  @computed("computedValue", "filter", "collectionComputedContent.[]", "hasReachedMaximum", "hasReachedMinimum")
   shouldDisplayCreateRow(computedValue, filter) {
     return this._super() && computedValue !== filter;
   },
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
index d8e590eccf..de5341c32a 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
@@ -37,7 +37,7 @@ export default MultiSelectComponent.extend(Tags, {
     });
 
     if (!this.get("unlimitedTagCount")) {
-      this.set("limit", parseInt(this.get("limit") || this.get("siteSettings.max_tags_per_topic")));
+      this.set("maximum", parseInt(this.get("limit") || this.get("maximum") || this.get("siteSettings.max_tags_per_topic")));
     }
   },
 
@@ -62,7 +62,7 @@ export default MultiSelectComponent.extend(Tags, {
     },
 
     onExpand() {
-      this.set("searchDebounce", run.debounce(this, this.prepareSearch, this.get("filter"), 200));
+      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
     },
 
     onDeselect() {
@@ -108,8 +108,16 @@ export default MultiSelectComponent.extend(Tags, {
       results = results.sort((a, b) => a.id > b.id);
     }
 
-    return results.map(result => {
+    results = results.map(result => {
       return { id: result.text, name: result.text, count: result.count };
     });
+
+    // if forbidden we probably have an existing tag which is not in the list of
+    // returned tags, so we manually add it at the top
+    if (json.forbidden) {
+      results.unshift({ id: json.forbidden, name: json.forbidden, count: 0 });
+    }
+
+    return results;
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
index 47e8a343a9..4e3768753c 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -19,8 +19,8 @@ export default ComboBoxComponent.extend({
   categoryStyle: Ember.computed.alias("siteSettings.category_style"),
   mutateAttributes() {},
   fullWidthOnMobile: true,
-  caretDownIcon: "caret-right fa-fw",
-  caretUpIcon: "caret-down fa-fw",
+  caretDownIcon: "caret-right",
+  caretUpIcon: "caret-down",
 
   @computed("tagId")
   noTagsSelected() {
diff --git a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
index 2a9713f9d3..b790b94b54 100644
--- a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
@@ -72,8 +72,16 @@ export default MultiSelectComponent.extend(Tags, {
   _transformJson(context, json) {
     let results = json.results.sort((a, b) => a.id > b.id);
 
-    return results.map(result => {
+    results = results.map(result => {
       return { id: result.text, name: result.text, count: result.count };
     });
+
+    // if forbidden we probably have an existing tag which is not in the list of
+    // returned tags, so we manually add it at the top
+    if (json.forbidden) {
+      results.unshift({ id: json.forbidden, name: json.forbidden, count: 0 });
+    }
+
+    return results;
   },
 });
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index 2330daa4dc..14788dba5f 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -67,13 +67,14 @@ export default Ember.Mixin.create({
 
   // try to focus filter and fallback to header if not present
   focusFilterOrHeader() {
+    const context = this;
     // next so we are sure it finised expand/collapse
     Ember.run.next(() => {
       Ember.run.schedule("afterRender", () => {
-        if (!this.$filterInput().is(":visible")) {
-          this.$header().focus();
+        if ((this.site && this.site.isMobileDevice) || !context.$filterInput() || !context.$filterInput().is(":visible")) {
+          context.$header().focus();
         } else {
-          this.$filterInput().focus();
+          context.$filterInput().focus();
         }
       });
     });
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js.es6
index 099eeadfb7..1c2e10f6f4 100644
--- a/app/assets/javascripts/select-kit/mixins/tags.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/tags.js.es6
@@ -33,7 +33,7 @@ export default Ember.Mixin.create({
   },
 
   validateCreate(term) {
-    if (this.get("hasReachedLimit") || !this.site.get("can_create_tag")) {
+    if (this.get("hasReachedMaximum") || !this.site.get("can_create_tag")) {
       return false;
     }
 
@@ -49,7 +49,8 @@ export default Ember.Mixin.create({
     }
 
     const inCollection = this.get("collectionComputedContent").map(c => get(c, "id")).includes(term);
-    const inSelection = this.get("selection").map(s => s.toLowerCase()).includes(term);
+
+    const inSelection = this.get("selection").map(s => get(s, "value").toLowerCase()).includes(term);
     if (inCollection || inSelection) {
       return false;
     }
diff --git a/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
index 7928a3b94b..7e3ea1baf4 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
@@ -2,4 +2,4 @@
   {{{label}}}
 </span>
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
index c3a7aa14fb..b13075d3f2 100644
--- a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
@@ -10,4 +10,4 @@
   </button>
 {{/if}}
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
index b3d4f47364..d541cc2c1c 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select.hbs
@@ -41,7 +41,7 @@
       computedValue=computedValue
       rowComponentOptions=rowComponentOptions
       noContentRow=noContentRow
-      maxContentRow=maxContentRow
+      validationMessage=validationMessage
     }}
   {{/unless}}
   {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
index 6a7089e9ec..b673bd18d2 100644
--- a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
@@ -30,26 +30,25 @@
   }}
 {{/if}}
 
-{{#if maxContentRow}}
-  <li class="select-kit-row max-content">
-    {{maxContentRow}}
+{{#if noContentRow}}
+  <li class="select-kit-row no-content">
+    {{noContentRow}}
   </li>
 {{else}}
-  {{#if noContentRow}}
-    <li class="select-kit-row no-content">
-      {{noContentRow}}
-    </li>
-  {{else}}
-    {{#each collectionComputedContent as |computedContent|}}
-      {{component rowComponent
-        computedContent=computedContent
-        highlighted=highlighted
-        computedValue=computedValue
-        templateForRow=templateForRow
-        onClickRow=onClickRow
-        onMouseoverRow=onMouseoverRow
-        options=rowComponentOptions
-      }}
-    {{/each}}
+  {{#if validationMessage}}
+    <div class="validation-message">
+      {{validationMessage}}
+    </div>
   {{/if}}
+  {{#each collectionComputedContent as |computedContent|}}
+    {{component rowComponent
+      computedContent=computedContent
+      highlighted=highlighted
+      computedValue=computedValue
+      templateForRow=templateForRow
+      onClickRow=onClickRow
+      onMouseoverRow=onMouseoverRow
+      options=rowComponentOptions
+    }}
+  {{/each}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
index 46128823d3..e01241d319 100644
--- a/app/assets/javascripts/select-kit/templates/components/single-select.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/single-select.hbs
@@ -40,7 +40,7 @@
       computedValue=computedValue
       rowComponentOptions=rowComponentOptions
       noContentRow=noContentRow
-      maxContentRow=maxContentRow
+      validationMessage=validationMessage
     }}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
index 7928a3b94b..7e3ea1baf4 100644
--- a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
@@ -2,4 +2,4 @@
   {{{label}}}
 </span>
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 9bf5830056..651bf08e02 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -5,7 +5,29 @@
 @import "common/foundation/base";
 @import "common/foundation/mixins";
 @import "common/foundation/variables";
-@import "common/select-kit/*";
+@import "common/select-kit/admin-agree-flag-dropdown";
+@import "common/select-kit/admin-delete-flag-dropdown";
+@import "common/select-kit/categories-admin-dropdown";
+@import "common/select-kit/category-chooser";
+@import "common/select-kit/category-drop";
+@import "common/select-kit/category-row";
+@import "common/select-kit/category-selector";
+@import "common/select-kit/combo-box";
+@import "common/select-kit/composer-actions";
+@import "common/select-kit/dropdown-select-box";
+@import "common/select-kit/future-date-input-selector";
+@import "common/select-kit/group-dropdown";
+@import "common/select-kit/list-setting";
+@import "common/select-kit/mini-tag-chooser";
+@import "common/select-kit/multi-select";
+@import "common/select-kit/notifications-button";
+@import "common/select-kit/period-chooser";
+@import "common/select-kit/pinned-button";
+@import "common/select-kit/select-kit";
+@import "common/select-kit/tag-chooser";
+@import "common/select-kit/tag-drop";
+@import "common/select-kit/toolbar-popup-menu-options";
+@import "common/select-kit/topic-notifications-button";
 @import "common/components/*";
 @import "common/input_tip";
 @import "common/topic-entrance";
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 122a647925..81d5eab682 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -167,6 +167,20 @@ $mobile-breakpoint: 700px;
       }
     }
 
+    &.web_crawlers {
+      tr {
+        th:nth-of-type(1) {
+          width: 60%;
+        }
+      }
+      td.x-value {
+        max-width: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
     .bar-container {
       float: left;
       width: 300px;
@@ -1313,6 +1327,10 @@ table.api-keys {
   width: 20px;
 }
 
+.admin-plugins-official-badge {
+  color: $success;
+}
+
 // Backups
 // --------------------------------------------------
 
diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss
index 298826baad..e4d191678e 100644
--- a/app/assets/stylesheets/common/admin/flagging.scss
+++ b/app/assets/stylesheets/common/admin/flagging.scss
@@ -67,6 +67,10 @@
     }
   }
 
+  .flagged-post-reply-count {
+    font-weight: normal;
+  }
+
   .flag-user-lists {
     display: flex;
     align-items: flex-start;
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index a9033684d8..552e6f8e63 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -86,7 +86,7 @@
     }
   }
 
-  > tbody > tr:first-of-type {
+  > tbody  {
     border-top: 3px solid $primary-low;
   }
 
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 65114a11b5..516922baed 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -1,10 +1,10 @@
 .directory {
   margin-bottom: 100px;
-  
+
   .user-info {
     margin-bottom: 0;
   }
-  
+
   .period-chooser {
     float: left;
   }
@@ -18,25 +18,25 @@
   .spinner {
     clear: both;
   }
-  
+
   table {
     width: 100%;
     margin-bottom: 1em;
-    
+
     td, th {
       padding: 0.5em;
       text-align: left;
-      border-bottom: 1px solid $primary-low; 
-      
+      border-bottom: 1px solid $primary-low;
+
       .number, .time-read {
         font-size: $font-up-3;
-        color: $primary-medium; 
+        color: $primary-medium;
       }
       .time-read {
         white-space: nowrap;
       }
     }
-    
+
     th.sortable {
       cursor: pointer;
       white-space: nowrap;
@@ -48,9 +48,9 @@
       .d-icon-chevron-down, .d-icon-chevron-up {
         margin-left: 0.5em;
       }
-      
+
       &:hover {
-        background-color: $primary-low; 
+        background-color: $primary-low;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 082adb401e..9813e7a593 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -2,6 +2,26 @@
   background: rgba(230, 230, 230, 0.3);
   padding: 20px;
   margin-bottom: 15px;
+  position: relative;
+}
+
+.group-outlet {
+  position: relative;
+}
+
+.group-members-actions {
+  position: absolute;
+  top: -49px;
+  right: 0px;
+
+  .group-username-filter {
+    margin: 0px;
+    vertical-align: middle;
+  }
+
+  .group-members-dropdown, .group-members-add {
+    vertical-align: middle;
+  }
 }
 
 .group-post {
@@ -78,7 +98,7 @@
   }
 }
 
-.group-logs-filter {
+.group-manage-logs-filter {
   margin-right: 10px;
 
   &:hover {
@@ -86,7 +106,7 @@
   }
 }
 
-table.group-logs {
+table.group-manage-logs {
   width: 100%;
 
   th, tr {
@@ -102,7 +122,7 @@ table.group-logs {
     padding: 10px 0;
   }
 
-  .group-logs-expand-details {
+  .group-manage-logs-expand-details {
     cursor: pointer;
 
     i {
@@ -120,7 +140,7 @@ table.group-members {
   }
 
   th:first-child {
-    width: 60%;
+    width: 30%;
     text-align: left;
   }
 
@@ -172,23 +192,9 @@ table.group-members {
   color: $primary;
 }
 
-.form-horizontal {
+.form-vertical {
   .group-flair-inputs {
     display: inline-block;
-
-    input[type="text"] {
-      width: 80% !important;
-      margin-bottom: 10px;
-    }
-
-    .group-flair-left {
-      float: left;
-    }
-
-    .group-flair-right {
-      float: left;
-      margin-left: 30px;
-    }
   }
 
   .avatar-flair-preview {
@@ -201,24 +207,12 @@ table.group-members {
   }
 }
 
-.group-edit {
-  .form-horizontal {
-    label {
-      font-weight: bold;
-    }
-  }
+.group-form-save {
+  margin-right: 20px;
 }
 
-.group-membership {
-  .ac-wrap {
-    width: 100% !important;
-  }
-
-  label {
-    font-weight: bold;
-  }
-
-  .group-membership-make-owner {
+.group-add-members {
+  .group-add-members-make-owner {
     label {
       display: inline;
       vertical-align: middle;
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 1c8ae40b3f..3ff525b1f5 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -5,15 +5,18 @@
   }
 }
 
-.groups-filter {
-  display: inline-block;
-  float: right;
+.groups-header {
+  margin-bottom: 30px;
+}
 
-  .groups-type-filter {
+.groups-header-filters {
+  display: inline-block;
+
+  .groups-header-filters-type {
     vertical-align: middle;
   }
 
-  .groups-name-filter {
+  .groups-header-filters-name {
     vertical-align: middle;
     margin: 0;
   }
@@ -39,8 +42,8 @@
     border-bottom: 1px solid $primary-low;
 
     td {
-      color: blend-primary-secondary(50%);
       padding: 0.8em;
+      color: $primary-medium;
     }
 
     td.groups-info {
@@ -54,9 +57,26 @@
     }
 
     td.groups-user-count {
-      font-size: $font-up-2
+      width: 17%;
+      font-size: $font-up-2;
     }
-  }
+
+    td.groups-table-type {
+      width: 17%;
+      font-size: $font-up-1;
+    }
+
+    td.groups-table-membership {
+      .group-membership-button {
+        display: inline-block;
+      }
+
+      > span {
+        margin-right: 5px;
+        font-size: $font-up-1;
+      }
+    }
+   }
 
   .groups-info {
     .groups-info-name {
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index f4c70b4b19..cd5fe5fabb 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -29,13 +29,13 @@
 .modal-header {
   display: flex;
   align-items: center;
-  padding: 10px 15px;  
+  padding: 10px 15px;
   border-bottom: 1px solid $primary-low;
   h3 {
     margin-bottom: 0;
   }
   .modal-close {
-    order: 2; 
+    order: 2;
     margin-left: auto;
   }
 }
@@ -372,6 +372,12 @@
       }
     }
   }
+
+  section.minimum-required-tags {
+    input[type=number] {
+      width: 50px;
+    }
+  }
 }
 
 .incoming-email-modal {
@@ -421,22 +427,22 @@
 }
 
 .change-timestamp {
-  
+
     .date-picker {
       width: 10em;
     }
-  
+
     #date-container {
       .pika-single {
         position: relative !important; // overriding another important
         display: inline-block;
       }
     }
-  
+
     input[type=time] {
       width: 6em;
     }
-  
+
     form {
       margin: 0;
     }
@@ -491,4 +497,3 @@
   width: 95%;
 }
 
-  
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/base/request-group-membership-form.scss b/app/assets/stylesheets/common/base/request-group-membership-form.scss
index 63dfd0aec7..33669fc0e2 100644
--- a/app/assets/stylesheets/common/base/request-group-membership-form.scss
+++ b/app/assets/stylesheets/common/base/request-group-membership-form.scss
@@ -4,6 +4,6 @@
   }
 }
 
-.group-edit-membership-request-template {
+.group-add-membership-request-template {
   width: 98%;
 }
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 46e6bb36f6..bac455f1f7 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -1,9 +1,182 @@
+.search-container {
+  display: flex;
+  justify-content: space-between;
+
+  .search-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 1em;
+
+    .search-query {
+      flex: 1;
+      margin: 0 .5em 0 0;
+    }
+
+    .search-cta {
+      padding-bottom: 6.5px;
+      padding-top: 6.5px;
+    }
+  }
+
+  .search-advanced {
+    width: 70%;
+    @include small-width  { width: 65%; }
+
+    .search-actions,
+    .search-notice,
+    .search-results,
+    .search-title,
+    .search-bar {
+      margin-bottom: 1em;
+    }
+
+    .search-info {
+      display: flex;
+      flex-wrap: wrap;
+      border-bottom: 3px solid $primary-low;
+      padding-bottom: .5em;
+      margin-bottom: 1em;
+      flex-direction: row;
+      align-items: center;
+
+      .result-count {
+        display: flex;
+
+        .term {
+          font-weight: bold;
+        }
+
+        // spans can be in different orders depending of locale
+        span + span {
+          margin-left: .25em;
+        }
+      }
+
+      .sort-by {
+        display: flex;
+        margin-left: auto;
+        align-items: center;
+
+        .desc {
+          margin-right: .5em;
+        }
+
+        .combo-box {
+          min-width: 150px;
+        }
+      }
+    }
+
+    .search-title {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+
+      .bulk-select {
+        margin-left: .5em;
+      }
+
+      .fps-select a {
+        margin-left: .5em;
+        font-size: $font-down-1;
+
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+
+    .search-notice {
+      .fps-invalid {
+        padding: .5em;
+        background-color: $danger-low;
+        border: 1px solid $danger-medium;
+        color: $danger;
+      }
+    }
+  }
+
+  .search-advanced-sidebar {
+    width: 30%;
+    @include small-width  { width: 35%; }
+    margin-left: 1em;
+    display: flex;
+    flex-direction: column;
+
+    #search-min-post-count,
+    .date-picker,
+    .combo-box,
+    .ac-wrap,
+    .control-group,
+    .date-picker-wrapper,
+    .search-advanced-category-chooser {
+      box-sizing: border-box;
+      width: 100%;
+      min-width: 100%;
+      input, .item {
+        padding-left: 4px; // temporarily normalizing input padding for this section
+      }
+    }
+
+    .date-picker-wrapper {
+      margin-top: .5em;
+    }
+
+    .date-picker {
+      box-sizing: border-box;
+      text-align: left;
+      padding: 4px;
+      margin-bottom: 0;
+    }
+
+    .search-advanced-title {
+      background: $primary-low;
+      padding: .358em 1em;
+      @include small-width  { padding: .358em .5em; }
+      font-weight: 700;
+      text-align: left;
+      font-weight: bold;
+
+      &.btn {
+        background: $primary-low;
+      }
+
+      .d-icon {
+        margin: 0;
+      }
+    }
+
+    .search-advanced-filters {
+      background: $primary-very-low;
+      padding: 1em;
+      .control-group {
+        margin-bottom: 15px;
+      }
+      section.field {
+        margin-top: 5px;
+      }
+      @include small-width  { 
+        padding: .75em .5em; 
+        .ac-wrap, .choices, .select-kit.multi-select { // overriding inline width from JS
+          width: 100% !important;
+        } 
+        .select-kit {
+          min-width: unset;
+        }
+      }
+    }
+  }
+}
+
+
 .fps-invalid {
   margin-bottom: 1em;
 }
 
 .fps-result {
-
+  display: flex;
   .author {
     display: inline-block;
     vertical-align: top;
@@ -71,42 +244,6 @@
   display: inline-block;
 }
 
-.fps-select {
-  margin-top: -15px;
-  margin-bottom: 15px;
-  a:hover {
-    color: $secondary;
-    background-color: $tertiary;
-  }
-  a {
-    margin-right: 15px;
-    font-size: $font-down-1;
-    padding: 2px 5px;
-  }
-}
-
-.search.row {
-  margin-bottom: 15px;
-  .input-xxlarge {
-    width: 100%;
-  }
-
-  .search-bar {
-    display: flex;
-    margin-bottom: 10px;
-    max-width: 780px;
-    input {
-      height: 22px;
-      padding-left: 6px;
-      margin: 0 5px 0 0;
-    }
-  }
-
-  .new-topic-btn {
-    float:right;
-  }
-}
-
 .no-results-suggestion {
   margin-top: 30px;
 }
@@ -118,96 +255,6 @@
   float: left;
 }
 
-.search-title {
-  position: relative;
-  margin: 10px 0 15px;
-  max-width: 780px;
-  border-bottom: 3px solid $primary-low;
-  width: 100%;
-  .term {
-    font-weight: bold;
-  }
-
-  .result-count {
-    float: left;
-    margin-bottom: 4px;
-    span {
-      line-height: $line-height-large;
-      height: 28px;
-      display: inline-block;
-    }
-  }
-
-  .sort-by {
-    float: right;
-    margin-bottom: 4px;
-    .desc {
-      margin-right: 5px;
-    }
-    select {
-      margin-bottom: 0;
-      width: auto;
-      min-width: 150px;
-    }
-  }
-}
-
 .google-search-form {
   margin-top: 2em;
 }
-
-.search-advanced {
-  display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 20px;
-  max-width: 780px;
-  .search-advanced-options {
-    border: 1px solid $primary-low;
-    padding: 0 20px;
-    width: 100%;
-    .date-picker-wrapper {
-      vertical-align: top;
-    }
-    @media screen and (max-width: 715px) {
-      padding: 0 10px;
-      #postTime {
-        margin: 0 0 5px 0;
-      }
-    }
-  }
-
-  .search-advanced-btn {
-    flex: 1 1 100%;
-    width: 100%;
-    text-align: left;
-    font-weight: bold;
-  }
-
-  .tag-chooser {
-    width: 70%;
-  }
-
-  .container {
-    display: flex;
-    flex: 1 1 100%;
-    padding: 15px 0 10px 0;
-    .all-tags {
-      margin-bottom: 0;
-    }
-    @media screen and (max-width: 600px) {
-      flex-wrap: wrap;
-    }
-    &:not(:first-of-type) {
-      border-top: 1px solid $primary-low;
-    }
-    .control-group {
-      flex: 1 1 100%;
-      @media screen and (max-width: 600px) {
-        margin: 0;
-        &:nth-of-type(2) {
-          margin-top: 5px;
-        }
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 9122c92528..fba521fcba 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -122,6 +122,11 @@ a.badge-category {
   }
 }
 
+.private-message-glyph {
+  color: dark-light-choose($primary-low-mid, $secondary-high);
+  margin-right: 5px;
+}
+
 .archetype-private_message #topic-title .edit-topic-title .tag-chooser {
   margin-left: 19px;
 }
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 2eae6df77c..88f744e700 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -27,17 +27,33 @@
     width: 100%;
 
     .secondary {
+      background: $secondary;
+      border-top: 1px solid $primary-low;
+      border-bottom: 1px solid $primary-low;
 
       .btn {
-        padding: 3px 12px;
+        padding: 4px 12px;
       }
 
       dl {
         margin: 0;
+        padding: 5px 10px;
+        div {
+          display: inline-flex;
+          align-items: baseline;
+          margin-right: 15px;
+          margin: 4px 0;          
+        }
+      }
+
+      dt, dd {
+        display: inline-flex;
+        align-items: center;
       }
 
       dd {
         padding: 0;
+        margin: 0 15px 0 0;
         overflow: hidden;
         text-overflow: ellipsis;
         color: $primary;
@@ -54,7 +70,7 @@
 
       dt {
         color: $secondary-medium;
-        margin: 0;
+        margin-right: 5px;        
         display: inline-block;
       }
     }
diff --git a/app/assets/stylesheets/common/components/groups-form-membership-fields.scss b/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
new file mode 100644
index 0000000000..d47b250696
--- /dev/null
+++ b/app/assets/stylesheets/common/components/groups-form-membership-fields.scss
@@ -0,0 +1,3 @@
+.group-form-automatic-membership-automatic {
+  margin-bottom: 10px;
+}
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index a8e1541d60..5ccdd6b224 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -52,11 +52,17 @@
   background-color: $secondary;
   position: relative;
   border: 1px solid $primary-medium;
-  
+
   textarea {
     background: transparent;
   }
 
+  &.disabled {
+    cursor: not-allowed;
+    .d-editor-button-bar {
+      visibility: hidden;
+    }
+  }
 }
 
 .d-editor-preview-wrapper {
@@ -73,7 +79,7 @@
   min-height: 30px;
   padding-left: 3px;
   border-bottom: 1px solid $primary-low;
-  
+
   button {
     background-color: transparent;
     color: $primary-high;
@@ -108,13 +114,13 @@
 .d-editor-input,
 .d-editor-preview {
   box-sizing: border-box;
-  flex: 1 1 100%;  
-  width: 100%;  
+  flex: 1 1 100%;
+  width: 100%;
   margin: 0;
   min-height: auto;
   word-wrap: break-word;
   -webkit-appearance: none;
-  border-radius: 0;  
+  border-radius: 0;
   &:focus {
     box-shadow: none;
     border: 0;
@@ -127,7 +133,7 @@
   padding: 10px;
   height: 100%;
   overflow-x: hidden;
-  resize: none; 
+  resize: none;
 }
 
 .d-editor-preview {
@@ -155,6 +161,7 @@
 }
 
 .user-preferences .bio-composer,
+.group-form-bio,
 .edit-category-tab-topic-template {
   textarea {
     width: 100%;
@@ -179,7 +186,8 @@
   }
 }
 
-.user-preferences .bio-composer {
+.user-preferences .bio-composer,
+.group-form-bio {
   padding: 10px;
   border: 1px solid $primary-low;
 }
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index f028ab048d..6c28ae2416 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -26,13 +26,13 @@ $github: #6d6d6d !default;
 $base-font-size: 14px !default;
 $base-font-family: Helvetica, Arial, sans-serif !default;
 
-// Font-size defintions, multiplier ^ (step / interval) 
+// Font-size defintions, multiplier ^ (step / interval)
 $font-up-6: 2.296em;
 $font-up-5: 2em;
 $font-up-4: 1.7511em;
 $font-up-3: 1.5157em;
 $font-up-2: 1.3195em;
-$font-up-1: 1.1487em; // 2^(1/5) 
+$font-up-1: 1.1487em; // 2^(1/5)
 $font-0: 1em;
 $font-down-1: .8706em; // 2^(-1/5)
 $font-down-2: .7579em; // Smallest size we use based on the 1em base
@@ -46,7 +46,7 @@ $line-height-small: 1;
 $line-height-medium: 1.2; // Headings or large text
 $line-height-large: 1.4; // Normal or small text
 
-// These files don't actually exist. They're injected by Stylesheet::Compiler. 
+// These files don't actually exist. They're injected by Stylesheet::Compiler.
 // --------------------------------------------------
 
 @import "theme_variables";
@@ -57,10 +57,10 @@ $line-height-large: 1.4; // Normal or small text
 // --------------------------------------------------
 
 $z-layers: (
-  "max":              9999, 
+  "max":              9999,
   "fullscreen":       1700,
   "modal": (
-    "tooltip":        1600,   
+    "tooltip":        1600,
     "popover":        1500,
     "dropdown":       1400,
     "content":        1300,
@@ -73,7 +73,7 @@ $z-layers: (
       "popover":      500,
       "content":      400,
   ),
-  "dropdown":         300,  
+  "dropdown":         300,
   "usercard":         200,
   "timeline":         100,
   "base":             1
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 201ce200b5..70f21e7814 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -40,6 +40,10 @@
         font-size: $font-0;
         transition: none;
 
+        &.is-none .selected-name {
+          color: inherit;
+        }
+
         .badge-wrapper {
           margin-right: 0;
         }
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index df7b809762..dd6a2e9859 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -1,6 +1,5 @@
 .select-kit {
   &.combo-box {
-
     .select-kit-body {
       width: 100%;
     }
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index c229b00422..20345715ec 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -51,6 +51,7 @@
       }
 
       .texts {
+        min-width: 0;
         line-height: $line-height-large;
         -webkit-box-flex: 1;
             -ms-flex: 1;
@@ -76,6 +77,10 @@
           font-size: $font-0;
           color: $primary;
           padding: 0;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          max-width: 100%;
         }
 
         .desc {
diff --git a/app/assets/stylesheets/common/select-kit/group-dropdown.scss b/app/assets/stylesheets/common/select-kit/group-dropdown.scss
new file mode 100644
index 0000000000..e38c0a4283
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/group-dropdown.scss
@@ -0,0 +1,76 @@
+.select-kit {
+  &.combo-box {
+    &.group-dropdown {
+      min-width: auto;
+
+      .combo-box-header {
+        background: $primary-low;
+        color: $primary;
+        border: 1px solid transparent;
+        padding: 4.5px 5px 4.5px 10px;
+        font-size: $font-0;
+        transition: none;
+
+        .d-icon {
+          opacity: 1;
+          font-size: $font-0;
+          margin: 0;
+        }
+      }
+
+      &.is-expanded .tag-drop-header {
+        border: 1px solid $tertiary;
+        box-shadow: shadow("focus");
+      }
+
+      .select-kit-collection {
+        display: flex;
+        flex-direction: column;
+        padding: 0;
+        max-height: 300px;
+
+        .collection-header {
+          .group-dropdown-filter {
+            white-space: nowrap;
+            color: $primary;
+            font-size: $font-down-1;
+            line-height: $line-height-medium;
+            font-weight: bold;
+            display: block;
+            padding: 10px 5px;
+
+            &:hover {
+              text-decoration: underline;
+            }
+          }
+        }
+      }
+
+      .select-kit-filter .filter-input {
+        width: auto;
+      }
+
+      .select-kit-body {
+        width: auto;
+        min-width: 150px;
+        border-radius: 0;
+        box-shadow: shadow("dropdown");
+      }
+
+      .select-kit-row {
+        margin: 0;
+        font-size: $font-down-1;
+        font-weight: bold;
+        color: $tertiary;
+
+        &.no-content {
+          font-weight: normal;
+        }
+      }
+
+      &.is-expanded .select-kit-wrapper, .select-kit-wrapper {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index 91ef4c1539..1978d1c43a 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -65,7 +65,6 @@
 
     .choices {
       margin: 0;
-      padding: 2.5px;
       box-sizing: border-box;
       display: inline-flex;
       justify-content: flex-start;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 3f61e5e260..22598ff418 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -104,6 +104,12 @@
       color: inherit;
     }
 
+    &.is-none {
+      .selected-name {
+        color: dark-light-choose($primary-high, $secondary-low);
+      }
+    }
+
     .btn-clear {
       padding: 0 10px;
       border: 0;
@@ -165,11 +171,6 @@
       white-space: nowrap;
     }
 
-    &.max-content {
-      white-space: nowrap;
-      color: $danger;
-    }
-
     .name {
       margin: 0;
       overflow: hidden;
@@ -193,6 +194,10 @@
     &.is-selected.is-highlighted {
       background: $tertiary-low;
     }
+
+    .discourse-tag, .discourse-tag-count {
+      color: $primary;
+    }
   }
 
   .select-kit-collection {
@@ -205,6 +210,14 @@
     padding: 0;
     max-height: 200px;
 
+    .validation-message {
+      white-space: nowrap;
+      color: $danger;
+      flex: 1 0 auto;
+      margin: 5px;
+      padding: 0 2px;
+    }
+
     .select-kit-collection {
       padding: 0;
       margin: 0;
diff --git a/app/assets/stylesheets/common/select-kit/tag-drop.scss b/app/assets/stylesheets/common/select-kit/tag-drop.scss
index 48c114f303..566cf296fd 100644
--- a/app/assets/stylesheets/common/select-kit/tag-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/tag-drop.scss
@@ -11,6 +11,10 @@
         font-size: $font-0;
         transition: none;
 
+        &.is-none .selected-name {
+          color: inherit;
+        }
+
         .d-icon {
           opacity: 1;
           font-size: $font-0;
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index e11252ac35..b1a6d6b849 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -20,6 +20,7 @@
 @import "desktop/history";
 @import "desktop/queued-posts";
 @import "desktop/group";
+@import "desktop/groups";
 
 // Import all component-specific files
 @import "desktop/components/*";
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 900195da46..c20dbce7fb 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -225,6 +225,11 @@ input {
   margin-bottom: 10px;
 }
 
+.control-instructions {
+  color: dark-light-choose($primary-medium, $secondary-medium);
+  font-size: 0.875rem;
+}
+
 .control-group {
   margin-bottom: 9px;
 
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index e279256e5c..527f297e01 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -1,4 +1,12 @@
 .group-nav {
+  .group-dropdown {
+    margin-right: 10px;
+
+    i {
+      color: $primary;
+    }
+  }
+
   li {
     float: left;
 
@@ -20,7 +28,7 @@
   margin-bottom: 20px;
 }
 
-.group-activity-nav, .group-messages-nav {
+.group-navigation {
   width: 15%;
   background-color: transparent;
 
@@ -28,32 +36,39 @@
     border: none;
 
     a {
-      padding: 8px 13px;
-    }
+      color: dark-light-choose($primary-medium, $secondary-high);
+      padding: 8px 0;
 
-    a.active {
-      background-color: transparent;
-      font-weight: bold;
-      color: $primary;
-    }
+      &.active {
+        background-color: transparent;
+        font-weight: bold;
+        color: $primary;
 
-    a.active:after {
-      display: none;
+        &:after {
+          display: none;
+        }
+      }
     }
   }
 }
 
-.group-activity-outlet, .group-messages-outlet {
+.group-activity-outlet,
+.group-messages-outlet,
+.group-manage-outlet
+{
   width: 85%;
 }
 
-.group-edit {
-  border: 1px solid $primary-low;
-  padding: 10px;
-
+.group-manage {
   .form-horizontal {
     button {
       float: none;
     }
   }
 }
+
+.group-details-button {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+}
diff --git a/app/assets/stylesheets/desktop/groups.scss b/app/assets/stylesheets/desktop/groups.scss
new file mode 100644
index 0000000000..a43ce6edba
--- /dev/null
+++ b/app/assets/stylesheets/desktop/groups.scss
@@ -0,0 +1,19 @@
+.groups-page {
+  .list-controls {
+    float: right;
+  }
+}
+
+$filter-line-height: 1.5;
+
+.groups-header-filters {
+  .groups-header-filters-type {
+    .select-kit-header {
+      line-height: $filter-line-height;
+    }
+  }
+
+  input {
+    line-height: $filter-line-height;
+  }
+}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 99d25b737e..434d449847 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -54,9 +54,66 @@ nav.post-controls {
 
   padding: 0;
 
-  .like-count {
-    font-size: inherit;
-    margin-right: -5px;
+  .like-button {
+    display: inline-flex;
+
+    .like-count {
+      color: dark-light-choose($primary-low-mid, $secondary-high);
+    }
+
+    .widget-button {
+      background: none;
+    }
+
+    &:hover {
+      background: $primary-low;
+      .like-count {
+        color: $primary-medium;
+        &.d-hover {
+          color: $primary;
+        }
+      }
+      .d-hover {
+        background: none;
+      }
+    }
+
+    &:active {
+      box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
+
+      .widget-button {
+        box-shadow: none;
+      }
+    }
+
+    .like {
+      &:focus {
+        background: none;
+      }
+    }
+
+    .like-count {
+      font-size: $font-up-1;
+      margin-left: 0;      
+      i.fa-heart {
+        padding-left: 5px;
+        color: dark-light-choose($primary-low-mid, $secondary-high);
+      }
+      &.my-likes {
+        margin-right: -2px;
+        i.fa-heart {
+          padding-left: 10px;
+        }
+      }
+      &.regular-likes {
+        margin-right: -12px;
+      }
+    }
+
+    .toggle-like {
+      padding: 8px 8px;
+      margin-left: 2px;
+    }
   }
 
   .highlight-action {
@@ -205,7 +262,7 @@ nav.post-controls {
 .embedded-posts {
   h1, h2, h3 { margin: 10px 0; }
   border:  1px solid $primary-low;
-  
+
   .topic-body {
     box-sizing: border-box;
     width: calc(100% - 70px); // [100% - .topic-avatar width]
@@ -628,7 +685,7 @@ $topic-avatar-width: 45px;
 
 .time-gap + .topic-post .embedded-posts.top {
   border-bottom: 1px solid $primary-low;
-} 
+}
 
 
 .posts-wrapper {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index b4387dcfca..a670968d9d 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -44,10 +44,9 @@
 }
 
 .private-message-glyph {
-  color: dark-light-choose($primary-low-mid, $secondary-high);
   float: left;
-  margin-right: 5px;
 }
+
 .private_message #topic-title .private-message-glyph { display: inline; }
 
 .topic-error {
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 7345548003..6244b8aaf8 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -147,26 +147,6 @@
       }
     }
 
-  .secondary {
-    background: $secondary;
-    border-top: 1px solid $primary-low;
-    border-bottom: 1px solid $primary-low;
-
-      dl {
-        padding: 8px 10px;
-      }
-
-      dd {
-        display: inline;
-        margin: 0 10px 0 0;
-      }
-
-      dt {
-        margin: 0 5px 0 0;
-        padding: 0;
-      }
-    }
-
     .details {
       padding: 0 0 4px 0;
       margin-top: -200px;
diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss
index 0ab1c39142..7bbf810764 100644
--- a/app/assets/stylesheets/mobile/group.scss
+++ b/app/assets/stylesheets/mobile/group.scss
@@ -19,19 +19,18 @@
 }
 
 .group-nav.mobile-nav {
-  margin-bottom: 15px;
   float: left;
 }
 
-.group-activity {
+.group-activity, .group-manage {
   position: relative;
 }
 
-.group-activity-nav, .group-messages-nav {
+.group-navigation {
   &.mobile-nav {
     position: absolute;
     right: 0;
-    top: -57px;
+    top: -51px;
   }
 }
 
@@ -51,7 +50,7 @@
   }
 }
 
-table.group-logs {
+table.group-manage-logs {
   width: 130%;
 }
 
@@ -80,3 +79,28 @@ table.group-logs {
     }
   }
 }
+
+.group-outlet {
+  .group-username-filter {
+    position: absolute;
+    right: 0px;
+    top: -42px;
+    height: 27px;
+    margin-bottom: 0px;
+  }
+
+  .group-members-manage {
+    width: 100%;
+    text-align: right;
+  }
+
+  .group-members-dropdown,
+  .group-members-add {
+    margin: 5px 0px;
+  }
+}
+
+
+.group-add-members-btn {
+  margin-bottom: 10px;
+}
diff --git a/app/assets/stylesheets/mobile/groups.scss b/app/assets/stylesheets/mobile/groups.scss
index 71d3caa4f9..a7e6df7af1 100644
--- a/app/assets/stylesheets/mobile/groups.scss
+++ b/app/assets/stylesheets/mobile/groups.scss
@@ -3,12 +3,14 @@
     margin-top: 20px;
   }
 
-  .groups-filter {
+  .groups-header-filters {
     display: block;
     float: none;
   }
 
-  .groups-name-filter {
+  .groups-header-filters-name,
+  .groups-header-filters-type, 
+  .groups-header-new {
     margin-top: 10px;
   }
 }
diff --git a/app/assets/stylesheets/mobile/search.scss b/app/assets/stylesheets/mobile/search.scss
index c9903295ec..b27a8d326f 100644
--- a/app/assets/stylesheets/mobile/search.scss
+++ b/app/assets/stylesheets/mobile/search.scss
@@ -1,43 +1,45 @@
-.search button.btn-primary, .search button.btn {
-  float: none;
-}
+.search-container {
+  flex-direction: column;
+  margin-top: .5em;
 
-.search-advanced {
-  .search-advanced-options {
-    .control-group {
-      margin-bottom: 10px;
-      .controls {
-        input:not([type="checkbox"]),select {
-          width: 75%;
+  .search-advanced {
+    order: 1;
+    width: 100%;
+
+    .search-info {
+      flex-direction: column;
+      align-items: left;
+      justify-content: center;
+
+      .sort-by {
+        display: flex;
+        align-items: center;
+        margin-top: .5em;
+        margin-left: 0;
+        width: 100%;
+
+        .select-kit {
+          flex: 1 1 auto;
         }
       }
     }
   }
-}
 
-.search-title {
-  .sort-by {
-    display: flex;
+  .search-notice {
+    margin-top: 1em;
+  }
+
+  .search-advanced-sidebar {
+    order: 0;
     width: 100%;
-    align-items: center;
-    .select-kit {
-      flex: 1 1 auto;
+    margin: 0;
+
+    .tag-chooser {
+      width: 100%;
     }
   }
 }
 
-.search.row {
-  margin-top: 10px;
-}
-
-.search.row input.search {
-  height: 25px;
-}
-
-.fps-search-context {
-  margin-bottom: 15px;
-}
-
 .fps-topic {
   max-width: 75%;
 }
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 3b48e5c91e..ddb3b4c036 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -29,7 +29,7 @@ span.badge-posts {
 .topic-post {
   nav.post-controls {
     clear: both;
-    color: dark-light-choose($primary-low-mid, $secondary-high);        
+    color: dark-light-choose($primary-low-mid, $secondary-high);
     .d-icon {
       opacity: 1.0;
     }
@@ -51,7 +51,7 @@ span.badge-posts {
       }
       &.reply {
         float: right;
-        color: $primary-high;        
+        color: $primary-high;
       }
       &.has-like {
         color: $love;
@@ -62,8 +62,18 @@ span.badge-posts {
     }
 
     button.like-count {
-      font-size: $font-0;
+      font-size: $font-up-1;
       padding: 8px 4px;
+      i.fa-heart {
+        padding-left: 8px;
+        color: dark-light-choose($primary-low-mid, $secondary-high);
+      }
+      &.my-likes {
+        margin-right: 5px;
+      }
+      &.regular-likes {
+        margin-right: -5px;
+      }
     }
   }
 }
@@ -404,7 +414,7 @@ blockquote {
 }
 
 .gap {
-  padding: 0.25em 0;  
+  padding: 0.25em 0;
 }
 
 .gutter { display: none; }
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 48e682e147..df79b7f6f3 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -31,10 +31,8 @@
   .private-message-glyph { display: none; }
 }
 
-.private-message-glyph { color: dark-light-choose($primary-low-mid, $secondary-high); }
 .private_message #topic-title .private-message-glyph { display: inline; }
 
-
 /* both blocks that appear under the standard post control buttons */
 .notification-options, .pinned-options {
   float: left;
diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss
index ce8135103b..2d487d8013 100644
--- a/app/assets/stylesheets/mobile/upload.scss
+++ b/app/assets/stylesheets/mobile/upload.scss
@@ -1,6 +1,6 @@
 .upload-selector {
   input[type="text"]{
-    width: 520px;
+    width: calc(100% - 20px);
   }
   input[type="file"] {
     font-size: $font-0;
@@ -9,6 +9,27 @@
   .description {
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
+  .radios {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    &:first-of-type {
+      margin-bottom: 1em;
+    }
+    input, label {
+      min-height: 20px;
+      line-height: $line-height-medium;
+      margin: 0;
+    }
+    .radio {
+      padding-left: 5px;
+    }
+    .inputs {
+      margin-top: 10px; 
+      width: 100%;
+    }
+  }
+
 }
 
 .uploaded-image-preview {
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 09df789b5a..a8cd147c22 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -9,7 +9,7 @@
 }
 
 .user-main {
-
+margin-top: 10px;
   table.group-members {
     width: 100%;
     p {
@@ -77,18 +77,9 @@
     }
 
     .secondary {
-      background: $primary-low;
-
       dl {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: center;
-        padding: 10px;
-
-      }
-
-      dd {
-        margin: 0 15px 0 5px;
+        padding: 5px 0;
+        
       }
     }
 
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index 3d83a71cd7..33e3c67f8a 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -17,6 +17,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "system_messages.email_reject_screened_email",
                      "system_messages.email_reject_unrecognized_error",
                      "system_messages.pending_users_reminder", "system_messages.post_hidden",
+                     "system_messages.post_hidden_again",
                      "system_messages.restore_failed", "system_messages.restore_succeeded",
                      "system_messages.spam_post_blocked", "system_messages.too_many_spam_flags",
                      "system_messages.unsilenced", "system_messages.user_automatically_silenced",
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 5de992cee6..e56fe53c11 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,105 +1,45 @@
 class Admin::GroupsController < Admin::AdminController
-  def index
-    groups = Group.order(:name).where("groups.id <> ?", Group::AUTO_GROUPS[:everyone])
-
-    if search = params[:search].to_s
-      groups = groups.where("name ILIKE ?", "%#{search}%")
-    end
-
-    if params[:ignore_automatic].to_s == "true"
-      groups = groups.where(automatic: false)
-    end
-
-    render_serialized(groups, BasicGroupSerializer)
-  end
-
-  def show
-    render body: nil
-  end
-
   def bulk
-    render body: nil
   end
 
   def bulk_perform
-    group = Group.find(params[:group_id].to_i)
+    group = Group.find_by(id: params[:group_id].to_i)
+    raise Discourse::NotFound unless group
     users_added = 0
-    if group.present?
-      users = (params[:users] || []).map { |u| u.downcase }
-      valid_emails = {}
-      valid_usernames = {}
 
-      valid_users = User.joins(:user_emails)
-        .where("username_lower IN (:users) OR user_emails.email IN (:users)", users: users)
-        .pluck(:id, :username_lower, :"user_emails.email")
+    users = (params[:users] || []).map { |user| user.downcase!; user }
+    valid_emails = {}
+    valid_usernames = {}
 
-      valid_users.map! do |id, username_lower, email|
-        valid_emails[email] = valid_usernames[username_lower] = id
-        id
-      end
-      valid_users.uniq!
-      invalid_users = users.reject! { |u| valid_emails[u] || valid_usernames[u] }
-      group.bulk_add(valid_users) if valid_users.present?
-      users_added = valid_users.count
+    valid_users = User.joins(:user_emails)
+      .where("username_lower IN (:users) OR lower(user_emails.email) IN (:users)", users: users)
+      .pluck(:id, :username_lower, :"user_emails.email")
+
+    valid_users.map! do |id, username_lower, email|
+      valid_emails[email] = valid_usernames[username_lower] = id
+      id
     end
 
-    render json: { success: true, message: I18n.t('groups.success.bulk_add', users_added: users_added), users_not_added: invalid_users }
+    valid_users.uniq!
+    invalid_users = users.reject { |u| valid_emails[u] || valid_usernames[u] }
+    group.bulk_add(valid_users) if valid_users.present?
+    users_added = valid_users.count
+
+    response = success_json.merge(users_not_added: invalid_users)
+
+    if users_added > 0
+      response[:message] = I18n.t('groups.success.bulk_add', count: users_added)
+    end
+
+    render json: response
   end
 
   def create
-    save_group(Group.new)
-  end
+    attributes = group_params.to_h.except(:owner_usernames, :usernames)
+    group = Group.new(attributes)
 
-  def update
-    group = Group.find(params[:id])
-
-    # group rename is ignored for automatic groups
-    group.name = group_params[:name] if group_params[:name] && !group.automatic
-    save_group(group) { |g| GroupActionLogger.new(current_user, g).log_change_group_settings }
-  end
-
-  def save_group(group)
-    group.name = group_params[:name] if group_params[:name].present? && !group.automatic
-    group.mentionable_level = group_params[:mentionable_level].to_i if group_params[:mentionable_level].present?
-    group.messageable_level = group_params[:messageable_level].to_i if group_params[:messageable_level].present?
-
-    if group_params[:visibility_level]
-      group.visibility_level = group_params[:visibility_level]
-    end
-
-    grant_trust_level = group_params[:grant_trust_level].to_i
-    group.grant_trust_level = (grant_trust_level > 0 && grant_trust_level <= 4) ? grant_trust_level : nil
-
-    group.automatic_membership_email_domains = group_params[:automatic_membership_email_domains] unless group.automatic
-    group.automatic_membership_retroactive = group_params[:automatic_membership_retroactive] == "true" unless group.automatic
-
-    group.primary_group = group.automatic ? false : group_params["primary_group"] == "true"
-
-    group.incoming_email = group.automatic ? nil : group_params[:incoming_email]
-
-    title = group_params[:title] if group_params[:title].present?
-    group.title = group.automatic ? nil : title
-
-    group.flair_url      = group_params[:flair_url].presence
-    group.flair_bg_color = group_params[:flair_bg_color].presence
-    group.flair_color    = group_params[:flair_color].presence
-
-    %i{public_admission public_exit}.each do |key|
-      if group_params[key]
-        group.public_send("#{key}=", group_params[key])
-      end
-    end
-
-    group.bio_raw = group_params[:bio_raw] if group_params[:bio_raw]
-    group.full_name = group_params[:full_name] if group_params[:full_name]
-
-    if group_params.key?(:default_notification_level)
-      group.default_notification_level = group_params[:default_notification_level]
-    end
-
-    if group_params[:allow_membership_requests]
-      group.allow_membership_requests = group_params[:allow_membership_requests]
-      group.membership_request_template = group_params[:membership_request_template]
+    unless group_params[:allow_membership_requests]
+      group.membership_request_template = nil
     end
 
     if group_params[:owner_usernames].present?
@@ -123,9 +63,6 @@ class Admin::GroupsController < Admin::AdminController
 
     if group.save
       group.restore_user_count!
-
-      yield(group) if block_given?
-
       render_serialized(group, BasicGroupSerializer)
     else
       render_json_error group
@@ -133,23 +70,21 @@ class Admin::GroupsController < Admin::AdminController
   end
 
   def destroy
-    group = Group.find(params[:id])
+    group = Group.find_by(id: params[:id])
+    raise Discourse::NotFound unless group
 
     if group.automatic
       can_not_modify_automatic
     else
-      group.destroy
+      group.destroy!
       render json: success_json
     end
   end
 
-  def refresh_automatic_groups
-    Group.refresh_automatic_groups!
-    render json: success_json
-  end
-
   def add_owners
-    group = Group.find(params.require(:id))
+    group = Group.find_by(id: params.require(:id))
+    raise Discourse::NotFound unless group
+
     return can_not_modify_automatic if group.automatic
     users = User.where(username: group_params[:usernames].split(","))
 
@@ -170,7 +105,9 @@ class Admin::GroupsController < Admin::AdminController
   end
 
   def remove_owner
-    group = Group.find(params.require(:id))
+    group = Group.find_by(params.require(:id))
+    raise Discourse::NotFound unless group
+
     return can_not_modify_automatic if group.automatic
 
     user = User.find(params[:user_id].to_i)
@@ -211,9 +148,9 @@ class Admin::GroupsController < Admin::AdminController
       :allow_membership_requests,
       :full_name,
       :default_notification_level,
-      :usernames,
+      :membership_request_template,
       :owner_usernames,
-      :membership_request_template
+      :usernames
     )
   end
 end
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index 99b4caa3bd..a40ec46998 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -78,7 +78,8 @@ class Admin::ThemesController < Admin::AdminController
       begin
         @theme = RemoteTheme.import_theme(params[:remote], current_user, private_key: params[:private_key])
         render json: @theme, status: :created
-      rescue RuntimeError
+      rescue RuntimeError => e
+        Discourse.warn_exception(e, message: "Error importing theme")
         render_json_error I18n.t('themes.error_importing')
       end
     elsif params[:bundle]
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index d8775cb177..9305e4cebd 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -308,7 +308,8 @@ class Admin::UsersController < Admin::AdminController
         silenced: true,
         silence_reason: silencer.user_history.try(:details),
         silenced_till: @user.silenced_till,
-        suspended_at: @user.silenced_at
+        suspended_at: @user.silenced_at,
+        silenced_by: BasicUserSerializer.new(current_user, root: false).as_json
       }
     )
   end
@@ -389,7 +390,13 @@ class Admin::UsersController < Admin::AdminController
     ip = params[:ip]
 
     # should we cache results in redis?
-    location = Excon.get("https://ipinfo.io/#{ip}/json", read_timeout: 10, connect_timeout: 10).body rescue nil
+    begin
+      location = Excon.get(
+        "https://ipinfo.io/#{ip}/json",
+        read_timeout: 10, connect_timeout: 10
+      )&.body
+    rescue Excon::Error
+    end
 
     render json: location
   end
@@ -423,7 +430,7 @@ class Admin::UsersController < Admin::AdminController
     }
 
     AdminUserIndexQuery.new(params).find_users(50).each do |user|
-      user_destroyer.destroy(user, options) rescue nil
+      user_destroyer.destroy(user, options)
     end
 
     render json: success_json
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f2a7b47501..89719d67d7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -641,6 +641,8 @@ class ApplicationController < ActionController::Base
           # save original URL in a session so we can redirect after login
           session[:destination_url] = destination_url
           redirect_to path('/session/sso')
+        elsif params[:authComplete].present?
+          redirect_to path("/login?authComplete=true")
         else
           # save original URL in a cookie (javascript redirects after login in this case)
           cookies[:destination_url] = destination_url
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index aaaf1ec7bd..6fb2bd07cc 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -149,6 +149,7 @@ class CategoriesController < ApplicationController
       old_permissions = cat.permissions_params
 
       if result = cat.update(category_params)
+        DiscourseEvent.trigger(:category_updated, cat)
         Scheduler::Defer.later "Log staff action change category settings" do
           @staff_action_logger.log_category_settings_change(@category, category_params, old_permissions)
         end
@@ -165,6 +166,7 @@ class CategoriesController < ApplicationController
     custom_slug = params[:slug].to_s
 
     if custom_slug.present? && @category.update_attributes(slug: custom_slug)
+      DiscourseEvent.trigger(:category_updated, @category)
       render json: success_json
     else
       render_json_error(@category)
@@ -281,6 +283,7 @@ class CategoriesController < ApplicationController
                         :default_view,
                         :subcategory_list_style,
                         :default_top_period,
+                        :minimum_required_tags,
                         custom_fields: [params[:custom_fields].try(:keys)],
                         permissions: [*p.try(:keys)],
                         allowed_tags: [],
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index fff17a578a..686019e850 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -103,9 +103,12 @@ class EmbedController < ApplicationController
     end
 
     def ensure_embeddable
+      if !(Rails.env.development? && current_user&.admin?)
+        referer = request.referer
 
-      if !(Rails.env.development? && current_user.try(:admin?))
-        raise Discourse::InvalidAccess.new('invalid referer host') unless EmbeddableHost.url_allowed?(request.referer)
+        unless referer && EmbeddableHost.url_allowed?(referer)
+          raise Discourse::InvalidAccess.new('invalid referer host')
+        end
       end
 
       response.headers['X-Frame-Options'] = "ALLOWALL"
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index b41f170edf..ff14238113 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,5 +1,4 @@
 class GroupsController < ApplicationController
-
   requires_login only: [
     :set_notifications,
     :mentionable,
@@ -7,7 +6,8 @@ class GroupsController < ApplicationController
     :update,
     :histories,
     :request_membership,
-    :search
+    :search,
+    :new
   ]
 
   skip_before_action :preload_json, :check_xhr, only: [:posts_feed, :mentions_feed]
@@ -37,7 +37,7 @@ class GroupsController < ApplicationController
   }
 
   def index
-    unless SiteSetting.enable_group_directory?
+    unless SiteSetting.enable_group_directory? || current_user&.staff?
       raise Discourse::InvalidAccess.new(:enable_group_directory)
     end
 
@@ -108,20 +108,35 @@ class GroupsController < ApplicationController
       end
 
       format.json do
-        render_serialized(group, GroupShowSerializer, root: 'basic_group')
+        groups = Group.visible_groups(current_user)
+
+        if !guardian.is_staff?
+          groups = groups.where(automatic: false)
+        end
+
+        render_json_dump(
+          group: serialize_data(group, GroupShowSerializer, root: nil),
+          extras: {
+            visible_group_names: groups.pluck(:name)
+          }
+        )
       end
     end
   end
 
+  def new
+  end
+
   def edit
   end
 
   def update
     group = Group.find(params[:id])
-    guardian.ensure_can_edit!(group)
+    guardian.ensure_can_edit!(group) unless current_user.admin
 
-    if group.update_attributes(group_params)
+    if group.update(group_params(automatic: group.automatic))
       GroupActionLogger.new(current_user, group).log_change_group_settings
+      DiscourseEvent.trigger(:group_updated, group)
 
       render json: success_json
     else
@@ -253,7 +268,7 @@ class GroupsController < ApplicationController
     if (usernames = group.users.where(id: users.pluck(:id)).pluck(:username)).present?
       render_json_error(I18n.t(
         "groups.errors.member_already_exist",
-        username: usernames.join(", "),
+        username: usernames.sort.join(", "),
         count: usernames.size
       ))
     else
@@ -289,7 +304,8 @@ class GroupsController < ApplicationController
   end
 
   def remove_member
-    group = Group.find(params[:id])
+    group = Group.find_by(id: params[:id])
+    raise Discourse::NotFound unless group
     group.public_exit ? ensure_logged_in : guardian.ensure_can_edit!(group)
 
     user =
@@ -373,7 +389,7 @@ class GroupsController < ApplicationController
 
   def histories
     group = find_group(:group_id)
-    guardian.ensure_can_edit!(group)
+    guardian.ensure_can_edit!(group) unless current_user.admin
 
     page_size = 25
     offset = (params[:offset] && params[:offset].to_i) || 0
@@ -410,23 +426,54 @@ class GroupsController < ApplicationController
 
   private
 
-  def group_params
-    params.require(:group).permit(
-      :flair_url,
-      :flair_bg_color,
-      :flair_color,
-      :bio_raw,
-      :full_name,
-      :public_admission,
-      :public_exit,
-      :allow_membership_requests,
-      :membership_request_template,
-    )
+  def group_params(automatic: false)
+    permitted_params =
+      if automatic
+        %i{
+          visibility_level
+          mentionable_level
+          messageable_level
+          default_notification_level
+        }
+      else
+        default_params = %i{
+          mentionable_level
+          messageable_level
+          title
+          flair_url
+          flair_bg_color
+          flair_color
+          bio_raw
+          public_admission
+          public_exit
+          allow_membership_requests
+          full_name
+          default_notification_level
+          membership_request_template
+        }
+
+        if current_user.admin
+          default_params.push(*[
+            :incoming_email,
+            :primary_group,
+            :visibility_level,
+            :name,
+            :grant_trust_level,
+            :automatic_membership_email_domains,
+            :automatic_membership_retroactive
+          ])
+        end
+
+        default_params
+      end
+
+    params.require(:group).permit(*permitted_params)
   end
 
   def find_group(param_name)
     name = params.require(param_name)
-    group = Group.find_by("lower(name) = ?", name.downcase)
+    group = Group
+    group = group.find_by("lower(name) = ?", name.downcase)
     guardian.ensure_can_see!(group)
     group
   end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 659e66f008..bf07fdc028 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -71,15 +71,24 @@ class ListController < ApplicationController
 
       list = TopicQuery.new(user, list_opts).public_send("list_#{filter}")
 
-      if @category.present? && guardian.can_create_shared_draft?
-        shared_drafts = TopicQuery.new(
-          user,
-          category: SiteSetting.shared_drafts_category,
-          destination_category_id: list_opts[:category]
-        ).list_latest
+      if guardian.can_create_shared_draft? && @category.present?
+        if @category.id == SiteSetting.shared_drafts_category.to_i
+          # On shared drafts, show the destination category
+          list.topics.each do |t|
+            t.includes_destination_category = true
+          end
+        else
+          # When viewing a non-shared draft category, find topics whose
+          # destination are this category
+          shared_drafts = TopicQuery.new(
+            user,
+            category: SiteSetting.shared_drafts_category,
+            destination_category_id: list_opts[:category]
+          ).list_latest
 
-        if shared_drafts.present? && shared_drafts.topics.present?
-          list.shared_drafts = shared_drafts.topics
+          if shared_drafts.present? && shared_drafts.topics.present?
+            list.shared_drafts = shared_drafts.topics
+          end
         end
       end
 
diff --git a/app/controllers/robots_txt_controller.rb b/app/controllers/robots_txt_controller.rb
index 4a8600774c..b5dfdb3e62 100644
--- a/app/controllers/robots_txt_controller.rb
+++ b/app/controllers/robots_txt_controller.rb
@@ -2,8 +2,60 @@ class RobotsTxtController < ApplicationController
   layout false
   skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
 
+  # NOTE: order is important!
+  DISALLOWED_PATHS ||= %w{
+    /auth/cas
+    /auth/facebook/callback
+    /auth/twitter/callback
+    /auth/google/callback
+    /auth/yahoo/callback
+    /auth/github/callback
+    /auth/cas/callback
+    /assets/browser-update*.js
+    /users/
+    /u/
+    /badges/
+    /search
+    /search/
+    /tags
+    /tags/
+    /email/
+    /session
+    /session/
+    /admin
+    /admin/
+    /user-api-key
+    /user-api-key/
+    /*?api_key*
+    /*?*api_key*
+    /groups
+    /groups/
+    /t/*/*.rss
+    /tags/*.rss
+    /c/*.rss
+  }
+
   def index
-    path = SiteSetting.allow_index_in_robots_txt ? :index : :no_index
+    if SiteSetting.allow_index_in_robots_txt
+      path = :index
+
+      @crawler_delayed_agents = SiteSetting.slow_down_crawler_user_agents.split('|').map { |agent|
+        [agent, SiteSetting.slow_down_crawler_rate]
+      }
+
+      if SiteSetting.whitelisted_crawler_user_agents.present?
+        @allowed_user_agents = SiteSetting.whitelisted_crawler_user_agents.split('|')
+        @disallowed_user_agents = ['*']
+      elsif SiteSetting.blacklisted_crawler_user_agents.present?
+        @allowed_user_agents = ['*']
+        @disallowed_user_agents = SiteSetting.blacklisted_crawler_user_agents.split('|')
+      else
+        @allowed_user_agents = ['*']
+      end
+    else
+      path = :no_index
+    end
+
     render path, content_type: 'text/plain'
   end
 end
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 2421ebbcae..2e8a75ab07 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -10,7 +10,7 @@ class SessionController < ApplicationController
   before_action :check_local_login_allowed, only: %i(create forgot_password email_login)
   before_action :rate_limit_login, only: %i(create email_login)
   skip_before_action :redirect_to_login_if_required
-  skip_before_action :preload_json, :check_xhr, only: %i(sso sso_login become sso_provider destroy email_login)
+  skip_before_action :preload_json, :check_xhr, only: %i(sso sso_login sso_provider destroy email_login)
 
   ACTIVATE_USER_KEY = "activate_user"
 
@@ -52,7 +52,7 @@ class SessionController < ApplicationController
         sso.external_id = current_user.id.to_s
         sso.admin = current_user.admin?
         sso.moderator = current_user.moderator?
-        sso.groups = current_user.groups.pluck(:name)
+        sso.groups = current_user.groups.pluck(:name).join(",")
 
         if sso.return_sso_url.blank?
           render plain: "return_sso_url is blank, it must be provided", status: 400
@@ -75,13 +75,17 @@ class SessionController < ApplicationController
 
   # For use in development mode only when login options could be limited or disabled.
   # NEVER allow this to work in production.
-  def become
-    raise Discourse::InvalidAccess.new unless Rails.env.development?
-    user = User.find_by_username(params[:session_id])
-    raise "User #{params[:session_id]} not found" if user.blank?
+  if !Rails.env.production?
+    skip_before_action :check_xhr, only: [:become]
 
-    log_on_user(user)
-    redirect_to path("/")
+    def become
+      raise Discourse::InvalidAccess if Rails.env.production?
+      user = User.find_by_username(params[:session_id])
+      raise "User #{params[:session_id]} not found" if user.blank?
+
+      log_on_user(user)
+      redirect_to path("/")
+    end
   end
 
   def sso_login
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index ef1837eab9..7377d47989 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -38,7 +38,13 @@ class StylesheetsController < ApplicationController
     end
 
     cache_time = request.env["HTTP_IF_MODIFIED_SINCE"]
-    cache_time = Time.rfc2822(cache_time) rescue nil if cache_time
+
+    if cache_time
+      begin
+        cache_time = Time.rfc2822(cache_time)
+      rescue ArgumentError
+      end
+    end
 
     query = StylesheetCache.where(target: target)
     if digest
@@ -82,12 +88,21 @@ class StylesheetsController < ApplicationController
   def handle_missing_cache(location, name, digest)
     location = location.sub(".css.map", ".css")
     source_map_location = location + ".map"
+    existing = read_file(location)
 
-    existing = File.read(location) rescue nil
     if existing && digest
-      source_map = File.read(source_map_location) rescue nil
+      source_map = read_file(source_map_location)
       StylesheetCache.add(name, digest, existing, source_map)
     end
   end
 
+  private
+
+    def read_file(location)
+      begin
+        File.read(location)
+      rescue Errno::ENOENT
+      end
+    end
+
 end
diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb
index 8d819827f7..069f73830a 100644
--- a/app/controllers/tag_groups_controller.rb
+++ b/app/controllers/tag_groups_controller.rb
@@ -70,7 +70,20 @@ class TagGroupsController < ApplicationController
     end
 
     def tag_groups_params
-      result = params.permit(:id, :name, :one_per_topic, tag_names: [], parent_tag_name: [])
+      if permissions = params[:permissions]
+        permissions.each do |k, v|
+          permissions[k] = v.to_i
+        end
+      end
+
+      result = params.permit(
+        :id,
+        :name,
+        :one_per_topic,
+        tag_names: [],
+        parent_tag_name: [],
+        permissions: [*permissions&.keys]
+      )
       result[:tag_names] ||= []
       result[:parent_tag_name] ||= []
       result[:one_per_topic] = (params[:one_per_topic] == "true")
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 3a6d5f0d67..4069ab6093 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -44,7 +44,10 @@ class TagsController < ::ApplicationController
             extras: { tag_groups: grouped_tag_counts }
           }
         else
-          unrestricted_tags = Tag.where("tags.id NOT IN (select tag_id from category_tags) AND tags.topic_count > 0")
+          unrestricted_tags = DiscourseTagging.filter_visible(
+            Tag.where("tags.id NOT IN (select tag_id from category_tags) AND tags.topic_count > 0"),
+            guardian
+          )
 
           categories = Category.where("id in (select category_id from category_tags)")
             .where("id in (?)", guardian.allowed_category_ids)
@@ -107,6 +110,7 @@ class TagsController < ::ApplicationController
     tag.name = new_tag_name
     if tag.save
       StaffActionLogger.new(current_user).log_custom('renamed_tag', previous_value: params[:tag_id], new_value: new_tag_name)
+      DiscourseEvent.trigger(:tag_updated, tag)
       render json: { tag: { id: new_tag_name } }
     else
       render_json_error tag.errors.full_messages
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 9f6467212d..9f4fe20b35 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -117,6 +117,14 @@ class TopicsController < ApplicationController
 
     canonical_url UrlHelper.absolute_without_cdn(@topic_view.canonical_path)
 
+    # provide hint to crawlers only for now
+    # we would like to give them a bit more signal about age of data
+    if use_crawler_layout?
+      if last_modified = @topic_view.posts&.map { |p| p.updated_at }&.max&.httpdate
+        response.headers['Last-Modified'] = last_modified
+      end
+    end
+
     perform_show_response
 
   rescue Discourse::InvalidAccess => ex
@@ -668,9 +676,10 @@ class TopicsController < ApplicationController
       raise ActionController::ParameterMissing.new(:topic_ids)
     end
 
-    operation = params.require(:operation)
-    operation.permit!
-    operation = operation.to_h.symbolize_keys
+    operation = params
+      .require(:operation)
+      .permit(:type, :group, :category_id, :notification_level_id, tags: [])
+      .to_h.symbolize_keys
 
     raise ActionController::ParameterMissing.new(:operation_type) if operation[:type].blank?
     operator = TopicsBulkAction.new(current_user, topic_ids, operation, group: operation[:group])
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 39fc24124b..b2e1b9fac2 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -127,7 +127,7 @@ class UploadsController < ApplicationController
 
     upload.errors.empty? ? upload : { errors: upload.errors.values.flatten }
   ensure
-    tempfile&.close! rescue nil
+    tempfile&.close!
   end
 
 end
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index cd456a8c40..b6b415d69a 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -58,7 +58,11 @@ class UserBadgesController < ApplicationController
     post_id = nil
 
     if params[:reason].present?
-      path = URI.parse(params[:reason]).path rescue nil
+      path = begin
+        URI.parse(params[:reason]).path
+      rescue URI::InvalidURIError
+      end
+
       route = Rails.application.routes.recognize_path(path) if path
       if route
         topic_id = route[:topic_id].to_i
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 768898585a..c8edddf65b 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -48,7 +48,11 @@ class Users::OmniauthCallbacksController < ApplicationController
     end
 
     if origin.present?
-      parsed = URI.parse(origin) rescue nil
+      parsed = begin
+        URI.parse(origin)
+      rescue URI::InvalidURIError
+      end
+
       if parsed
         @origin = "#{parsed.path}?#{parsed.query}"
       end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1a0118a152..61507d2c0d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -592,7 +592,7 @@ class UsersController < ApplicationController
         end
 
         email_token_user = EmailToken.confirmable(token)&.user
-        totp_enabled = email_token_user.totp_enabled?
+        totp_enabled = email_token_user&.totp_enabled?
         second_factor_token = params[:second_factor_token]
         confirm_email = false
 
@@ -1064,7 +1064,7 @@ class UsersController < ApplicationController
 
       permitted.concat UserUpdater::OPTION_ATTR
       permitted.concat UserUpdater::CATEGORY_IDS.keys.map { |k| { k => [] } }
-      permitted.concat UserUpdater::TAG_NAMES.keys.map { |k| { k => [] } }
+      permitted.concat UserUpdater::TAG_NAMES.keys
 
       result = params
         .permit(permitted)
diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 1c56b33dd1..b6e1ad2093 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -77,8 +77,8 @@ class WebhooksController < ActionController::Base
   def mandrill
     events = params["mandrill_events"]
     events.each do |event|
-      message_id = event["msg"]["metadata"]["message_id"] rescue nil
-      to_address = event["msg"]["email"] rescue nil
+      message_id = event.dig("msg", "metadata", "message_id")
+      to_address = event.dig("msg", "email")
 
       case event["event"]
       when "hard_bounce"
@@ -94,12 +94,12 @@ class WebhooksController < ActionController::Base
   def sparkpost
     events = params["_json"] || [params]
     events.each do |event|
-      message_event = event["msys"]["message_event"] rescue nil
+      message_event = event.dig("msys", "message_event")
       next unless message_event
 
-      message_id   = message_event["rcpt_meta"]["message_id"] rescue nil
-      to_address   = message_event["rcpt_to"]                 rescue nil
-      bounce_class = message_event["bounce_class"]            rescue nil
+      message_id   = message_event.dig("rcpt_meta", "message_id")
+      to_address   = message_event["rcpt_to"]
+      bounce_class = message_event["bounce_class"]
       next unless bounce_class
 
       bounce_class = bounce_class.to_i
diff --git a/app/helpers/common_helper.rb b/app/helpers/common_helper.rb
index 1d8317554c..6e37098d2d 100644
--- a/app/helpers/common_helper.rb
+++ b/app/helpers/common_helper.rb
@@ -5,9 +5,15 @@ module CommonHelper
     end
   end
 
-  def render_google_tag_manager_code
+  def render_google_tag_manager_head_code
     if Rails.env.production? && SiteSetting.gtm_container_id.present?
-      render partial: "common/google_tag_manager"
+      render partial: "common/google_tag_manager_head"
+    end
+  end
+
+  def render_google_tag_manager_body_code
+    if Rails.env.production? && SiteSetting.gtm_container_id.present?
+      render partial: "common/google_tag_manager_body"
     end
   end
 end
diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index 3e9683359e..dd57d45794 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -37,7 +37,7 @@ module UserNotificationsHelper
 
     result = ""
     length = 0
-    doc.css('body > p, aside.onebox').each do |node|
+    doc.css('body > p, aside.onebox, body > ul').each do |node|
       if node.text.present?
         result << node.to_s
         length += node.inner_text.length
diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index 5aa29987be..2d6f0e6454 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -17,15 +17,15 @@ module Jobs
       filename = args[:filename]
       @current_user = User.find_by(id: args[:current_user_id])
       raise Discourse::InvalidParameters.new(:filename) if filename.blank?
+      csv_path = "#{Invite.base_directory}/#{filename}"
 
       # read csv file, and send out invitations
-      read_csv_file("#{Invite.base_directory}/#{filename}")
+      read_csv_file(csv_path)
     ensure
       # send notification to user regarding progress
       notify_user
 
-      # since emails have already been sent out, delete the uploaded csv file
-      FileUtils.rm_rf(csv_path) rescue nil
+      FileUtils.rm_rf(csv_path) if csv_path
     end
 
     def read_csv_file(csv_path)
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index cc80fcebb2..5ec6f4fa68 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -39,7 +39,7 @@ module Jobs
     end
 
     def setup_topic(args)
-      topic_view = (TopicView.new(args[:topic_id], Discourse.system_user) rescue nil)
+      topic_view = TopicView.new(args[:topic_id], Discourse.system_user)
       return if topic_view.blank?
       args[:payload] = WebHookTopicViewSerializer.new(topic_view, scope: guardian, root: false).as_json
     end
@@ -50,6 +50,30 @@ module Jobs
       args[:payload] = WebHookUserSerializer.new(user, scope: guardian, root: false).as_json
     end
 
+    def setup_group(args)
+      group = Group.find(args[:group_id])
+      return if group.blank?
+      args[:payload] = WebHookGroupSerializer.new(group, scope: guardian, root: false).as_json
+    end
+
+    def setup_category(args)
+      category = Category.find(args[:category_id])
+      return if category.blank?
+      args[:payload] = WebHookCategorySerializer.new(category, scope: guardian, root: false).as_json
+    end
+
+    def setup_tag(args)
+      tag = Tag.find(args[:tag_id])
+      return if tag.blank?
+      args[:payload] = TagSerializer.new(tag, scope: guardian, root: false).as_json
+    end
+
+    def setup_flag(args)
+      flag = PostAction.find(args[:flag_id])
+      return if flag.blank?
+      args[:payload] = WebHookFlagSerializer.new(flag, scope: guardian, root: false).as_json
+    end
+
     def ping_event?(event_type)
       event_type.to_s == 'ping'.freeze
     end
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 0a0899e572..1212bb1c87 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -142,8 +142,8 @@ module Jobs
     def report_export
       return enum_for(:report_export) unless block_given?
 
-      @extra[:start_date] = @extra[:start_date].to_date if @extra[:start_date].is_a?(String)
-      @extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String)
+      @extra[:start_date] = @extra[:start_date].to_date.beginning_of_day if @extra[:start_date].is_a?(String)
+      @extra[:end_date] = @extra[:end_date].to_date.end_of_day if @extra[:end_date].is_a?(String)
       @extra[:category_id] = @extra[:category_id].present? ? @extra[:category_id].to_i : nil
       @extra[:group_id] = @extra[:group_id].present? ? @extra[:group_id].to_i : nil
 
@@ -152,7 +152,7 @@ module Jobs
         report_hash[row[:x].to_s(:db)] = row[:y].to_s(:db)
       end
 
-      (@extra[:start_date]..@extra[:end_date]).each do |date|
+      (@extra[:start_date].to_date..@extra[:end_date].to_date).each do |date|
         yield [date.to_s(:db), report_hash.fetch(date.to_s(:db), 0)]
       end
     end
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index b920c60590..ce88cd6546 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -24,7 +24,7 @@ module Jobs
           follow_redirect: true
         )
       rescue
-        if (retries -= 1) > 0
+        if (retries -= 1) > 0 && !Rails.env.test?
           sleep 1
           retry
         end
@@ -47,9 +47,9 @@ module Jobs
 
       downloaded_urls = {}
 
-      large_images = JSON.parse(post.custom_fields[Post::LARGE_IMAGES].presence || "[]") rescue []
-      broken_images = JSON.parse(post.custom_fields[Post::BROKEN_IMAGES].presence || "[]") rescue []
-      downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}") rescue {}
+      large_images = JSON.parse(post.custom_fields[Post::LARGE_IMAGES].presence || "[]")
+      broken_images = JSON.parse(post.custom_fields[Post::BROKEN_IMAGES].presence || "[]")
+      downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}")
 
       has_new_large_image  = false
       has_new_broken_image = false
@@ -62,7 +62,9 @@ module Jobs
         if is_valid_image_url(src)
           begin
             # have we already downloaded that file?
-            unless downloaded_images.include?(src) || large_images.include?(src) || broken_images.include?(src)
+            schemeless_src = remove_scheme(original_src)
+
+            unless downloaded_images.include?(schemeless_src) || large_images.include?(schemeless_src) || broken_images.include?(schemeless_src)
               if hotlinked = download(src)
                 if File.size(hotlinked.path) <= @max_size
                   filename = File.basename(URI.parse(src).path)
@@ -70,17 +72,17 @@ module Jobs
                   upload = UploadCreator.new(hotlinked, filename, origin: src).create_for(post.user_id)
                   if upload.persisted?
                     downloaded_urls[src] = upload.url
-                    downloaded_images[src.sub(/^https?:/i, "")] = upload.id
+                    downloaded_images[remove_scheme(src)] = upload.id
                     has_downloaded_image = true
                   else
                     log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.full_messages.join("\n")}")
                   end
                 else
-                  large_images << original_src.sub(/^https?:/i, "")
+                  large_images << remove_scheme(original_src)
                   has_new_large_image = true
                 end
               else
-                broken_images << original_src.sub(/^https?:/i, "")
+                broken_images << remove_scheme(original_src)
                 has_new_broken_image = true
               end
             end
@@ -170,6 +172,11 @@ module Jobs
       )
     end
 
+    private
+
+      def remove_scheme(src)
+        src.sub(/^https?:/i, "")
+      end
   end
 
 end
diff --git a/app/jobs/scheduled/clean_up_crawler_stats.rb b/app/jobs/scheduled/clean_up_crawler_stats.rb
new file mode 100644
index 0000000000..816e91f0fd
--- /dev/null
+++ b/app/jobs/scheduled/clean_up_crawler_stats.rb
@@ -0,0 +1,26 @@
+module Jobs
+
+  class CleanUpCrawlerStats < Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      WebCrawlerRequest.where('date < ?', WebCrawlerRequest.max_record_age.ago).delete_all
+
+      # keep count of only the top user agents
+      WebCrawlerRequest.exec_sql <<~SQL
+        WITH ranked_requests AS (
+          SELECT row_number() OVER (ORDER BY count DESC) as row_number, id
+            FROM web_crawler_requests
+           WHERE date = '#{1.day.ago.strftime("%Y-%m-%d")}'
+        )
+        DELETE FROM web_crawler_requests
+        WHERE id IN (
+          SELECT ranked_requests.id
+            FROM ranked_requests
+           WHERE row_number > #{WebCrawlerRequest.max_records_per_day}
+        )
+      SQL
+    end
+  end
+
+end
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 8ba294d424..797e3176eb 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -21,6 +21,7 @@ class AdminDashboardData
 
   PRIVATE_MESSAGE_REPORTS ||= [
     'user_to_user_private_messages',
+    'user_to_user_private_messages_with_replies',
     'system_private_messages',
     'notify_moderators_private_messages',
     'notify_user_private_messages',
diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index f13e7275a7..1e4459f681 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 class ApplicationRequest < ActiveRecord::Base
+
   enum req_type: %i(http_total
                     http_2xx
                     http_background
@@ -12,41 +13,12 @@ class ApplicationRequest < ActiveRecord::Base
                     page_view_logged_in_mobile
                     page_view_anon_mobile)
 
-  cattr_accessor :autoflush, :autoflush_seconds, :last_flush
-  # auto flush if backlog is larger than this
-  self.autoflush = 2000
-
-  # auto flush if older than this
-  self.autoflush_seconds = 5.minutes
-  self.last_flush = Time.now.utc
+  include CachedCounting
 
   def self.increment!(type, opts = nil)
-    key = redis_key(type)
-    val = $redis.incr(key).to_i
-
-    # readonly mode it is going to be 0, skip
-    return if val == 0
-
-    # 3.days, see: https://github.com/rails/rails/issues/21296
-    $redis.expire(key, 259200)
-
-    autoflush = (opts && opts[:autoflush]) || self.autoflush
-    if autoflush > 0 && val >= autoflush
-      write_cache!
-      return
-    end
-
-    if (Time.now.utc - last_flush).to_i > autoflush_seconds
-      write_cache!
-    end
+    perform_increment!(redis_key(type), opts)
   end
 
-  GET_AND_RESET = <<~LUA
-    local val = redis.call('get', KEYS[1])
-    redis.call('set', KEYS[1], '0')
-    return val
-  LUA
-
   def self.write_cache!(date = nil)
     if date.nil?
       write_cache!(Time.now.utc)
@@ -58,13 +30,9 @@ class ApplicationRequest < ActiveRecord::Base
 
     date = date.to_date
 
-    # this may seem a bit fancy but in so it allows
-    # for concurrent calls without double counting
     req_types.each do |req_type, _|
-      key = redis_key(req_type, date)
+      val = get_and_reset(redis_key(req_type, date))
 
-      namespaced_key = $redis.namespace_key(key)
-      val = $redis.without_namespace.eval(GET_AND_RESET, keys: [namespaced_key]).to_i
       next if val == 0
 
       id = req_id(date, req_type)
diff --git a/app/models/category.rb b/app/models/category.rb
index e551227ed6..432509ded6 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -61,6 +61,9 @@ class Category < ActiveRecord::Base
   after_update :rename_category_definition, if: :saved_change_to_name?
   after_update :create_category_permalink, if: :saved_change_to_slug?
 
+  after_commit :trigger_category_created_event, on: :create
+  after_commit :trigger_category_destroyed_event, on: :destroy
+
   belongs_to :parent_category, class_name: 'Category'
   has_many :subcategories, class_name: 'Category', foreign_key: 'parent_category_id'
 
@@ -321,6 +324,30 @@ SQL
     end
   end
 
+  def self.resolve_permissions(permissions)
+    read_restricted = true
+
+    everyone = Group::AUTO_GROUPS[:everyone]
+    full = CategoryGroup.permission_types[:full]
+
+    mapped = permissions.map do |group, permission|
+      group_id = Group.group_id_from_param(group)
+      permission = CategoryGroup.permission_types[permission] unless permission.is_a?(Integer)
+
+      [group_id, permission]
+    end
+
+    mapped.each do |group, permission|
+      if group == everyone && permission == full
+        return [false, []]
+      end
+
+      read_restricted = false if group == everyone
+    end
+
+    [read_restricted, mapped]
+  end
+
   def allowed_tags=(tag_names_arg)
     DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true)
   end
@@ -379,33 +406,6 @@ SQL
     self.update_attributes(latest_topic_id: latest_topic_id, latest_post_id: latest_post_id)
   end
 
-  def self.resolve_permissions(permissions)
-    read_restricted = true
-
-    everyone = Group::AUTO_GROUPS[:everyone]
-    full = CategoryGroup.permission_types[:full]
-
-    mapped = permissions.map do |group, permission|
-      group = group.id if group.is_a?(Group)
-
-      # subtle, using Group[] ensures the group exists in the DB
-      group = Group[group.to_sym].id unless group.is_a?(Integer)
-      permission = CategoryGroup.permission_types[permission] unless permission.is_a?(Integer)
-
-      [group, permission]
-    end
-
-    mapped.each do |group, permission|
-      if group == everyone && permission == full
-        return [false, []]
-      end
-
-      read_restricted = false if group == everyone
-    end
-
-    [read_restricted, mapped]
-  end
-
   def self.query_parent_category(parent_slug)
     self.where(slug: parent_slug, parent_category_id: nil).pluck(:id).first ||
     self.where(id: parent_slug.to_i).pluck(:id).first
@@ -511,6 +511,16 @@ SQL
   def subcategory_list_includes_topics?
     subcategory_list_style.end_with?("with_featured_topics")
   end
+
+  def trigger_category_created_event
+    DiscourseEvent.trigger(:category_created, self)
+    true
+  end
+
+  def trigger_category_destroyed_event
+    DiscourseEvent.trigger(:category_destroyed, self)
+    true
+  end
 end
 
 # == Schema Information
@@ -563,10 +573,11 @@ end
 #  default_top_period            :string(20)       default("all")
 #  mailinglist_mirror            :boolean          default(FALSE), not null
 #  suppress_from_latest          :boolean          default(FALSE)
+#  minimum_required_tags         :integer          default(0)
 #
 # Indexes
 #
 #  index_categories_on_email_in     (email_in) UNIQUE
 #  index_categories_on_topic_count  (topic_count)
-#  unique_index_categories_on_name  ((COALESCE(parent_category_id, '-1'::integer)), name) UNIQUE
+#  unique_index_categories_on_name  (COALESCE(parent_category_id, '-1'::integer), name) UNIQUE
 #
diff --git a/app/models/concerns/cached_counting.rb b/app/models/concerns/cached_counting.rb
new file mode 100644
index 0000000000..867c8fb250
--- /dev/null
+++ b/app/models/concerns/cached_counting.rb
@@ -0,0 +1,69 @@
+module CachedCounting
+  extend ActiveSupport::Concern
+
+  included do
+    class << self
+      attr_accessor :autoflush, :autoflush_seconds, :last_flush
+    end
+
+    # auto flush if backlog is larger than this
+    self.autoflush = 2000
+
+    # auto flush if older than this
+    self.autoflush_seconds = 5.minutes
+
+    self.last_flush = Time.now.utc
+  end
+
+  class_methods do
+    def perform_increment!(key, opts = nil)
+      val = $redis.incr(key).to_i
+
+      # readonly mode it is going to be 0, skip
+      return if val == 0
+
+      # 3.days, see: https://github.com/rails/rails/issues/21296
+      $redis.expire(key, 259200)
+
+      autoflush = (opts && opts[:autoflush]) || self.autoflush
+      if autoflush > 0 && val >= autoflush
+        write_cache!
+        return
+      end
+
+      if (Time.now.utc - last_flush).to_i > autoflush_seconds
+        write_cache!
+      end
+    end
+
+    def write_cache!(date = nil)
+      raise NotImplementedError
+    end
+
+    GET_AND_RESET = <<~LUA
+      local val = redis.call('get', KEYS[1])
+      redis.call('set', KEYS[1], '0')
+      return val
+    LUA
+
+    # this may seem a bit fancy but in so it allows
+    # for concurrent calls without double counting
+    def get_and_reset(key)
+      namespaced_key = $redis.namespace_key(key)
+      val = $redis.without_namespace.eval(GET_AND_RESET, keys: [namespaced_key]).to_i
+      $redis.expire(key, 259200) # SET removes expiry, so set it again
+      val
+    end
+
+    def request_id(query_params, retries = 0)
+      id = where(query_params).pluck(:id).first
+      id ||= create!(query_params.merge(count: 0)).id
+    rescue # primary key violation
+      if retries == 0
+        request_id(query_params, 1)
+      else
+        raise
+      end
+    end
+  end
+end
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index f25a716431..bc8988d9de 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -106,7 +106,33 @@ class DiscourseSingleSignOn < SingleSignOn
 
   private
 
+  def synchronize_groups(user)
+    names = (groups || "").split(",").map(&:downcase)
+    ids = Group.where('LOWER(NAME) in (?) AND NOT automatic', names).pluck(:id)
+
+    group_users = GroupUser
+      .where('group_id IN (SELECT id FROM groups WHERE NOT automatic)')
+      .where(user_id: user.id)
+
+    delete_group_users = group_users
+    if ids.length > 0
+      delete_group_users = group_users.where('group_id NOT IN (?)', ids)
+    end
+    delete_group_users.destroy_all
+
+    ids -= group_users.where('group_id IN (?)', ids).pluck(:group_id)
+
+    ids.each do |group_id|
+      GroupUser.create(group_id: group_id, user_id: user.id)
+    end
+  end
+
   def apply_group_rules(user)
+    if SiteSetting.sso_overrides_groups
+      synchronize_groups(user)
+      return
+    end
+
     if add_groups
       split = add_groups.split(",").map(&:downcase)
       if split.length > 0
@@ -130,49 +156,53 @@ class DiscourseSingleSignOn < SingleSignOn
   end
 
   def match_email_or_create_user(ip_address)
-    unless user = User.find_by_email(email)
-      try_name = name.presence
-      try_username = username.presence
+    # Use a mutex here to counter SSO requests that are sent at the same time w
+    # the same email payload
+    DistributedMutex.synchronize("discourse_single_sign_on_#{email}") do
+      unless user = User.find_by_email(email)
+        try_name = name.presence
+        try_username = username.presence
 
-      user_params = {
-        primary_email: UserEmail.new(email: email, primary: true),
-        name: try_name || User.suggest_name(try_username || email),
-        username: UserNameSuggester.suggest(try_username || try_name || email),
-        ip_address: ip_address
-      }
+        user_params = {
+          primary_email: UserEmail.new(email: email, primary: true),
+          name: try_name || User.suggest_name(try_username || email),
+          username: UserNameSuggester.suggest(try_username || try_name || email),
+          ip_address: ip_address
+        }
 
-      user = User.create!(user_params)
+        user = User.create!(user_params)
 
-      if SiteSetting.verbose_sso_logging
-        Rails.logger.warn("Verbose SSO log: New User (user_id: #{user.id}) Params: #{user_params} User Params: #{user.attributes} User Errors: #{user.errors.full_messages} Email: #{user.primary_email.attributes} Email Error: #{user.primary_email.errors.full_messages}")
+        if SiteSetting.verbose_sso_logging
+          Rails.logger.warn("Verbose SSO log: New User (user_id: #{user.id}) Params: #{user_params} User Params: #{user.attributes} User Errors: #{user.errors.full_messages} Email: #{user.primary_email.attributes} Email Error: #{user.primary_email.errors.full_messages}")
+        end
       end
-    end
 
-    if user
-      if sso_record = user.single_sign_on_record
-        sso_record.last_payload = unsigned_payload
-        sso_record.external_id = external_id
-      else
-        if avatar_url.present?
-          Jobs.enqueue(:download_avatar_from_url,
-            url: avatar_url,
-            user_id: user.id,
-            override_gravatar: SiteSetting.sso_overrides_avatar
+      if user
+        if sso_record = user.single_sign_on_record
+          sso_record.last_payload = unsigned_payload
+          sso_record.external_id = external_id
+        else
+          if avatar_url.present?
+            Jobs.enqueue(:download_avatar_from_url,
+              url: avatar_url,
+              user_id: user.id,
+              override_gravatar: SiteSetting.sso_overrides_avatar
+            )
+          end
+
+          user.create_single_sign_on_record!(
+            last_payload: unsigned_payload,
+            external_id: external_id,
+            external_username: username,
+            external_email: email,
+            external_name: name,
+            external_avatar_url: avatar_url
           )
         end
-
-        user.create_single_sign_on_record!(
-          last_payload: unsigned_payload,
-          external_id: external_id,
-          external_username: username,
-          external_email: email,
-          external_name: name,
-          external_avatar_url: avatar_url
-        )
       end
-    end
 
-    user
+      user
+    end
   end
 
   def change_external_attributes_and_override(sso_record, user)
diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb
index 2fb3e4ed15..c6f0effbbe 100644
--- a/app/models/embeddable_host.rb
+++ b/app/models/embeddable_host.rb
@@ -12,7 +12,10 @@ class EmbeddableHost < ActiveRecord::Base
   def self.record_for_url(uri)
 
     if uri.is_a?(String)
-      uri = URI(UrlHelper.escape_uri(uri)) rescue nil
+      uri = begin
+        URI(UrlHelper.escape_uri(uri))
+      rescue URI::InvalidURIError
+      end
     end
     return false unless uri.present?
 
@@ -40,7 +43,11 @@ class EmbeddableHost < ActiveRecord::Base
     # Work around IFRAME reload on WebKit where the referer will be set to the Forum URL
     return true if url&.starts_with?(Discourse.base_url)
 
-    uri = URI(UrlHelper.escape_uri(url)) rescue nil
+    uri = begin
+      URI(UrlHelper.escape_uri(url))
+    rescue URI::InvalidURIError
+    end
+
     uri.present? && record_for_url(uri).present?
   end
 
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 3b747df9a8..f0fb74b5a3 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -117,6 +117,8 @@ class GlobalSetting
     hostnames = [ hostname ]
     hostnames << backup_hostname if backup_hostname.present?
 
+    hostnames << URI.parse(cdn_url).host if cdn_url.present?
+
     hash["host_names"] = hostnames
     hash["database"] = db_name
 
diff --git a/app/models/group.rb b/app/models/group.rb
index 90bb845f63..9f049c8821 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -35,16 +35,20 @@ class Group < ActiveRecord::Base
   after_save :expire_cache
   after_destroy :expire_cache
 
+  after_commit :trigger_group_created_event, on: :create
+  after_commit :trigger_group_destroyed_event, on: :destroy
+
   def expire_cache
     ApplicationSerializer.expire_cache_fragment!("group_names")
   end
 
   validate :name_format_validator
-  validates :name, presence: true, uniqueness: { case_sensitive: false }
+  validates :name, presence: true
   validate :automatic_membership_email_domains_format_validator
   validate :incoming_email_validator
   validate :can_allow_membership_requests, if: :allow_membership_requests
   validates :flair_url, url: true, if: Proc.new { |g| g.flair_url && g.flair_url[0, 3] != 'fa-' }
+  validate :validate_grant_trust_level, if: :will_save_change_to_grant_trust_level?
 
   AUTO_GROUPS = {
     everyone: 0,
@@ -434,6 +438,15 @@ class Group < ActiveRecord::Base
     end
   end
 
+  # given something that might be a group name, id, or record, return the group id
+  def self.group_id_from_param(group_param)
+    return group_param.id if group_param.is_a?(Group)
+    return group_param if group_param.is_a?(Integer)
+
+    # subtle, using Group[] ensures the group exists in the DB
+    Group[group_param.to_sym].id
+  end
+
   def self.builtin
     Enum.new(:moderators, :admins, :trust_level_1, :trust_level_2)
   end
@@ -571,11 +584,33 @@ class Group < ActiveRecord::Base
     self.member_of(groups, user).where("gu.owner")
   end
 
+  def trigger_group_created_event
+    DiscourseEvent.trigger(:group_created, self)
+    true
+  end
+
+  def trigger_group_destroyed_event
+    DiscourseEvent.trigger(:group_destroyed, self)
+    true
+  end
+
   protected
 
     def name_format_validator
       self.name.strip!
-      UsernameValidator.perform_validation(self, 'name')
+      self.name.downcase!
+
+      UsernameValidator.perform_validation(self, 'name') || begin
+        if will_save_change_to_name? && name_was&.downcase != self.name
+          existing = Group.exec_sql(
+            User::USERNAME_EXISTS_SQL, username: self.name
+          ).values.present?
+
+          if existing
+            errors.add(:name, I18n.t("activerecord.errors.messages.taken"))
+          end
+        end
+      end
     end
 
     def automatic_membership_email_domains_format_validator
@@ -654,6 +689,15 @@ class Group < ActiveRecord::Base
 
   private
 
+    def validate_grant_trust_level
+      unless TrustLevel.valid?(self.grant_trust_level)
+        self.errors.add(:base, I18n.t(
+          'groups.errors.grant_trust_level_not_valid',
+          trust_level: self.grant_trust_level
+        ))
+      end
+    end
+
     def can_allow_membership_requests
       valid = true
 
diff --git a/app/models/group_user.rb b/app/models/group_user.rb
index 5356933012..5840b53664 100644
--- a/app/models/group_user.rb
+++ b/app/models/group_user.rb
@@ -82,15 +82,8 @@ class GroupUser < ActiveRecord::Base
       .includes(:group)
       .maximum("groups.grant_trust_level")
 
-    if highest_level.nil?
-      # If the user no longer has a group with a trust level,
-      # unlock them, start at 0 and consider promotions.
-      user.update!(group_locked_trust_level: nil)
-      Promotion.recalculate(user)
-    else
-      user.update!(group_locked_trust_level: highest_level)
-      user.change_trust_level!(highest_level)
-    end
+    user.update!(group_locked_trust_level: highest_level)
+    Promotion.recalculate(user)
   end
 
 end
diff --git a/app/models/incoming_email.rb b/app/models/incoming_email.rb
index be5bfdce60..b355235d26 100644
--- a/app/models/incoming_email.rb
+++ b/app/models/incoming_email.rb
@@ -5,7 +5,24 @@ class IncomingEmail < ActiveRecord::Base
 
   scope :errored,  -> { where("NOT is_bounce AND error IS NOT NULL") }
 
-  scope :addressed_to, -> (email) { where('incoming_emails.to_addresses ILIKE :email OR incoming_emails.cc_addresses ILIKE :email', email: "%#{email}%") }
+  scope :addressed_to, -> (email) do
+    where(<<~SQL, email: "%#{email}%")
+      incoming_emails.to_addresses ILIKE :email OR
+      incoming_emails.cc_addresses ILIKE :email
+    SQL
+  end
+
+  scope :addressed_to_user, ->(user) do
+    where(<<~SQL, user_id: user.id)
+      EXISTS(
+          SELECT 1
+          FROM user_emails
+          WHERE user_emails.user_id = :user_id AND
+                (incoming_emails.to_addresses ILIKE '%' || user_emails.email || '%' OR
+                 incoming_emails.cc_addresses ILIKE '%' || user_emails.email || '%')
+      )
+    SQL
+  end
 end
 
 # == Schema Information
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index 54c8d6c490..d25f40e30d 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -86,7 +86,7 @@ class OptimizedImage < ActiveRecord::Base
 
       # make sure we remove the cached copy from external stores
       if Discourse.store.external?
-        external_copy.try(:close!) rescue nil
+        external_copy&.close
       end
 
       thumbnail
@@ -293,15 +293,15 @@ class OptimizedImage < ActiveRecord::Base
           DbHelper.remap(previous_url, optimized_image.url)
           # remove the old file (when local)
           unless external
-            FileUtils.rm(path, force: true) rescue nil
+            FileUtils.rm(path, force: true)
           end
         rescue => e
           problems << { optimized_image: optimized_image, ex: e }
           # just ditch the optimized image if there was any errors
           optimized_image.destroy
         ensure
-          file.try(:unlink) rescue nil
-          file.try(:close) rescue nil
+          file&.unlink
+          file&.close
         end
       end
     end
diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index 62e3ef84f5..6b3799a554 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -37,7 +37,7 @@ class Permalink < ActiveRecord::Base
       end
 
       if regex.length > 1
-        [Regexp.new(regex[1..-1]), sub[1..-1] || ""] rescue nil
+        [Regexp.new(regex[1..-1]), sub[1..-1] || ""]
       end
 
     end
diff --git a/app/models/post.rb b/app/models/post.rb
index 78551d1f81..7d8da4859e 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -527,9 +527,10 @@ class Post < ActiveRecord::Base
     return if user_id == new_user.id
 
     edit_reason = I18n.with_locale(SiteSetting.default_locale) do
-      I18n.t('change_owner.post_revision_text',
-             old_user: (self.user.username_lower rescue nil) || I18n.t('change_owner.deleted_user'),
-             new_user: new_user.username_lower
+      I18n.t(
+        'change_owner.post_revision_text',
+        old_user: self.user&.username_lower || I18n.t('change_owner.deleted_user'),
+        new_user: new_user.username_lower
       )
     end
 
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index db6892e1e8..8e705527cd 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -155,6 +155,7 @@ SQL
 
     DiscourseEvent.trigger(:confirmed_spam_post, post) if trigger_spam
     DiscourseEvent.trigger(:flag_reviewed, post)
+    DiscourseEvent.trigger(:flag_agreed, actions.first) if actions.first.present?
 
     update_flagged_posts_count
   end
@@ -188,6 +189,7 @@ SQL
 
     Post.with_deleted.where(id: post.id).update_all(cached)
     DiscourseEvent.trigger(:flag_reviewed, post)
+    DiscourseEvent.trigger(:flag_disagreed, actions.first) if actions.first.present?
 
     update_flagged_posts_count
   end
@@ -206,6 +208,7 @@ SQL
     end
 
     DiscourseEvent.trigger(:flag_reviewed, post)
+    DiscourseEvent.trigger(:flag_deferred, actions.first) if actions.first.present?
     update_flagged_posts_count
   end
 
@@ -306,6 +309,10 @@ SQL
       end
     end
 
+    if post_action && PostActionType.notify_flag_type_ids.include?(post_action_type_id)
+      DiscourseEvent.trigger(:flag_created, post_action)
+    end
+
     GivenDailyLike.increment_for(user.id) if post_action_type_id == PostActionType.types[:like]
 
     # agree with other flags
@@ -569,6 +576,8 @@ SQL
       reason = guess_hide_reason(post)
     end
 
+    hiding_again = post.hidden_at.present?
+
     post.hidden = true
     post.hidden_at = Time.zone.now
     post.hidden_reason_id = reason
@@ -584,7 +593,10 @@ SQL
         flag_reason: I18n.t("flag_reasons.#{post_action_type}"),
       }
 
-      Jobs.enqueue_in(5.seconds, :send_system_message, user_id: post.user.id, message_type: :post_hidden, message_options: options)
+      Jobs.enqueue_in(5.seconds, :send_system_message,
+                      user_id: post.user.id,
+                      message_type: hiding_again ? :post_hidden_again : :post_hidden,
+                      message_options: options)
     end
   end
 
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index ab8ec1903d..5d069c72eb 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -111,9 +111,9 @@ class PostAnalyzer
     return @raw_links if @raw_links.present?
 
     @raw_links = []
-    cooked_stripped.css("a[href]").each do |l|
+    cooked_stripped.css("a").each do |l|
       # Don't include @mentions in the link count
-      next if l['href'].blank? || link_is_a_mention?(l)
+      next if link_is_a_mention?(l)
       @raw_links << l['href'].to_s
     end
 
diff --git a/app/models/post_custom_field.rb b/app/models/post_custom_field.rb
index 999500de52..1eedcc8848 100644
--- a/app/models/post_custom_field.rb
+++ b/app/models/post_custom_field.rb
@@ -15,6 +15,7 @@ end
 #
 # Indexes
 #
+#  idx_post_custom_fields_akismet                (post_id)
 #  index_post_custom_fields_on_name_and_value    (name, "left"(value, 200))
 #  index_post_custom_fields_on_post_id_and_name  (post_id,name)
 #
diff --git a/app/models/report.rb b/app/models/report.rb
index 04f27453a0..2d6c8a3624 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -27,7 +27,11 @@ class Report
      category_id: category_id,
      group_id: group_id,
      prev30Days: self.prev30Days
-    }
+    }.tap do |json|
+      if type == 'page_view_crawler_reqs'
+        json[:related_report] = Report.find('web_crawlers', start_date: start_date, end_date: end_date)&.as_json
+      end
+    end
   end
 
   def Report.add_report(name, &block)
@@ -202,14 +206,20 @@ class Report
   # Private messages counts:
 
   def self.private_messages_report(report, topic_subtype)
-    basic_report_about report, Post, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype
-    add_counts report, Post.private_posts.with_topic_subtype(topic_subtype), 'posts.created_at'
+    basic_report_about report, Topic, :private_message_topics_count_per_day, report.start_date, report.end_date, topic_subtype
+    add_counts report, Topic.private_messages.with_subtype(topic_subtype), 'topics.created_at'
   end
 
   def self.report_user_to_user_private_messages(report)
     private_messages_report report, TopicSubtype.user_to_user
   end
 
+  def self.report_user_to_user_private_messages_with_replies(report)
+    topic_subtype = TopicSubtype.user_to_user
+    basic_report_about report, Post, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype
+    add_counts report, Post.private_posts.with_topic_subtype(topic_subtype), 'posts.created_at'
+  end
+
   def self.report_system_private_messages(report)
     private_messages_report report, TopicSubtype.system_message
   end
@@ -225,4 +235,12 @@ class Report
   def self.report_notify_user_private_messages(report)
     private_messages_report report, TopicSubtype.notify_user
   end
+
+  def self.report_web_crawlers(report)
+    report.data = WebCrawlerRequest.where('date >= ? and date <= ?', report.start_date, report.end_date)
+      .limit(200)
+      .order('sum_count DESC')
+      .group(:user_agent).sum(:count)
+      .map { |ua, count| { x: ua, y: count } }
+  end
 end
diff --git a/app/models/shared_draft.rb b/app/models/shared_draft.rb
index 3f4dccee95..a8a1b93b89 100644
--- a/app/models/shared_draft.rb
+++ b/app/models/shared_draft.rb
@@ -2,3 +2,19 @@ class SharedDraft < ActiveRecord::Base
   belongs_to :topic
   belongs_to :category
 end
+
+# == Schema Information
+#
+# Table name: shared_drafts
+#
+#  topic_id    :integer          not null
+#  category_id :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  id          :integer          not null, primary key
+#
+# Indexes
+#
+#  index_shared_drafts_on_category_id  (category_id)
+#  index_shared_drafts_on_topic_id     (topic_id) UNIQUE
+#
diff --git a/app/models/tag.rb b/app/models/tag.rb
index f110e677ce..3182d62635 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -16,6 +16,9 @@ class Tag < ActiveRecord::Base
 
   after_save :index_search
 
+  after_commit :trigger_tag_created_event, on: :create
+  after_commit :trigger_tag_destroyed_event, on: :destroy
+
   def self.ensure_consistency!
     update_topic_counts # topic_count counter cache can miscount
   end
@@ -46,11 +49,14 @@ class Tag < ActiveRecord::Base
 
     return [] if scope_category_ids.empty?
 
+    filter_sql = guardian&.is_staff? ? '' : (' AND ' + DiscourseTagging.filter_visible_sql)
+
     tag_names_with_counts = Tag.exec_sql <<~SQL
       SELECT tags.name as tag_name, SUM(stats.topic_count) AS sum_topic_count
         FROM category_tag_stats stats
   INNER JOIN tags ON stats.tag_id = tags.id AND stats.topic_count > 0
        WHERE stats.category_id in (#{scope_category_ids.join(',')})
+       #{filter_sql}
     GROUP BY tags.name
     ORDER BY sum_topic_count DESC, tag_name ASC
        LIMIT #{limit}
@@ -98,6 +104,16 @@ class Tag < ActiveRecord::Base
   def index_search
     SearchIndexer.index(self)
   end
+
+  def trigger_tag_created_event
+    DiscourseEvent.trigger(:tag_created, self)
+    true
+  end
+
+  def trigger_tag_destroyed_event
+    DiscourseEvent.trigger(:tag_destroyed, self)
+    true
+  end
 end
 
 # == Schema Information
diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb
index b1c7088c70..2ed60e0780 100644
--- a/app/models/tag_group.rb
+++ b/app/models/tag_group.rb
@@ -5,9 +5,14 @@ class TagGroup < ActiveRecord::Base
   has_many :tags, through: :tag_group_memberships
   has_many :category_tag_groups, dependent: :destroy
   has_many :categories, through: :category_tag_groups
+  has_many :tag_group_permissions, dependent: :destroy
 
   belongs_to :parent_tag, class_name: 'Tag'
 
+  before_save :apply_permissions
+
+  attr_accessor :permissions
+
   def tag_names=(tag_names_arg)
     DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true)
   end
@@ -22,13 +27,47 @@ class TagGroup < ActiveRecord::Base
     end
   end
 
+  def permissions=(permissions)
+    @permissions = TagGroup.resolve_permissions(permissions)
+  end
+
+  def self.resolve_permissions(permissions)
+    everyone_group_id = Group::AUTO_GROUPS[:everyone]
+    full = TagGroupPermission.permission_types[:full]
+
+    mapped = permissions.map do |group, permission|
+      group_id = Group.group_id_from_param(group)
+      permission = TagGroupPermission.permission_types[permission] unless permission.is_a?(Integer)
+
+      return [] if group_id == everyone_group_id && permission == full
+
+      [group_id, permission]
+    end
+  end
+
+  def apply_permissions
+    if @permissions
+      tag_group_permissions.destroy_all
+      @permissions.each do |group_id, permission_type|
+        tag_group_permissions.build(group_id: group_id, permission_type: permission_type)
+      end
+      @permissions = nil
+    end
+  end
+
+  def visible_only_to_staff
+    # currently only "everyone" and "staff" groups are supported
+    tag_group_permissions.count > 0
+  end
+
   def self.allowed(guardian)
     if guardian.is_staff?
       TagGroup
     else
       category_permissions_filter = <<~SQL
-        id IN ( SELECT tag_group_id FROM category_tag_groups WHERE category_id IN (?))
-        OR id NOT IN (SELECT tag_group_id FROM category_tag_groups)
+        (id IN ( SELECT tag_group_id FROM category_tag_groups WHERE category_id IN (?))
+        OR id NOT IN (SELECT tag_group_id FROM category_tag_groups))
+        AND id NOT IN (SELECT tag_group_id FROM tag_group_permissions)
       SQL
 
       TagGroup.where(category_permissions_filter, guardian.allowed_category_ids)
diff --git a/app/models/tag_group_permission.rb b/app/models/tag_group_permission.rb
new file mode 100644
index 0000000000..bec3573565
--- /dev/null
+++ b/app/models/tag_group_permission.rb
@@ -0,0 +1,26 @@
+# Who can see and use tags belonging to a tag group.
+class TagGroupPermission < ActiveRecord::Base
+  belongs_to :tag_group
+  belongs_to :group
+
+  def self.permission_types
+    @permission_types ||= Enum.new(full: 1) #, see: 2
+  end
+end
+
+# == Schema Information
+#
+# Table name: tag_group_permissions
+#
+#  id              :integer          not null, primary key
+#  tag_group_id    :integer          not null
+#  group_id        :integer          not null
+#  permission_type :integer          default(1), not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+# Indexes
+#
+#  index_tag_group_permissions_on_group_id      (group_id)
+#  index_tag_group_permissions_on_tag_group_id  (tag_group_id)
+#
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 1eeb40831f..36636251fa 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -59,6 +59,14 @@ PLUGIN_API_JS
     doc = Nokogiri::HTML.fragment(html)
     doc.css('script[type="text/x-handlebars"]').each do |node|
       name = node["name"] || node["data-template-name"] || "broken"
+
+      setting_helpers = ''
+      theme.cached_settings.each do |k, v|
+        val = v.is_a?(String) ? "\"#{v.gsub('"', "\\u0022")}\"" : v
+        setting_helpers += "{{theme-setting-injector context=this key=\"#{k}\" value=#{val}}}\n"
+      end
+      hbs_template = setting_helpers + node.inner_html
+
       is_raw = name =~ /\.raw$/
       if is_raw
         template = "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(node.inner_html)})"
@@ -70,7 +78,7 @@ PLUGIN_API_JS
           </script>
 COMPILED
       else
-        template = "Ember.HTMLBars.template(#{Barber::Ember::Precompiler.compile(node.inner_html)})"
+        template = "Ember.HTMLBars.template(#{Barber::Ember::Precompiler.compile(hbs_template)})"
         node.replace <<COMPILED
           <script>
             (function() {
diff --git a/app/models/topic.rb b/app/models/topic.rb
index a9169ad515..abc0f5f270 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -31,7 +31,7 @@ class Topic < ActiveRecord::Base
   def_delegator :notifier, :mute!, :notify_muted!
   def_delegator :notifier, :toggle_mute, :toggle_mute
 
-  attr_accessor :allowed_user_ids, :tags_changed
+  attr_accessor :allowed_user_ids, :tags_changed, :includes_destination_category
 
   DiscourseEvent.on(:site_setting_saved) do |site_setting|
     if site_setting.name.to_s == "slug_generation_method" && site_setting.saved_change_to_value?
@@ -191,6 +191,8 @@ class Topic < ActiveRecord::Base
     where("topics.category_id IS NULL OR topics.category_id IN (SELECT id FROM categories WHERE #{condition[0]})", condition[1])
   }
 
+  scope :with_subtype, ->(subtype) { where('topics.subtype = ?', subtype) }
+
   attr_accessor :ignore_category_auto_close
   attr_accessor :skip_callbacks
 
@@ -1019,11 +1021,16 @@ SQL
     TopicUser.change(user.id, id, cleared_pinned_at: nil)
   end
 
-  def update_pinned(status, global = false, pinned_until = nil)
-    pinned_until = Time.parse(pinned_until) rescue nil
+  def update_pinned(status, global = false, pinned_until = "")
+    pinned_until ||= ''
+
+    pinned_until = begin
+      Time.parse(pinned_until)
+    rescue ArgumentError
+    end
 
     update_columns(
-      pinned_at: status ? Time.now : nil,
+      pinned_at: status ? Time.zone.now : nil,
       pinned_globally: global,
       pinned_until: pinned_until
     )
@@ -1161,19 +1168,31 @@ SQL
   def message_archived?(user)
     return false unless user && user.id
 
-    sql = <<SQL
-SELECT 1 FROM topic_allowed_groups tg
-JOIN group_archived_messages gm
-      ON gm.topic_id = tg.topic_id AND
-         gm.group_id = tg.group_id
-  WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
-    AND tg.topic_id = :topic_id
+    # tricky query but this checks to see if message is archived for ALL groups you belong to
+    # OR if you have it archived as a user explicitly
 
-UNION ALL
+    sql = <<~SQL
+    SELECT 1
+    WHERE
+      (
+      SELECT count(*) FROM topic_allowed_groups tg
+      JOIN group_archived_messages gm
+            ON gm.topic_id = tg.topic_id AND
+               gm.group_id = tg.group_id
+        WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
+          AND tg.topic_id = :topic_id
+      ) =
+      (
+        SELECT case when count(*) = 0 then -1 else count(*) end FROM topic_allowed_groups tg
+        WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
+          AND tg.topic_id = :topic_id
+      )
 
-SELECT 1 FROM topic_allowed_users tu
-JOIN user_archived_messages um ON um.user_id = tu.user_id AND um.topic_id = tu.topic_id
-WHERE tu.user_id = :user_id AND tu.topic_id = :topic_id
+      UNION ALL
+
+      SELECT 1 FROM topic_allowed_users tu
+      JOIN user_archived_messages um ON um.user_id = tu.user_id AND um.topic_id = tu.topic_id
+      WHERE tu.user_id = :user_id AND tu.topic_id = :topic_id
 SQL
 
     User.exec_sql(sql, user_id: user.id, topic_id: id).to_a.length > 0
@@ -1307,6 +1326,10 @@ SQL
     MiniSuffix.domain(URI.parse(URI.encode(self.featured_link)).hostname)
   end
 
+  def self.private_message_topics_count_per_day(start_date, end_date, topic_subtype)
+    private_messages.with_subtype(topic_subtype).where('topics.created_at >= ? AND topics.created_at <= ?', start_date, end_date).group('date(topics.created_at)').order('date(topics.created_at)').count
+  end
+
   private
 
   def update_category_topic_count_by(num)
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index aed196943a..76704a7a8c 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -24,6 +24,7 @@ class TopicConverter
       @topic.archetype = Archetype.default
       @topic.save
       update_user_stats
+      update_category_topic_count_by(1)
 
       # TODO: Every post in a PRIVATE MESSAGE looks the same: each is a UserAction::NEW_PRIVATE_MESSAGE.
       #       So we need to remove all those user actions and re-log all the posts.
@@ -46,6 +47,7 @@ class TopicConverter
 
   def convert_to_private_message
     Topic.transaction do
+      update_category_topic_count_by(-1)
       @topic.category_id = nil
       @topic.archetype = Archetype.private_message
       add_allowed_users
@@ -92,4 +94,10 @@ class TopicConverter
     end
   end
 
+  def update_category_topic_count_by(num)
+    if @topic.category_id.present?
+      Category.where(['id = ?', @topic.category_id]).update_all("topic_count = topic_count " + (num > 0 ? '+' : '') + "#{num}")
+    end
+  end
+
 end
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 45bf194b87..3238f84ea1 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -115,7 +115,14 @@ SQL
 
       PrettyText
         .extract_links(post.cooked)
-        .map { |u| [u, URI.parse(u.url)] rescue nil }
+        .map do |u|
+          uri = begin
+            URI.parse(u.url)
+          rescue URI::InvalidURIError
+          end
+
+          [u, uri]
+        end
         .reject { |_, p| p.nil? || "mailto".freeze == p.scheme }
         .uniq { |_, p| p }
         .each do |link, parsed|
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index 90cddefe2f..ce0f7fcbe1 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -16,7 +16,10 @@ class TopicLinkClick < ActiveRecord::Base
     url = args[:url][0...TopicLink.max_url_length]
     return nil if url.blank?
 
-    uri = URI.parse(url) rescue nil
+    uri = begin
+      URI.parse(url)
+    rescue URI::InvalidURIError
+    end
 
     urls = Set.new
     urls << url
@@ -43,7 +46,11 @@ class TopicLinkClick < ActiveRecord::Base
     # add a cdn link
     if uri
       if Discourse.asset_host.present?
-        cdn_uri = URI.parse(Discourse.asset_host) rescue nil
+        cdn_uri = begin
+          URI.parse(Discourse.asset_host)
+        rescue URI::InvalidURIError
+        end
+
         if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
           is_cdn_link = true
           urls << uri.path[cdn_uri.path.length..-1]
@@ -51,7 +58,11 @@ class TopicLinkClick < ActiveRecord::Base
       end
 
       if SiteSetting.Upload.s3_cdn_url.present?
-        cdn_uri = URI.parse(SiteSetting.Upload.s3_cdn_url) rescue nil
+        cdn_uri = begin
+          URI.parse(SiteSetting.Upload.s3_cdn_url)
+        rescue URI::InvalidURIError
+        end
+
         if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
           is_cdn_link = true
           path = uri.path[cdn_uri.path.length..-1]
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index 6de3eafcbe..5aae90f778 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -26,18 +26,21 @@ class TopicList
     end
   end
 
-  attr_accessor :more_topics_url,
-                :prev_topics_url,
-                :draft,
-                :draft_key,
-                :draft_sequence,
-                :filter,
-                :for_period,
-                :per_page,
-                :top_tags,
-                :current_user,
-                :tags,
-                :shared_drafts
+  attr_accessor(
+    :more_topics_url,
+    :prev_topics_url,
+    :draft,
+    :draft_key,
+    :draft_sequence,
+    :filter,
+    :for_period,
+    :per_page,
+    :top_tags,
+    :current_user,
+    :tags,
+    :shared_drafts,
+    :category
+  )
 
   def initialize(filter, current_user, topics, opts = nil)
     @filter = filter
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 842050d2cf..dc1a9c0bc1 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -82,7 +82,11 @@ class Upload < ActiveRecord::Base
     url = url.sub(SiteSetting.Upload.s3_cdn_url, Discourse.store.absolute_base_url) if SiteSetting.Upload.s3_cdn_url.present?
 
     # always try to get the path
-    uri = URI(url) rescue nil
+    uri = begin
+      URI(url)
+    rescue URI::InvalidURIError
+    end
+
     url = uri.path if uri.try(:scheme)
 
     Upload.find_by(url: url)
@@ -134,13 +138,13 @@ class Upload < ActiveRecord::Base
           DbHelper.remap(previous_url, upload.url)
           # remove the old file (when local)
           unless external
-            FileUtils.rm(path, force: true) rescue nil
+            FileUtils.rm(path, force: true)
           end
         rescue => e
           problems << { upload: upload, ex: e }
         ensure
-          file.try(:unlink) rescue nil
-          file.try(:close) rescue nil
+          file&.unlink
+          file&.close
         end
       end
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index a821e0c572..08beb52ac0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1121,11 +1121,25 @@ class User < ActiveRecord::Base
     self.username_lower = username.downcase
   end
 
+  USERNAME_EXISTS_SQL = <<~SQL
+  (SELECT users.id AS user_id FROM users
+  WHERE users.username_lower = :username)
+
+  UNION ALL
+
+  (SELECT groups.id AS group_id FROM groups
+  WHERE lower(groups.name) = :username)
+  SQL
+
   def username_validator
     username_format_validator || begin
       lower = username.downcase
-      existing = User.find_by(username_lower: lower)
-      if will_save_change_to_username? && existing && existing.id != self.id
+
+      existing = User.exec_sql(
+        USERNAME_EXISTS_SQL, username: lower
+      ).to_a.first
+
+      if will_save_change_to_username? && existing.present? && existing["user_id"] != self.id
         errors.add(:username, I18n.t(:'user.username.unique'))
       end
     end
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index a247bb4752..4774df14f3 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -35,7 +35,7 @@ class UserAvatar < ActiveRecord::Base
           upload = UploadCreator.new(tempfile, 'gravatar.png', origin: gravatar_url, type: "avatar").create_for(user_id)
 
           if gravatar_upload_id != upload.id
-            gravatar_upload.try(:destroy!) rescue nil
+            gravatar_upload&.destroy!
             self.gravatar_upload = upload
             save!
           end
diff --git a/app/models/web_crawler_request.rb b/app/models/web_crawler_request.rb
new file mode 100644
index 0000000000..8f082222d8
--- /dev/null
+++ b/app/models/web_crawler_request.rb
@@ -0,0 +1,90 @@
+class WebCrawlerRequest < ActiveRecord::Base
+  include CachedCounting
+
+  # auto flush if older than this
+  self.autoflush_seconds = 1.hour
+
+  cattr_accessor :max_record_age, :max_records_per_day
+
+  # only keep the top records based on request count
+  self.max_records_per_day = 200
+
+  # delete records older than this
+  self.max_record_age = 30.days
+
+  def self.increment!(user_agent, opts = nil)
+    ua_list_key = user_agent_list_key
+    $redis.sadd(ua_list_key, user_agent)
+    $redis.expire(ua_list_key, 259200) # 3.days
+
+    perform_increment!(redis_key(user_agent), opts)
+  end
+
+  def self.write_cache!(date = nil)
+    if date.nil?
+      write_cache!(Time.now.utc)
+      write_cache!(Time.now.utc.yesterday)
+      return
+    end
+
+    self.last_flush = Time.now.utc
+
+    date = date.to_date
+    ua_list_key = user_agent_list_key(date)
+
+    while user_agent = $redis.spop(ua_list_key)
+      val = get_and_reset(redis_key(user_agent, date))
+
+      next if val == 0
+
+      self.where(id: req_id(date, user_agent)).update_all(["count = count + ?", val])
+    end
+  rescue Redis::CommandError => e
+    raise unless e.message =~ /READONLY/
+    nil
+  end
+
+  def self.clear_cache!(date = nil)
+    if date.nil?
+      clear_cache!(Time.now.utc)
+      clear_cache!(Time.now.utc.yesterday)
+      return
+    end
+
+    ua_list_key = user_agent_list_key(date)
+
+    while user_agent = $redis.spop(ua_list_key)
+      $redis.del redis_key(user_agent, date)
+    end
+
+    $redis.del(ua_list_key)
+  end
+
+  protected
+
+  def self.user_agent_list_key(time = Time.now.utc)
+    "crawl_ua_list:#{time.strftime('%Y%m%d')}"
+  end
+
+  def self.redis_key(user_agent, time = Time.now.utc)
+    "crawl_req:#{time.strftime('%Y%m%d')}:#{user_agent}"
+  end
+
+  def self.req_id(date, user_agent)
+    request_id(date: date, user_agent: user_agent)
+  end
+end
+
+# == Schema Information
+#
+# Table name: web_crawler_requests
+#
+#  id         :integer          not null, primary key
+#  date       :date             not null
+#  user_agent :string           not null
+#  count      :integer          default(0), not null
+#
+# Indexes
+#
+#  index_web_crawler_requests_on_date_and_user_agent  (date,user_agent) UNIQUE
+#
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index d3596bfdaf..7d6d595566 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -2,6 +2,10 @@ class WebHookEventType < ActiveRecord::Base
   TOPIC = 1
   POST = 2
   USER = 3
+  GROUP = 4
+  CATEGORY = 5
+  TAG = 6
+  FLAG = 7
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/app/serializers/admin_plugin_serializer.rb b/app/serializers/admin_plugin_serializer.rb
index 6a00ded374..b104d69adb 100644
--- a/app/serializers/admin_plugin_serializer.rb
+++ b/app/serializers/admin_plugin_serializer.rb
@@ -5,7 +5,8 @@ class AdminPluginSerializer < ApplicationSerializer
              :url,
              :admin_route,
              :enabled,
-             :enabled_setting
+             :enabled_setting,
+             :is_official
 
   def id
     object.metadata.name
@@ -51,4 +52,8 @@ class AdminPluginSerializer < ApplicationSerializer
   def include_admin_route?
     admin_route.present?
   end
+
+  def is_official
+    Plugin::Metadata::OFFICIAL_PLUGINS.include?(object.name)
+  end
 end
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 01a088976e..4149a32cf2 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -24,7 +24,8 @@ class BasicCategorySerializer < ApplicationSerializer
              :num_featured_topics,
              :default_view,
              :subcategory_list_style,
-             :default_top_period
+             :default_top_period,
+             :minimum_required_tags
 
   has_one :uploaded_logo, embed: :object, serializer: CategoryUploadSerializer
   has_one :uploaded_background, embed: :object, serializer: CategoryUploadSerializer
diff --git a/app/serializers/concerns/topic_tags_mixin.rb b/app/serializers/concerns/topic_tags_mixin.rb
index 6ad88b47ea..c2dc1254d2 100644
--- a/app/serializers/concerns/topic_tags_mixin.rb
+++ b/app/serializers/concerns/topic_tags_mixin.rb
@@ -9,7 +9,7 @@ module TopicTagsMixin
 
   def tags
     # Calling method `pluck` along with `includes` causing N+1 queries
-    topic.tags.map(&:name)
+    DiscourseTagging.filter_visible(topic.tags, scope).map(&:name)
   end
 
   def topic
diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb
index b86fda2379..0e0348cb39 100644
--- a/app/serializers/post_revision_serializer.rb
+++ b/app/serializers/post_revision_serializer.rb
@@ -160,7 +160,11 @@ class PostRevisionSerializer < ApplicationSerializer
   end
 
   def tags_changes
-    { previous: previous["tags"], current: current["tags"] }
+    changes = {
+      previous: filter_visible_tags(previous["tags"]),
+      current: filter_visible_tags(current["tags"])
+    }
+    changes[:previous] == changes[:current] ? nil : changes
   end
 
   def include_tags_changes?
@@ -250,4 +254,9 @@ class PostRevisionSerializer < ApplicationSerializer
       object.user || Discourse.system_user
     end
 
+    def filter_visible_tags(tags)
+      @hidden_tag_names ||= DiscourseTagging.hidden_tag_names(scope)
+      tags.is_a?(Array) ? (tags - @hidden_tag_names) : tags
+    end
+
 end
diff --git a/app/serializers/tag_group_serializer.rb b/app/serializers/tag_group_serializer.rb
index 62858aff20..e0a4734f24 100644
--- a/app/serializers/tag_group_serializer.rb
+++ b/app/serializers/tag_group_serializer.rb
@@ -1,5 +1,5 @@
 class TagGroupSerializer < ApplicationSerializer
-  attributes :id, :name, :tag_names, :parent_tag_name, :one_per_topic
+  attributes :id, :name, :tag_names, :parent_tag_name, :one_per_topic, :visible_only_to_staff
 
   def tag_names
     object.tags.map(&:name).sort
diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb
index 663cc2c9a2..1f77b45d75 100644
--- a/app/serializers/topic_list_item_serializer.rb
+++ b/app/serializers/topic_list_item_serializer.rb
@@ -30,8 +30,9 @@ class TopicListItemSerializer < ListableTopicSerializer
   end
 
   def category_id
+
     # If it's a shared draft, show the destination topic instead
-    if object.category_id == SiteSetting.shared_drafts_category.to_i && object.shared_draft
+    if object.includes_destination_category && object.shared_draft
       return object.shared_draft.category_id
     end
 
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 1e45721b68..06e620e25b 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -188,7 +188,11 @@ class UserSerializer < BasicUserSerializer
   end
 
   def website_name
-    uri = URI(website.to_s) rescue nil
+    uri = begin
+      URI(website.to_s)
+    rescue URI::InvalidURIError
+    end
+
     return if uri.nil? || uri.host.nil?
     uri.host.sub(/^www\./, '') + uri.path
   end
diff --git a/app/serializers/web_hook_category_serializer.rb b/app/serializers/web_hook_category_serializer.rb
new file mode 100644
index 0000000000..57b979e0ce
--- /dev/null
+++ b/app/serializers/web_hook_category_serializer.rb
@@ -0,0 +1,13 @@
+class WebHookCategorySerializer < CategorySerializer
+
+  %i{
+    can_edit
+    notification_level
+    available_groups
+  }.each do |attr|
+    define_method("include_#{attr}?") do
+      false
+    end
+  end
+
+end
diff --git a/app/serializers/web_hook_flag_serializer.rb b/app/serializers/web_hook_flag_serializer.rb
new file mode 100644
index 0000000000..67674fef8e
--- /dev/null
+++ b/app/serializers/web_hook_flag_serializer.rb
@@ -0,0 +1,43 @@
+class WebHookFlagSerializer < ApplicationSerializer
+  attributes :id,
+             :post,
+             :flag_type,
+             :created_by,
+             :created_at,
+             :resolved_at,
+             :resolved_by
+
+  def post
+    BasicPostSerializer.new(object.post, scope: scope, root: false).as_json
+  end
+
+  def flag_type
+    object.post_action_type_key
+  end
+
+  def include_post?
+    object.post.present?
+  end
+
+  def created_by
+    object.user && object.user.username
+  end
+
+  def resolved_at
+    object.disposed_at
+  end
+
+  def include_resolved_at?
+    object.disposed_at.present?
+  end
+
+  def resolved_by
+    if object.disposed_by_id.present?
+      User.find(object.disposed_by_id).username
+    end
+  end
+
+  def include_resolved_by?
+    object.disposed_by_id.present?
+  end
+end
diff --git a/app/serializers/web_hook_group_serializer.rb b/app/serializers/web_hook_group_serializer.rb
new file mode 100644
index 0000000000..c580451db8
--- /dev/null
+++ b/app/serializers/web_hook_group_serializer.rb
@@ -0,0 +1,12 @@
+class WebHookGroupSerializer < GroupShowSerializer
+
+  %i{
+    is_group_user
+    is_group_owner
+  }.each do |attr|
+    define_method("include_#{attr}?") do
+      false
+    end
+  end
+
+end
diff --git a/app/serializers/web_hook_topic_view_serializer.rb b/app/serializers/web_hook_topic_view_serializer.rb
index 2beca4f3ee..8c1aa0a3a7 100644
--- a/app/serializers/web_hook_topic_view_serializer.rb
+++ b/app/serializers/web_hook_topic_view_serializer.rb
@@ -10,6 +10,7 @@ class WebHookTopicViewSerializer < TopicViewSerializer
     draft_key
     draft_sequence
     message_bus_last_id
+    suggested_topics
   }.each do |attr|
     define_method("include_#{attr}?") do
       false
diff --git a/app/services/destroy_task.rb b/app/services/destroy_task.rb
new file mode 100644
index 0000000000..86768a79f7
--- /dev/null
+++ b/app/services/destroy_task.rb
@@ -0,0 +1,90 @@
+## Because these methods are meant to be called from a rake task
+#   we are capturing all log output into a log array to return
+#   to the rake task rather than using `puts` statements.
+class DestroyTask
+  def self.destroy_topics(category)
+    c = Category.find_by_slug(category)
+    log = []
+    return "A category with the slug: #{category} could not be found" if c.nil?
+    topics = Topic.where(category_id: c.id, pinned_at: nil).where.not(user_id: -1)
+    log << "There are #{topics.count} topics to delete in #{category} category"
+    topics.each do |topic|
+      log << "Deleting #{topic.slug}..."
+      first_post = topic.ordered_posts.first
+      if first_post.nil?
+        return log << "Topic.ordered_posts.first was nil"
+      end
+      system_user = User.find(-1)
+      log << PostDestroyer.new(system_user, first_post).destroy
+    end
+    log
+  end
+
+  def self.destroy_topics_all_categories
+    categories = Category.all
+    log = []
+    categories.each do |c|
+      log << destroy_topics(c.slug)
+    end
+    log
+  end
+
+  def self.destroy_private_messages
+    pms = Topic.where(archetype: "private_message")
+    current_user = User.find(-1) #system
+    log = []
+    pms.each do |pm|
+      log << "Destroying #{pm.slug} pm"
+      first_post = pm.ordered_posts.first
+      log << PostDestroyer.new(current_user, first_post).destroy
+    end
+    log
+  end
+
+  def self.destroy_groups
+    groups = Group.where(automatic: false)
+    log = []
+    groups.each do |group|
+      log << "destroying group: #{group.id}"
+      log << group.destroy
+    end
+    log
+  end
+
+  def self.destroy_users
+    log = []
+    users = User.where(admin: false, id: 1..Float::INFINITY)
+    log << "There are #{users.count} users to delete"
+    options = {}
+    options[:delete_posts] = true
+    current_user = User.find(-1) #system
+    users.each do |user|
+      begin
+        if UserDestroyer.new(current_user).destroy(user, options)
+          log << "#{user.username} deleted"
+        else
+          log << "#{user.username} not deleted"
+        end
+      rescue UserDestroyer::PostsExistError
+        raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.")
+      rescue NoMethodError
+        log << "#{user.username} could not be deleted"
+      end
+    end
+    log
+  end
+
+  def self.destroy_stats
+    ApplicationRequest.destroy_all
+    IncomingLink.destroy_all
+    UserVisit.destroy_all
+    UserProfileView.destroy_all
+    user_profiles = UserProfile.all
+    user_profiles.each do |user_profile|
+      user_profile.views = 0
+      user_profile.save!
+    end
+    PostAction.unscoped.destroy_all
+    EmailLog.destroy_all
+  end
+end
diff --git a/app/services/handle_chunk_upload.rb b/app/services/handle_chunk_upload.rb
index de5bf7837d..75362e54e5 100644
--- a/app/services/handle_chunk_upload.rb
+++ b/app/services/handle_chunk_upload.rb
@@ -42,8 +42,11 @@ class HandleChunkUpload
     tmp_directory   = @params[:tmp_directory]
 
     # delete destination files
-    File.delete(upload_path) rescue nil
-    File.delete(tmp_upload_path) rescue nil
+    begin
+      File.delete(upload_path)
+      File.delete(tmp_upload_path)
+    rescue Errno::ENOENT
+    end
 
     # merge all the chunks
     File.open(tmp_upload_path, "a") do |file|
@@ -59,7 +62,10 @@ class HandleChunkUpload
     FileUtils.mv(tmp_upload_path, upload_path, force: true)
 
     # remove tmp directory
-    FileUtils.rm_rf(tmp_directory) rescue nil
+    begin
+      FileUtils.rm_rf(tmp_directory)
+    rescue Errno::ENOENT
+    end
   end
 
 end
diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index f5e5a7f2a4..b9d1997996 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -109,4 +109,17 @@ class PostActionNotifier
     )
   end
 
+  def self.after_post_unhide(post, flaggers)
+    return if @disabled || post.last_editor.blank? || flaggers.blank?
+
+    flaggers.each do |flagger|
+      alerter.create_notification(
+        flagger,
+        Notification.types[:edited],
+        post,
+        display_username: post.last_editor.username,
+        acting_user_id: post.last_editor.id
+      )
+    end
+  end
 end
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 640382b217..44973d7adf 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -38,6 +38,10 @@ class PostAlerter
     allowed_group_users(post)
   end
 
+  def only_allowed_users(users, post)
+    users.select { |u| allowed_users(post).include?(u) || allowed_group_users(post).include?(u) }
+  end
+
   def notify_about_reply?(post)
     post.post_type == Post.types[:regular] || post.post_type == Post.types[:whisper]
   end
@@ -50,17 +54,20 @@ class PostAlerter
 
     if mentioned_groups || mentioned_users
       mentioned_opts = {}
+      editor = post.last_editor
+
       if post.last_editor_id != post.user_id
         # Mention comes from an edit by someone else, so notification should say who added the mention.
-        editor = post.last_editor
         mentioned_opts = { user_id: editor.id, original_username: editor.username, display_username: editor.username }
       end
 
       expand_group_mentions(mentioned_groups, post) do |group, users|
+        users = only_allowed_users(users, post) if editor.id < 0
         notified += notify_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group))
       end
 
       if mentioned_users
+        mentioned_users = only_allowed_users(mentioned_users, post) if editor.id < 0
         notified += notify_users(mentioned_users - notified, :mentioned, post, mentioned_opts)
       end
     end
@@ -405,8 +412,7 @@ class PostAlerter
     )
 
     if created.id && !existing_notification && NOTIFIABLE_TYPES.include?(type) && !user.suspended?
-      # we may have an invalid post somehow, dont blow up
-      post_url = original_post.url rescue nil
+      post_url = original_post.url
       if post_url
         payload = {
          notification_type: type,
diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb
index a9fff88dd0..dcd56e42fc 100644
--- a/app/services/user_silencer.rb
+++ b/app/services/user_silencer.rb
@@ -45,6 +45,7 @@ class UserSilencer
         DiscourseEvent.trigger(
           :user_silenced,
           user: @user,
+          silenced_by: @by_user,
           reason: @opts[:reason],
           message: @opts[:message_body],
           user_history: @user_history,
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 305f96fddc..d2e92f6308 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -73,7 +73,9 @@ class UserUpdater
     end
 
     TAG_NAMES.each do |attribute, level|
-      TagUser.batch_set(user, level, attributes[attribute])
+      if attributes.has_key?(attribute)
+        TagUser.batch_set(user, level, attributes[attribute]&.split(',') || [])
+      end
     end
 
     save_options = false
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index dac6b19fbe..e2f7e2cd21 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -45,7 +45,7 @@
     Discourse.ThemeSettings = ps.get('themeSettings');
     Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>';
     Discourse.MarkdownItURL = '<%= asset_url('markdown-it-bundle.js') %>';
-    Discourse.ServiceWorkerURL = '<%= Rails.application.assets_manifest.assets['service-worker.js'] %>'
+    Discourse.ServiceWorkerURL = Discourse.Environment != "development" ? '<%= Rails.application.assets_manifest.assets['service-worker.js'] %>' : 'service-worker.js';
     I18n.defaultLocale = '<%= SiteSetting.default_locale %>';
     Discourse.start();
     Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
diff --git a/app/views/common/_google_tag_manager_body.html.erb b/app/views/common/_google_tag_manager_body.html.erb
new file mode 100644
index 0000000000..6c98df8117
--- /dev/null
+++ b/app/views/common/_google_tag_manager_body.html.erb
@@ -0,0 +1,4 @@
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= SiteSetting.gtm_container_id %>"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
diff --git a/app/views/common/_google_tag_manager.html.erb b/app/views/common/_google_tag_manager_head.html.erb
similarity index 58%
rename from app/views/common/_google_tag_manager.html.erb
rename to app/views/common/_google_tag_manager_head.html.erb
index dca75352a0..2320f2c7b0 100644
--- a/app/views/common/_google_tag_manager.html.erb
+++ b/app/views/common/_google_tag_manager_head.html.erb
@@ -2,10 +2,10 @@
 dataLayer = [<%= google_tag_manager_json %>];
 </script>
 
-<noscript><iframe src="//www.googletagmanager.com/ns.html?id=<%= SiteSetting.gtm_container_id %>"
-height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- Google Tag Manager -->
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
 })(window,document,'script','dataLayer','<%= SiteSetting.gtm_container_id %>');</script>
+<!-- End Google Tag Manager -->
diff --git a/app/views/embed/comments.html.erb b/app/views/embed/comments.html.erb
index 23f69584fe..b6863c21aa 100644
--- a/app/views/embed/comments.html.erb
+++ b/app/views/embed/comments.html.erb
@@ -27,7 +27,7 @@
         </h3>
         <%= get_html(post.cooked) %>
 
-        <%- if post.reply_count > 0 %>
+        <%- if post.reply_count > 0 && post.replies.exists? %>
           <%- if post.reply_count == 1 %>
             <%= link_to I18n.t('embed.replies', count: post.reply_count), post.full_url, 'data-link-to-post' => post.replies.first.id.to_s, :class => 'post-replies button' %>
           <% else %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 361466c354..58fff0c1a1 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -44,6 +44,7 @@
       <%= raw theme_lookup("head_tag") %>
     <%- end %>
 
+    <%= render_google_tag_manager_head_code %>
     <%= render_google_universal_analytics_code %>
     <link rel="manifest" href="<%= Discourse.base_uri %>/manifest.json">
 
@@ -60,8 +61,7 @@
   </head>
 
   <body class="<%= body_classes %>">
-    <%= render_google_tag_manager_code %>
-
+    <%= render_google_tag_manager_body_code %>
     <noscript data-path="<%= request.env['PATH_INFO'] %>">
       <%= render partial: 'header' %>
       <div id="main-outlet" class="wrap">
diff --git a/app/views/robots_txt/index.erb b/app/views/robots_txt/index.erb
index abb3cf51fe..2d35051cf3 100644
--- a/app/views/robots_txt/index.erb
+++ b/app/views/robots_txt/index.erb
@@ -1,32 +1,26 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+<% if Discourse.base_uri.present? %>
+# This robots.txt file is not used. Please append the content below in the robots.txt file located at the root
+<% end %>
 #
-User-agent: *
-Disallow: /auth/cas
-Disallow: /auth/facebook/callback
-Disallow: /auth/twitter/callback
-Disallow: /auth/google/callback
-Disallow: /auth/yahoo/callback
-Disallow: /auth/github/callback
-Disallow: /auth/cas/callback
-Disallow: /assets/browser-update*.js
-Disallow: /users/
-Disallow: /u/
-Disallow: /badges/
-Disallow: /search
-Disallow: /search/
-Disallow: /tags
-Disallow: /tags/
-Disallow: /email/
-Disallow: /session
-Disallow: /session/
-Disallow: /admin
-Disallow: /admin/
-Disallow: /user-api-key
-Disallow: /user-api-key/
-Disallow: /*?api_key*
-Disallow: /*?*api_key*
-Disallow: /groups
-Disallow: /groups/
-Disallow: /uploads/
+<% @allowed_user_agents.each do |user_agent| %>
+User-agent: <%= user_agent %>
+<% end %>
+<% RobotsTxtController::DISALLOWED_PATHS.each do |path| %>
+Disallow: <%= Discourse.base_uri + path %>
+<% end %>
+
+<% if @disallowed_user_agents %>
+  <% @disallowed_user_agents.each do |user_agent| %>
+User-agent: <%= user_agent %>
+Disallow: <%= Discourse.base_uri + "/" %>
+
+  <% end %>
+<% end %>
 
 <%= server_plugin_outlet "robots_txt_index" %>
+
+<% @crawler_delayed_agents.each do |agent, delay| %>
+User-agent: <%= agent %>
+Crawl-delay: <%= delay %>
+<% end %>
diff --git a/app/views/robots_txt/no_index.erb b/app/views/robots_txt/no_index.erb
index 09e665facd..7697afcf26 100644
--- a/app/views/robots_txt/no_index.erb
+++ b/app/views/robots_txt/no_index.erb
@@ -1,4 +1,4 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
 User-agent: *
-Disallow: /
+Disallow: <%= Discourse.base_uri + "/" %>
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 7e29c2d301..17ab7ad0dd 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -42,3 +42,44 @@ end
     WebHook.enqueue_hooks(:user, user_id: user.id, event_name: event.to_s)
   end
 end
+
+%i(
+  group_created
+  group_updated
+  group_destroyed
+).each do |event|
+  DiscourseEvent.on(event) do |group|
+    WebHook.enqueue_hooks(:group, group_id: group.id, event_name: event.to_s)
+  end
+end
+
+%i(
+  category_created
+  category_updated
+  category_destroyed
+).each do |event|
+  DiscourseEvent.on(event) do |category|
+    WebHook.enqueue_hooks(:category, category_id: category.id, event_name: event.to_s)
+  end
+end
+
+%i(
+  tag_created
+  tag_updated
+  tag_destroyed
+).each do |event|
+  DiscourseEvent.on(event) do |tag|
+    WebHook.enqueue_hooks(:tag, tag_id: tag.id, event_name: event.to_s)
+  end
+end
+
+%i(
+  flag_created
+  flag_agreed
+  flag_disagreed
+  flag_deferred
+).each do |event|
+  DiscourseEvent.on(event) do |flag|
+    WebHook.enqueue_hooks(:flag, flag_id: flag.id, event_name: event.to_s)
+  end
+end
diff --git a/config/initializers/100-lograge.rb b/config/initializers/100-lograge.rb
index 6ab44c6abe..7b4b5e4e46 100644
--- a/config/initializers/100-lograge.rb
+++ b/config/initializers/100-lograge.rb
@@ -34,6 +34,8 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
         {
           ip: ip,
           username: username,
+          hostname: `hostname`,
+          pid: Process.pid
         }
       rescue => e
         Rails.logger.warn("Failed to append custom payload: #{e.message}\n#{e.backtrace.join("\n")}")
@@ -94,6 +96,11 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
       config.lograge.logger = DiscourseLogstashLogger.logger(
         uri: ENV['LOGSTASH_URI'], type: :rails
       )
+
+      # Remove ActiveSupport::Logger from the chain and replace with Lograge's
+      # logger
+      Rails.logger.instance_variable_get(:@chained).pop
+      Rails.logger.chain(config.lograge.logger)
     end
   end
 end
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 8ae149fefa..7b85e77e8b 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -184,7 +184,7 @@ ar:
       email: 'شارك هذا الرابط علي بريد إلكتروني'
     action_codes:
       public_topic: "أجعل هذا الموضوع عامًّا %{when}"
-      private_topic: "تحويل هذا الموضوعة إلى رسالة شخصية %{when}"
+      private_topic: "تحويل هذا الموضوع إلى رسالة شخصية %{when}"
       split_topic: "قسَم هذا الموضوع %{when}"
       invited_user: "دُعي %{who} %{when}"
       invited_group: "دُعي %{who} %{when}"
@@ -420,22 +420,6 @@ ar:
         make_user_group_owner: "تعيين كمالك"
         remove_user_as_group_owner: "سحب صلاحية المالك"
     groups:
-      logs:
-        title: "السجلات"
-        when: "حين"
-        action: "إجراء"
-        acting_user: "العضو المسؤول"
-        target_user: "العضو المستهدف"
-        subject: "الموضوع"
-        details: "التفاصيل"
-        from: "من"
-        to: "إلى"
-      edit:
-        title: 'تعديل المجموعة'
-        full_name: 'الإسم الكامل'
-        add_members: "إضافة أعضاء"
-        delete_member_confirm: "إزالة '%{username}' من المجموعة '%{group}'؟"
-      name_placeholder: "اسم المجموعة، بدون مسافات. يتبع قواعد اسم المستخدم"
       public_admission: "السماح للاعضاء بالانضمام إلى المجموعة بحرية (يتطلب أن تكون المجموعة مرئية للجميع )"
       public_exit: "السماح للأعضاء بمغادرة المجموعة بحرية"
       empty:
@@ -446,12 +430,7 @@ ar:
         topics: "لا موضوعات من أعضاء هذه المجموعة."
         logs: "لا سجلّات لهذه المجموعة."
       add: "أضف"
-      join: "انضم للمجموعة"
-      leave: "غادر المجموعة"
-      request: "اطلب الانضمام للمجموعة"
       message: "رسالة"
-      automatic_group: مجموعة تلقائية
-      is_group_user: "أنت عضو في هذه المجموعة"
       allow_membership_requests: "السماح للأعضاء بأرسال طلب انضمام لمدراء المجموعة"
       membership_request_template: "لوحة مخصص تظهر للأعضاء عندما يرسلون طلب عضوية"
       membership_request:
@@ -479,12 +458,6 @@ ar:
       mentions: "الإشارات"
       messages: "الرسائل"
       notification_level: "المستوى الأفتراضي لإشعارات رسائل المجموعة"
-      visibility_levels:
-        title: "من يستطيع رؤية هذه المجموعة؟"
-        public: "الكل"
-        members: "مالكي المجموعة و الأعضاء و المديرين"
-        staff: "مالكي المجموعة و طاقم العمل"
-        owners: "مالكي المجموعة و المديرين"
       alias_levels:
         mentionable: "من يستطيع @الاشارة الى هذه المجموعة؟"
         messageable: "من يستطيع ارسال رسالة الى هذه المجموعة؟"
@@ -493,9 +466,6 @@ ar:
         mods_and_admins: "المدراء والمشرفون فقط"
         members_mods_and_admins: "أعضاء المجموعة والمدراء والمشرفون فقط"
         everyone: "الكل"
-      trust_levels:
-        title: "مستوى الثقة الذي يُعطى للأعضاء آليا عندما يضافون:"
-        none: "لا شيء"
       notifications:
         watching:
           title: "مُراقب"
@@ -520,7 +490,6 @@ ar:
       flair_color_placeholder: "(إختياري) اللون بترميز Hexadecimal"
       flair_preview_icon: "معاينة الأيقونة"
       flair_preview_image: "معاينة الصورة"
-      flair_note: "ملحوظة: الصورة المميزة سوف تظهر فقط لمجموعة العضو الرئيسية."
     user_action_groups:
       '1': "الإعجابات المعطاة"
       '2': "الإعجابات المتلقاة"
@@ -1301,20 +1270,6 @@ ar:
         few: "{{count}} رسالة في صندوق رسائل {{group_name}} "
         many: "{{count}} رسالة في صندوق رسائل {{group_name}} "
         other: "{{count}} رسالة في صندوق رسائل {{group_name}} "
-      alt:
-        mentioned: "أُشير إليك من"
-        quoted: "أُقتبس كلامك من"
-        replied: "مجاب"
-        posted: "منشور من"
-        edited: "تم تعديل منشورك من"
-        liked: "أُعجب بمنشورك"
-        invited_to_topic: "تمت دعوتك لموضوع من "
-        invitee_accepted: "قبلت دعوتك من"
-        moved_post: "منشورك نقل بواسطة"
-        linked: "وضع رابطا لمنشورك"
-        granted_badge: "تم منح الوسام"
-        group_message_summary: "رسائل صندوق المجموعة"
-        topic_reminder: "تذكير"
       popup:
         mentioned: 'أشار {{username}} إليك في "{{topic}}" - {{site_title}}'
         group_mentioned: 'أشار {{username}} إليك في "{{topic}}" - {{site_title}}'
@@ -1569,6 +1524,7 @@ ar:
         next_week: "الاسبوع القادم"
         next_month: "الشهر القادم"
         one_year: "سنة واحدة"
+        forever: "للأبد"
         pick_date_and_time: "اختر التاريخ والوقت"
         set_based_on_last_post: "اغلقة بناء علي اخر منشور"
       publish_to_category:
@@ -2752,12 +2708,20 @@ ar:
           notify_user: "مخصص"
           notify_moderators: "مخصص"
       groups:
+        new:
+          name:
+            available: "اسم المجموعة متاح"
+            not_available: "اسم المجموعة غير متاح"
+            blank: "يجب تحديد اسم للمجموعة"
+        bulk_add:
+          title: "أضافة متعددة للمجموعة"
+          complete_users_not_added: "هؤلاء الأعضاء لن يتم اضافتهم (تأكد من أن لديهم حسابات)"
+        name_placeholder: "اسم المجموعة، بدون مسافات، كما هو الحال مع أسماء المستخدمين"
         primary: "المجموعة الأساسية"
         no_primary: "(لا يوجد مجموعة أساسية)"
         title: "مجموعات"
         edit: "تعديل المجموعة"
         refresh: "تحديث"
-        new: "جديد"
         about: "عدل عضوية المجموعة وأسماءها هنا"
         group_members: "أعضاء المجموعة"
         delete: "احذف"
@@ -2765,22 +2729,11 @@ ar:
         delete_failed: "تعذّر حذف المجموعة. إن كانت مجموعة آليّة، فلا يمكن تدميرها."
         delete_owner_confirm: "هل تريد إزالة صلاحيات الإدارة من '%{username} ؟"
         add: "اضافة"
-        add_members: "اضافة اعضاء"
         custom: "مخصص"
-        bulk_complete: "تمت إضافة الاعضاء إلى المجموعة."
-        bulk_complete_users_not_added: "هؤلاء الاعضاء لم يتم اضافتهم (تأكد انهم يملكون حساب)"
-        bulk: "إضافة متعددة إلى المجموعة"
-        bulk_paste: "الصق قائمة بأسماء الاعضاء أو عناوين البريد الإلكتروني، واحد لكل سطر:"
-        bulk_select: "(اختر مجموعة)"
         automatic: "تلقائي"
-        automatic_membership_email_domains: "المستخدمين الذين يمتلكون بريد الالكتروني عنوانه مطابق للعنوان الذي في القائمة سيتم تلقائيا اضافتهم للمجموعة."
-        automatic_membership_retroactive: "تطبيق نفس قاعدة عنوان البريد الإلكتروني لإضافة الاعضاء المسجلين الحاليين"
         default_title: "العنوان الافتراضي لكل أعضاء هذه المجموعة"
-        primary_group: "تعيين تلقائيا كمجموعة أساسية"
         group_owners: الملّاك
         add_owners: اضف ملّاكً
-        incoming_email: "تعيين بريد إلكتروني خاص:"
-        incoming_email_placeholder: "يرجى إدخال بريد الكتروني فعّال."
         none_selected: "اختر مجموعة للبدء"
         no_custom_groups: "انشئ مجموعة جديدة مخصصة"
       api:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index d29c809f7c..33be675e9d 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -318,22 +318,6 @@ bs_BA:
         make_user_group_owner: "Napravi vlasnika"
         remove_user_as_group_owner: "Ukloni vlasnika"
     groups:
-      logs:
-        title: "Logovi"
-        when: "Kad"
-        action: "Akcija"
-        acting_user: "Trenutni korisnik"
-        target_user: "Ciljani korisnik"
-        subject: "Subjekt"
-        details: "Detalji"
-        from: "Od"
-        to: "Za"
-      edit:
-        title: 'Preimenuj Grupu'
-        full_name: 'Puno ime'
-        add_members: "Dodaj Članove"
-        delete_member_confirm: "Ukloni '%{username}' iz '%{group}' grupe?"
-      name_placeholder: "Ime grupe, bez razmaka, ista pravila kao za korisničko ime"
       empty:
         posts: "Ne postoje postovi člana ove grupe."
         members: "Nema članova u grupi."
@@ -342,11 +326,6 @@ bs_BA:
         topics: "Nema novih tema od strane članova ove grupe."
         logs: "Nema novih logova za ovu grupu."
       add: "Dodaj"
-      join: "Pridruži se grupi"
-      leave: "Napusti grupu"
-      request: "Zahtjevaj pristup grupi"
-      automatic_group: Automatska grupa
-      is_group_user: "Vi ste član ove grupe"
       membership: "Članstvo"
       name: "Ime"
       bio: "O grupi"
@@ -365,9 +344,6 @@ bs_BA:
         mods_and_admins: "Samo moderatori i Admini"
         members_mods_and_admins: "Samo članovi grupe, moderatori i admini"
         everyone: "Svatko"
-      trust_levels:
-        title: "Razina povjerenja je automatski dodijeljena članovima kada su postavljeni: "
-        none: "Ništa"
       notifications:
         watching:
           title: "Posmatram"
@@ -392,7 +368,6 @@ bs_BA:
       flair_color_placeholder: "(Opciono) Hex broj boje"
       flair_preview_icon: "Preview ikona"
       flair_preview_image: "Preview slika"
-      flair_note: "Obavještenje: Sposobnosti će biti prikazane samo za korisnike primarne grupe."
     user_action_groups:
       '1': "Dati Lajkovi"
       '2': "Dobijeni Lajkovi"
@@ -996,19 +971,6 @@ bs_BA:
       empty: "Nema obavještenja."
       more: "pogledaj starija obaviještenja"
       total_flagged: "ukupno opomenutih postova"
-      alt:
-        mentioned: "Spomenut od"
-        quoted: "Citiran od"
-        replied: "Odgovoreno"
-        posted: "Post od"
-        edited: "Editujte vaš post"
-        liked: "Vole vaš post"
-        invited_to_topic: "Pozvani na temu od"
-        invitee_accepted: "Pozivnica prihvaćena od"
-        moved_post: "Vaša objava je premještena od strane "
-        linked: "Link ka vašoj objavi"
-        granted_badge: "Bedž odobren"
-        group_message_summary: "Poruke u grupnom sandučetu"
       popup:
         mentioned: '{{username}} vas je spomenuo/la u "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} vas je spomenuo/la u "{{topic}}" - {{site_title}}'
@@ -1684,7 +1646,6 @@ bs_BA:
         title: "Groups"
         edit: "Edit Groups"
         refresh: "Refresh"
-        new: "New"
         about: "Edit your group membership and names here"
         group_members: "Group members"
         delete: "Delete"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index b706ad4cd7..0148794a43 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -332,22 +332,6 @@ ca:
         make_user_group_owner: "Crea persona propietària"
         remove_user_as_group_owner: "Elimina persona propietària"
     groups:
-      logs:
-        title: "Registres"
-        when: "Quan"
-        action: "Acció"
-        acting_user: "Persona usuària activa"
-        target_user: "Persona usuària destinatària"
-        subject: "Tema"
-        details: "Detalls"
-        from: "De"
-        to: "A"
-      edit:
-        title: 'Edita grup'
-        full_name: 'Nom complet'
-        add_members: "Afegeix membres"
-        delete_member_confirm: "Elimina '%{username}' del '%{group}' grup?"
-      name_placeholder: "Nom del grup, sense espais, igual que la regla del nom de la identitat"
       empty:
         posts: "No hi ha publicacions de membres d'aquest grup."
         members: "No hi ha membres a aquest grup."
@@ -356,12 +340,7 @@ ca:
         topics: "No hi ha temes de membres d'aquest grup."
         logs: "No hi ha registres per a aquest grup."
       add: "Afegegix"
-      join: "Uneix-te al grup"
-      leave: "Abandona el grup"
-      request: "Demana afegir-te al grup"
       message: "Missatge"
-      automatic_group: Grup Automàtic
-      is_group_user: "Ets membre d'aquest grup"
       membership: "Afiliació"
       name: "Nom"
       bio: "Sobre el Grup"
@@ -377,18 +356,12 @@ ca:
       posts: "Publicacions"
       mentions: "Mencions"
       messages: "Missatges"
-      visibility_levels:
-        title: "Qui pot veure aquest grup?"
-        public: "Tothom"
       alias_levels:
         nobody: "Ningú"
         only_admins: "Només persones administradores"
         mods_and_admins: "Només persones moderadores o administradores"
         members_mods_and_admins: "Només mebres de grups, persones moderadores i administradores"
         everyone: "Tothom"
-      trust_levels:
-        title: "El nivell de confiança atorgat automàticament a membres quan s'afegeixen:"
-        none: "Cap"
       notifications:
         watching:
           title: "Mirant"
@@ -413,7 +386,6 @@ ca:
       flair_color_placeholder: "(Opcional) Valor de color Hex"
       flair_preview_icon: "Vista prèvia d'icona"
       flair_preview_image: "Vista prèvia d'imatge"
-      flair_note: "Nota: l'adornament només es mostrarà per a un grup primari de persones usuàries."
     user_action_groups:
       '1': "Donats"
       '2': "Rebuts"
@@ -1088,19 +1060,6 @@ ca:
       total_flagged: "total publicacions amb bandera"
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
-      alt:
-        mentioned: "Mencionat per"
-        quoted: "Citat per"
-        replied: "Respost"
-        posted: "Publicat per"
-        edited: "Edita la teva publicació per"
-        liked: "Els ha agradat la teva entrada"
-        invited_to_topic: "Ha convidat a un tema de"
-        invitee_accepted: "Invitació acceptada per"
-        moved_post: "La teva publicació ha estat moguda per"
-        linked: "Enllaç a la teva publicació"
-        granted_badge: "Distintiu atorgat"
-        group_message_summary: "Missatges a la bústia d'entrada del grup"
       popup:
         mentioned: '{{username}} t''ha mencionat a "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} t''ha mencionat a "{{topic}}" - {{site_title}}'
@@ -2205,7 +2164,6 @@ ca:
         title: "Grups"
         edit: "Edita grups"
         refresh: "Actualitza"
-        new: "Nou"
         about: "Edita aquí la teva pertinença de grup i noms"
         group_members: "Membres de grup"
         delete: "Esborra"
@@ -2213,21 +2171,11 @@ ca:
         delete_failed: "Impossible esborrar aquest grup. Si és un grup automàtic, no pot ser destruït."
         delete_owner_confirm: "Esborra privilegis propietaris per a '%{username}'?"
         add: "Afegegix"
-        add_members: "Afegeix membres"
         custom: "Personalitza"
-        bulk_complete: "Les persones usuàries s'han afegit al grup."
-        bulk: "Afegeix a grup massivament"
-        bulk_paste: "Enganxa una llista de persones o correus, un per línia:"
-        bulk_select: "(tria un grup)"
         automatic: "Automàtic"
-        automatic_membership_email_domains: "Les persones registrades amb un domini de correu que coincideix amb un de la llista s'afegiran automàticament a aquest grup:"
-        automatic_membership_retroactive: "Aplica la mateixa regla de domini de correu per afegir persones registrades existents"
         default_title: "Títol per defecte per a totes les persones a aquest grup"
-        primary_group: "Estableix automàticament com a grup primari"
         group_owners: Persones propietàries
         add_owners: Afegeix persones propietàries
-        incoming_email: "Personalitza l'adreça de correu electrònic entrant:"
-        incoming_email_placeholder: "introdueix una adreça de correu electrònic"
       api:
         generate_master: "Genera una clau mestra API"
         none: "No hi ha claus API actives ara mateix"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 9d9f0ed68b..3f1a9eee2b 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -158,7 +158,7 @@ cs:
         enabled: 'připnuto %{when}'
         disabled: 'odepnuto %{when}'
       pinned_globally:
-        enabled: 'globálně přinuto %{when}'
+        enabled: 'globálně připnuto %{when}'
         disabled: 'odepnuto %{when}'
       visible:
         enabled: 'uvedeno %{when}'
@@ -169,6 +169,7 @@ cs:
     topic_admin_menu: "akce administrátora tématu"
     wizard_required: "Vítejte ve vašem novém Discourse! Začněte s <a href='%{url}' data-auto-route='true'>nastavením pomocí průvodce</a> ✨"
     emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány."
+    bootstrap_mode_disabled: "Režim bootstrap bude deaktivován v následujících 24 hodinách."
     themes:
       default_description: "Výchozí"
     s3:
@@ -359,22 +360,18 @@ cs:
         make_user_group_owner: "Udělej vlastníkem"
         remove_user_as_group_owner: "Odstraň vlastníka"
     groups:
-      logs:
-        title: "Logy"
-        when: "Když"
-        action: "Akce"
-        acting_user: "Vystupující uživatel"
-        target_user: "Cílový uživatel"
-        subject: "Předmět"
-        details: "Detail"
-        from: "Od"
-        to: "Komu"
-      edit:
-        title: 'Editovat skupinu'
-        full_name: 'Celé jméno'
+      manage:
+        title: 'Spravovat'
+        name: 'Název'
+        full_name: 'Celé název'
         add_members: "Přidat členy"
-        delete_member_confirm: "Odstranit '%{username}' ze skupiny '%{group}'?"
-      name_placeholder: "Název skupiny, bez mezer, stejná pravidla jako pro uživatelská jména"
+        delete_member_confirm: "Odstranit '%{username}' ze '%{group}' skupiny?"
+        profile:
+          title: Profil
+        logs:
+          action: "Akce"
+          subject: "Předmět"
+          from: "Od"
       public_admission: "Povolit uživatelům volný přístup do skupiny (skupina musí být veřejně viditelná)"
       public_exit: "Povolit uživatelům volně opustit skupinu"
       empty:
@@ -385,15 +382,7 @@ cs:
         topics: "V této skupině není od žádného člena ani jedno téma."
         logs: "Pro tuto skupinu neexistují žádné logy."
       add: "Přidat"
-      join: "Přidat se ke skupině"
-      leave: "Opustit skupinu"
-      request: "Požádat o členství ve skupině"
-      filter_name: "Filtrovat podle jména skupiny"
       message: "Zpráva"
-      automatic_group: Automatická skupina
-      close_group: Zavřít skupinu
-      is_group_user: "Jste členem této skupiny"
-      is_group_owner: "Jsi majitelem této skupiny"
       allow_membership_requests: "Povolit uživatelům odeslat žádost o členství vlastníkům skupin"
       membership_request_template: "Šablona, která se uživatelům zobrazí při odesílání žádosti o členství"
       membership_request:
@@ -402,16 +391,16 @@ cs:
         reason: "Informovat vlastníky skupiny proč patříte do této skupiny"
       membership: "Členství"
       name: "Název"
-      user_count: "Počet členů"
+      user_count: "Uživatelé"
       bio: "O skupině"
       selector_placeholder: "zadejte uživatelské jméno"
       owner: "Vlastník"
       index:
         title: "Skupiny"
+        all: "Všechny skupiny"
         empty: "Žádné viditelné skupiny."
         all_groups: "Všechny skupiny"
         owner_groups: "Skupiny, jejichž jsem majitelem"
-        close_groups: "Zavřít skupiny"
         automatic_groups: "Automatické skupiny"
         public_groups: "Veřejné skupiny"
         my_groups: "Moje skupiny"
@@ -428,12 +417,6 @@ cs:
       mentions: "Zmínění"
       messages: "Zprávy"
       notification_level: "Výchozí úroveň upozornění pro zprávy ze skupiny"
-      visibility_levels:
-        title: "Kdo vidí tuto skupinu?"
-        public: "Všichni"
-        members: "Vlastníci skupiny, členové a správci"
-        staff: "Vlastníci a redaktoři skupiny"
-        owners: "Vlastníci a správci skupiny"
       alias_levels:
         mentionable: "Kdo může @zmiňovat tuto skupinu?"
         messageable: "Kdo může psát zprávy do této skupinu?"
@@ -442,9 +425,6 @@ cs:
         mods_and_admins: "Pouze moderátoři a správci"
         members_mods_and_admins: "Pouze členové skupiny, moderátoři a správci"
         everyone: "Kdokoliv"
-      trust_levels:
-        title: "Automaticky přidělená úroveň důvěryhodnosti členům když jsou přidáni: "
-        none: "Žádná"
       notifications:
         watching:
           title: "Hlídané"
@@ -469,7 +449,6 @@ cs:
       flair_color_placeholder: "(Volitelné) Hex kód barvy"
       flair_preview_icon: "Náhled ikony"
       flair_preview_image: "Náhled obrázku"
-      flair_note: "Poznámka: Avatar se zobrazí pouze pro primární skupinu uživatele."
     user_action_groups:
       '1': "Rozdaných 'líbí se'"
       '2': "Obdržených 'líbí se'"
@@ -666,6 +645,9 @@ cs:
         choose: "Vyber si heslo"
       second_factor:
         title: "Dvoufázové přihlašování"
+        label: "Kód"
+        disable_description: "Zadejte prosím ověřovací kód z vaší aplikace"
+        show_key_description: "Vložit ručně"
       change_about:
         title: "Změna o mně"
         error: "Došlo k chybě při pokusu změnit tuto hodnotu."
@@ -1027,6 +1009,7 @@ cs:
       title: "Přihlásit se"
       username: "Uživatel"
       password: "Heslo"
+      second_factor_title: "Dvoufázové přihlašování"
       email_placeholder: "emailová adresa nebo uživatelské jméno"
       caps_lock_warning: "zapnutý Caps Lock"
       error: "Neznámá chyba"
@@ -1109,7 +1092,6 @@ cs:
       no_content: Nebyly nalezeny žádné výsledky
       filter_placeholder: Hledat...
       create: "Vytvořit: '{{content}}'"
-      max_content_reached: "Můžete vybrat pouze {{count}} položek."
     emoji_picker:
       filter_placeholder: Hledat emoji
       people: Lidé
@@ -1287,22 +1269,6 @@ cs:
         one: "{{count}} zpráva ve schránce skupiny {{group_name}}"
         few: "{{count}} zprávy ve schránce skupiny {{group_name}}"
         other: "{{count}} zpráv ve schránce skupiny {{group_name}}"
-      alt:
-        mentioned: "Zmíněno"
-        quoted: "Citováno"
-        replied: "Odpověděl"
-        posted: "Příspěvek od"
-        edited: "Editovat váš příspěvek od"
-        liked: "Líbil se tvůj příspěvek"
-        private_message: "Soukromá zpráva od"
-        invited_to_private_message: "Pozván k soukromé zprávě od"
-        invited_to_topic: "Pozván k tématu od"
-        invitee_accepted: "Pozvánka přijata od"
-        moved_post: "Tvůj příspěvek přesunul"
-        linked: "Odkaz na tvůj příspěvek"
-        granted_badge: "Odznak přidělen"
-        group_message_summary: "Zprávy ve skupinové schránce"
-        topic_reminder: "Připomenutí"
       popup:
         mentioned: '{{username}} vás zmínil v "{{topic}}" - {{site_title}}'
         group_mentioned: 'Uživatel {{username}} vás zmínil v "{{topic}}" - {{site_title}}'
@@ -1336,10 +1302,6 @@ cs:
       select_all: "Vybrat vše"
       clear_all: "Vymazat vše"
       too_short: "Hledaný výraz je příliš krátký."
-      result_count:
-        one: "1 výsledek pro <span class='term'>\"{{term}}\"</span>"
-        few: "{{count}}{{plus}} výsledky pro <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}}{{plus}} výsledků pro <span class='term'>\"{{term}}\"</span>"
       title: "vyhledávat témata, příspěvky, uživatele nebo kategorie"
       no_results: "Nenalezeny žádné výsledky."
       no_more_results: "Nenalezeny žádné další výsledky."
@@ -2661,7 +2623,6 @@ cs:
         title: "Skupiny"
         edit: "Upravit skupiny"
         refresh: "Obnovit"
-        new: "Nová"
         about: "Zde můžete upravit názvy skupin a členství"
         group_members: "Členové skupiny"
         delete: "Smazat"
@@ -2669,22 +2630,11 @@ cs:
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_owner_confirm: "Odstranit vlastnickou výsadu od '%{username}'?"
         add: "Přidat"
-        add_members: "Přidat členy"
         custom: "Přizpůsobené"
-        bulk_complete: "Uživatelé byli přidáni do skupiny."
-        bulk_complete_users_not_added: "Tito uživatelé nebyli přidáni (ujisti se, že mají účet):"
-        bulk: "Hromadné přidání do skupiny"
-        bulk_paste: "Vlož seznam uživatelských jmen a e-mailů, jeden záznam na řádek"
-        bulk_select: "(vyber skupinu)"
         automatic: "Automatické"
-        automatic_membership_email_domains: "Uživatelé zaregistrovaní s emailem jehož doména se přesně shoduje s jednou z tohoto seznamu budou automaticky přidáni to této skupiny:"
-        automatic_membership_retroactive: "Aplikovat stejné doménové pravidlo na už existující uživatele"
         default_title: "Výchozí popis pro všechny uživatele této skupiny"
-        primary_group: "Automaticky nastavit jako hlavní skupinu"
         group_owners: Vlastníci
         add_owners: Přidat vlastníky
-        incoming_email: "Vlastní příchozí emailová adresa"
-        incoming_email_placeholder: "zadej emailovou adresu"
         none_selected: "Vyber si skupinu, abys mohl začít"
         no_custom_groups: "Vytvořit novou vlastní skupinu"
       api:
@@ -2903,7 +2853,6 @@ cs:
           add_upload: "Přidat nahrávání "
           upload_file_tip: "Vybrat položku k nahrání (png, woff2, etc...)"
           variable_name: "Název SCSS var:"
-          variable_name_invalid: "Neplatné variabilní jméno. Povoleny jsou pouze alfanumerické znaky. Musí začínat písmenem."
           upload: "Nahrát"
           child_themes_check: "Motiv zahrnuje jiné dětské motivy"
           css_html: "Vlastí CSS/HTML"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 6ab5a3647a..dde953c5b0 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -323,22 +323,6 @@ da:
         make_user_group_owner: "Gør til ejer"
         remove_user_as_group_owner: "Fjern ejer"
     groups:
-      logs:
-        title: "Logs"
-        when: "Når"
-        action: "Handling"
-        acting_user: "Fungerende bruger"
-        target_user: "Målbruger"
-        subject: "Emne"
-        details: "Detaljer"
-        from: "Fra"
-        to: "Til"
-      edit:
-        title: 'Redigér Gruppe'
-        full_name: 'Fulde Navn'
-        add_members: "Tilføj Medlemmer"
-        delete_member_confirm: "Fjern '%{username}' fra '%{group}' gruppen?"
-      name_placeholder: "Gruppenavn uden mellemrum, samme som reglen for brugernavn"
       public_admission: "Tillad brugere frit at tilmelde sig gruppen (Kræver at det er en offentlig synlig gruppe)"
       public_exit: "Tillad brugere frit at forlade gruppen"
       empty:
@@ -349,12 +333,7 @@ da:
         topics: "Der er ingen emner skrevet af medlemmer i denne gruppe."
         logs: "Der er ingen logning for denne gruppe."
       add: "Tilføj"
-      join: "Bliv medlem af gruppen"
-      leave: "Forlad gruppen"
-      request: "Anmod om indmeldelse i gruppen"
       message: "Besked"
-      automatic_group: Automatisk gruppe
-      is_group_user: "Du er medlem af denne gruppe"
       allow_membership_requests: "Tillad at brugere sender medlemsanmodninger til gruppeejere"
       membership_request_template: "Brugerdefineret skabelon, der skal vises til brugere, når der sendes en medlemskabsanmodning"
       membership_request:
@@ -374,12 +353,6 @@ da:
       mentions: "Omtaler"
       messages: "Beskeder"
       notification_level: "Standard notifikationsniveau for gruppebeskeder"
-      visibility_levels:
-        title: "Hvem kan se denne gruppe?"
-        public: "Alle"
-        members: "Gruppeejer, medlemmer og admins"
-        staff: "Gruppeejer og hjælpeteam"
-        owners: "Gruppeejer og admins"
       alias_levels:
         mentionable: "Hvem kan @gruppenavn denne gruppe?"
         messageable: "Hvem kan sende en besked til denne gruppe?"
@@ -388,9 +361,6 @@ da:
         mods_and_admins: "Kun moderatore og administratore"
         members_mods_and_admins: "Kun gruppe medlemmer, moderatore og administratore"
         everyone: "Alle"
-      trust_levels:
-        title: "Tillidsniveau der automatisk tildeles medlemmer når de oprettes:"
-        none: "Ingen"
       notifications:
         watching:
           title: "Kigger"
@@ -415,7 +385,6 @@ da:
       flair_color_placeholder: "(Valgfrit) Hex farveværdi"
       flair_preview_icon: "Forhåndsvisning af ikonet"
       flair_preview_image: "Forhåndsvisning af billede"
-      flair_note: "Bemærk: Flair vil kun blive vist for en brugers primære gruppe."
     user_action_groups:
       '1': "Likes givet"
       '2': "Likes modtaget"
@@ -1082,19 +1051,6 @@ da:
       empty: "Ingen notifikationer fundet."
       more: "se ældre notifikationer"
       total_flagged: "total markerede indlæg"
-      alt:
-        mentioned: "Nævnt af"
-        quoted: "Citeret af"
-        replied: "Svaret"
-        posted: "Indlæg af"
-        edited: "Rediger dit indlæg af"
-        liked: "Likede dit indlæg"
-        invited_to_topic: "Inviteret til et indlæg fra"
-        invitee_accepted: "Invitation accepteret af"
-        moved_post: "Dit indlæg blev flyttet af"
-        linked: "Link til dit indlæg"
-        granted_badge: "Badge tildelt"
-        group_message_summary: "Besker i gruppens indbakke"
       popup:
         mentioned: '{{username}} nævnte dig i "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nævnte dig i "{{topic}}" - {{site_title}}'
@@ -2242,7 +2198,6 @@ da:
         title: "Grupper"
         edit: "Redigér grupper"
         refresh: "Genindlæs"
-        new: "Nye"
         about: "Redigér gruppemedlemsskaber og gruppenavne her"
         group_members: "Gruppe medlemmer"
         delete: "Slet"
@@ -2250,22 +2205,11 @@ da:
         delete_failed: "Kan ikke slette gruppen. Hvis dette er en automatisk gruppe, kan den ikke ødelægges."
         delete_owner_confirm: "Fjern ejer-privilegier for '%{username}'?"
         add: "Tilføj"
-        add_members: "Tilføj medlemmer"
         custom: "Brugerdefineret"
-        bulk_complete: "Brugerne er tilføjet gruppen."
-        bulk_complete_users_not_added: "Disse brugere blev ikke tilføjet (sørg for at sikre, at de har en konto):"
-        bulk: "Tilføj mange brugere til gruppe"
-        bulk_paste: "Indsæt en liste brugerne eller emails, én per linje:"
-        bulk_select: "(vælg en gruppe)"
         automatic: "Automatisk"
-        automatic_membership_email_domains: "Brugere der registrerer med et email domæne der præcist matcher et på denne liste, vil automatisk blive tilføjet til denne gruppe:"
-        automatic_membership_retroactive: "Brug denne email domæne regel til at tilføje brugere der allerede er registrerede brugere"
         default_title: "Standard titel for alle brugere i denne gruppe"
-        primary_group: "Sæt automatisk som primær gruppe"
         group_owners: Ejere
         add_owners: Tilføj ejere
-        incoming_email: "Brugerdefineret indkommende email"
-        incoming_email_placeholder: "indtast email"
         none_selected: "Vælg en gruppe for at komme i gang"
         no_custom_groups: "Opret en ny brugerdefineret gruppe"
       api:
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index a9733b1606..ca9131c762 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -346,22 +346,24 @@ de:
         make_user_group_owner: "Zum Eigentümer machen"
         remove_user_as_group_owner: "Eigentümerrechte entziehen"
     groups:
-      logs:
-        title: "Logs"
-        when: "Wann"
-        action: "Aktion"
-        acting_user: "Benutzer der Aktion"
-        target_user: "Betroffener Benutzer"
-        subject: "Gegenstand"
-        details: "Details"
-        from: "Von"
-        to: "An"
-      edit:
-        title: 'Gruppe bearbeiten'
+      manage:
+        title: 'Verwalten'
+        name: 'Name'
         full_name: 'Vollständiger Name'
         add_members: "Mitglieder hinzufügen"
-        delete_member_confirm: "'%{username}' aus der Gruppe '%{group}' entfernen?"
-      name_placeholder: "Gruppenname, keine Leerzeichen, gleiche Regel wie beim Benutzernamen"
+        delete_member_confirm: "Entferne „%{username}“ aus der Gruppe „%{group}“?"
+        profile:
+          title: Profi
+        logs:
+          title: "Protokoll"
+          when: "Wann"
+          action: "Aktion"
+          acting_user: "Ausführender Benutzer"
+          target_user: "Betroffener Benutzer"
+          subject: "Betreff"
+          details: "Details"
+          from: "Von"
+          to: "An"
       public_admission: "Erlaube Benutzern, die Gruppe eigenständig zu betreten (Erfordert, dass die Gruppe öffentlich sichtbar ist)"
       public_exit: "Erlaube Benutzern, die Gruppe eigenständig zu verlassen"
       empty:
@@ -372,15 +374,10 @@ de:
         topics: "Es gibt keine Themen von Mitgliedern dieser Gruppe."
         logs: "Es gibt keine Protokolleinträge für diese Gruppe."
       add: "Hinzufügen"
-      join: "Gruppe beitreten"
-      leave: "Gruppe verlassen"
-      request: "Gruppenbeitritt beantragen"
-      filter_name: "filtern nach Gruppenname"
+      join: "Beitreten"
+      leave: "Verlassen"
+      request: "Anfrage"
       message: "Nachricht"
-      automatic_group: Automatische Gruppe
-      close_group: Gruppe schließen
-      is_group_user: "Du bist ein Mitglied in dieser Gruppe."
-      is_group_owner: "Du bist ein Eigentümer dieser Gruppe"
       allow_membership_requests: "Erlaube Benutzern, eine Mitgliedschaftsanfrage an Gruppen-Eigentümer zu senden."
       membership_request_template: "Benutzerdefinierte Vorlage, das Benutzern angezeigt wird, die eine Mitgliedschaftsanfrage senden"
       membership_request:
@@ -389,19 +386,31 @@ de:
         reason: "Lass’ die Gruppenbesitzer wissen, warum du in diese Gruppe gehörst"
       membership: "Mitgliedschaft"
       name: "Name"
-      user_count: "Mitgliederzahl"
+      group_name: "Gruppenname"
+      user_count: "Benutzer"
       bio: "Über die Gruppe"
       selector_placeholder: "Benutzernamen eingeben"
       owner: "Eigentümer"
       index:
         title: "Gruppen"
+        all: "Alle Gruppen"
         empty: "Es gibt keine sichtbaren Gruppen."
+        filter: "Filtern nach Art der Gruppe"
         all_groups: "Alle Gruppen"
         owner_groups: "Gruppen, deren Eigentümer ich bin"
-        close_groups: "Gruppen schließen"
+        close_groups: "Geschlossene Gruppe"
         automatic_groups: "Automatische Gruppen"
+        automatic: "Automatisch"
+        closed: "Geschlossen"
+        public: "Öffentlich"
+        private: "Geheim"
         public_groups: "Öffentliche Gruppen"
+        automatic_group: Automatische Gruppe
+        close_group: Gruppe schließen
         my_groups: "Meine Gruppen"
+        group_type: "Art der Gruppe"
+        is_group_user: "Mitglied"
+        is_group_owner: "Eigentümer"
       title:
         one: "Gruppe"
         other: "Gruppen"
@@ -416,17 +425,12 @@ de:
         make_owner_description: "Füge <b>%{username}</b> als Eigentümer dieser Gruppe hinzu"
         remove_owner: "Als Eigentümer entfernen"
         remove_owner_description: "Entferne <b>%{username}</b> als Eigentümer dieser Gruppe"
+        owner: "Eigentümer"
       topics: "Themen"
       posts: "Beiträge"
       mentions: "Erwähnungen"
       messages: "Nachrichten"
       notification_level: "Standard-Benachrichtigungsstufe für Gruppen-Nachrichten"
-      visibility_levels:
-        title: "Wer kann diese Gruppe sehen?"
-        public: "Alle"
-        members: "Gruppenbesitzer, Mitglieder und Admins"
-        staff: "Gruppenbesitzer und Team"
-        owners: "Gruppenbesitzer und Admins"
       alias_levels:
         mentionable: "Wer kann diese Gruppe @erwähnen?"
         messageable: "Wer kann dieser Gruppe eine Nachricht schicken?"
@@ -435,9 +439,6 @@ de:
         mods_and_admins: "Nur Moderatoren und Administratoren"
         members_mods_and_admins: "Nur Gruppenmitglieder, Moderatoren und Administratoren"
         everyone: "Jeder"
-      trust_levels:
-        title: "Vertrauensstufe, die neuen Mitgliedern automatisch verliehen wird:"
-        none: "keine"
       notifications:
         watching:
           title: "Beobachten"
@@ -462,7 +463,6 @@ de:
       flair_color_placeholder: "(Optoinal) Hex-Farbwert"
       flair_preview_icon: "Vorschau-Icon"
       flair_preview_image: "Vorschaubild"
-      flair_note: "Hinweise: Ein Avatar-Hintergrund wird nur für die Hauptgruppe eines Benutzers angezeigt."
     user_action_groups:
       '1': "Abgegebene Likes"
       '2': "Erhaltene Likes"
@@ -536,6 +536,7 @@ de:
       activity_stream: "Aktivität"
       preferences: "Einstellungen"
       expand_profile: "Erweitern"
+      collapse_profile: "Zuklappen"
       bookmarks: "Lesezeichen"
       bio: "Über mich"
       invited_by: "Eingeladen von"
@@ -894,6 +895,7 @@ de:
         header_title: "Profil. Nachrichten, Lesezeichen und Einstellungen"
       title:
         title: "Titel"
+        none: "(keiner)"
       filters:
         all: "Alle"
       stream:
@@ -1107,7 +1109,6 @@ de:
       no_content: Keine Treffer gefunden
       filter_placeholder: Suchen…
       create: "Erstelle: '{{content}}'"
-      max_content_reached: "Du kannst nur {{count}} Elemente auswählen."
     emoji_picker:
       filter_placeholder: Emoji suchen
       people: Personen
@@ -1173,6 +1174,7 @@ de:
       create_pm: "Nachricht"
       create_whisper: "Flüstern"
       create_shared_draft: "Erstelle gemeinsame Vorlage"
+      edit_shared_draft: "Gemeinsame Vorlage bearbeiten"
       title: "Oder drücke Strg+Eingabetaste"
       users_placeholder: "Benutzer hinzufügen"
       title_placeholder: "Um was geht es in dieser Diskussion? Schreib einen kurzen Satz."
@@ -1280,22 +1282,6 @@ de:
       group_message_summary:
         one: "{{count}} Nachricht in deinem {{group_name}} Posteingang"
         other: "{{count}} Nachrichten in deinem {{group_name}} Posteingang"
-      alt:
-        mentioned: "Erwähnt von"
-        quoted: "Zitiert von"
-        replied: "Geantwortet"
-        posted: "Beitrag von"
-        edited: "Beitrag bearbeitet von"
-        liked: "Gefällt dein Beitrag"
-        private_message: "Absender der Nachricht"
-        invited_to_private_message: "Eingeladen zu einer Nachricht von"
-        invited_to_topic: "Zu Thema eingeladen von"
-        invitee_accepted: "Einladung angenommen von"
-        moved_post: "Dein Beitrag wurde verschoben von"
-        linked: "Link zu deinem Beitrag"
-        granted_badge: "Abzeichen erhalten"
-        group_message_summary: "Nachrichten im Gruppenpostfach"
-        topic_reminder: "Eine Erinnerung"
       popup:
         mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
         group_mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
@@ -1330,8 +1316,8 @@ de:
       clear_all: "Auswahl aufheben"
       too_short: "Der Suchbegriff ist zu kurz."
       result_count:
-        one: "1 Ergebnis für <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} Ergebnisse für <span class='term'>{{term}}</span>"
+        one: "<span>1 Ergebnis für </span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} Ergebnisse für </span><span class='term'>{{term}}</span>"
       title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien"
       no_results: "Keine Ergebnisse gefunden."
       no_more_results: "Es wurde keine weiteren Ergebnisse gefunden."
@@ -2432,6 +2418,7 @@ de:
         save: "Speichern"
         delete: "Löschen"
         confirm_delete: "Möchtest du wirklich diese Schlagwort-Gruppe löschen?"
+        visible_only_to_staff: "Schlagwörter sind nur für das Team sichtbar"
       topics:
         none:
           unread: "Du hast keine ungelesenen Themen."
@@ -2554,6 +2541,9 @@ de:
         more: "(weitere Antworten…)"
         suspend_user: "Benutzer sperren"
         suspend_user_title: "Benutzer für diesen Beitrag sperren"
+        replies:
+          one: "[1 Antwort]"
+          other: "[%{count} Antworten]"
         dispositions:
           agreed: "zugestimmt"
           disagreed: "abgelehnt"
@@ -2589,7 +2579,6 @@ de:
         title: "Gruppen"
         edit: "Gruppen bearbeiten"
         refresh: "Aktualisieren"
-        new: "Neu"
         about: "Hier kannst du Gruppenzugehörigkeiten und Gruppennamen bearbeiten."
         group_members: "Gruppenmitglieder"
         delete: "Löschen"
@@ -2597,22 +2586,11 @@ de:
         delete_failed: "Gruppe konnte nicht gelöscht werden. Wenn dies eine automatische Gruppe ist, kann sie nicht gelöscht werden."
         delete_owner_confirm: "Eigentümerrechte für '%{username}' entfernen?"
         add: "Hinzufügen"
-        add_members: "Mitglieder hinzufügen"
         custom: "Benutzerdefiniert"
-        bulk_complete: "Die Benutzer wurden der Gruppe hinzugefügt."
-        bulk_complete_users_not_added: "Diese Benutzer wurden nicht hinzugefügt (stelle sicher, dass sie ein Konto haben):"
-        bulk: "Mehrere der Gruppe hinzufügen"
-        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:"
-        automatic_membership_retroactive: "Diese Regel auch auf existierende Benutzer anwenden, um diese zur Gruppe hinzuzufügen."
         default_title: "Standardtitel für alle Benutzer in dieser Gruppe"
-        primary_group: "Automatisch als primäre Gruppe festlegen"
         group_owners: Eigentümer
         add_owners: Eigentümer hinzufügen
-        incoming_email: "Benutzerdefinierte Adresse für eingehende E-Mails"
-        incoming_email_placeholder: "E-Mail-Adresse eingeben"
         none_selected: "Wähle eine Gruppe, um loszulegen"
         no_custom_groups: "Erstelle eine neue benutzerdefinierte Gruppe"
       api:
@@ -2670,6 +2648,15 @@ de:
         user_event:
           name: "Benutzer Ereignis"
           details: "Wenn sich ein Benutzer anmeldet, abmeldet, erstellt, genehmigt oder aktualisiert wird."
+        group_event:
+          name: "Gruppen-Ereignis"
+          details: "Wenn eine Gruppe erstellt, aktualisiert oder gelöscht wird."
+        category_event:
+          name: "Kategorie-Ereignis"
+          details: "Wenn eine Kategorie erstellt, aktualisiert oder gelöscht wird."
+        tag_event:
+          name: "Schlagwort-Ereignis"
+          details: "Wenn ein Schlagwort erstellt, aktualisiert oder gelöscht wird."
         delivery_status:
           title: "Versandstatus"
           inactive: "Inaktiv"
@@ -2829,7 +2816,7 @@ de:
           add_upload: "Upload hinzufügen"
           upload_file_tip: "Wähle einen hochzuladenen Medieninhalt aus (png, woff2, usw.)"
           variable_name: "SCSS Variablen-Name:"
-          variable_name_invalid: "Ungültiger Variablenname. Nur alphanumerische Zeichen erlaubt. Muss mit einem Buchstaben beginnen."
+          variable_name_invalid: "Ungültiger Variablenname. Nur alphanumerische Zeichen sind erlaubt. Muss mit einem Buchstaben beginnen. Muss eindeutig sein."
           upload: "Hochladen"
           child_themes_check: "Theme beinhaltet andere Kinder-Themes"
           css_html: "Benutzerdefiniertes CSS/HTML"
@@ -2946,7 +2933,7 @@ de:
         delivery_method: "Versandmethode"
         preview_digest_desc: "Vorschau der Neuigkeiten, die als E-Mail an inaktive Nutzer gesendet werden."
         refresh: "Aktualisieren"
-        send_digest_label: "Sende das Ergebnis nach:"
+        send_digest_label: "Sende das Ergebnis an:"
         send_digest: "Senden"
         sending_email: "Sende Email..."
         format: "Format"
@@ -3074,6 +3061,7 @@ de:
             post_unlocked: "Beitrag entsperrt"
             check_personal_message: "Nachrichten geprüft"
             disabled_second_factor: "Zwei-Faktor-Authentifizierung deaktiviert"
+            topic_published: "Thema veröffentlicht"
         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."
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 13ef058e4d..e4f5fb95fb 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -330,22 +330,6 @@ el:
         make_user_group_owner: "Κάνε ιδιοκτήτη"
         remove_user_as_group_owner: "Απέσυρε ιδιοκτήτη"
     groups:
-      logs:
-        title: "Logs"
-        when: "Πότε"
-        action: "Ενέργεια"
-        acting_user: "Ενέργεια από"
-        target_user: "Αποδέκτης"
-        subject: "Θέμα"
-        details: "Λεπτομέρειες"
-        from: "Από"
-        to: "Προς"
-      edit:
-        title: 'Επεξεργασία Ομάδας'
-        full_name: 'Πλήρες Όνομα'
-        add_members: "Προσθήκη Μελών"
-        delete_member_confirm: "Να αφαιρεθεί ο/η '%{username}' από την ομάδα '%{group}' ;"
-      name_placeholder: "Όνομα ομάδας, χωρίς κενά, ίδιοι κανόνες με τους κανόνες για το όνομα χρήστη"
       public_admission: "Επίτρεψε στους χρήστες να προσχωρήσουν στην ομάδα (Απαιτεί δημόσια ορατή ομάδα)"
       public_exit: "Επίτρεψε στους χρήστες να αποχωρήσουν από την ομάδα"
       empty:
@@ -356,12 +340,7 @@ el:
         topics: "Δεν υπάρχουν νήματα από μέλη της ομάδας."
         logs: "Δεν υπάρχουν logs για αυτή την ομάδα."
       add: "Προσθήκη"
-      join: "Συμμετοχή στην Ομάδα"
-      leave: "Αποχώρηση από την Ομάδα"
-      request: "Αίτημα Συμμετοχής στην Ομάδα"
       message: "Μήνυμα"
-      automatic_group: Αυτόματη Ομάδα
-      is_group_user: "Είσαι μέλος αυτής της ομάδας"
       allow_membership_requests: "Επιτρέψτε στα μέλη να στέλνουν αιτήματα συμμετοχής στους ιδιοκτήτες ομάδων"
       membership_request_template: "Προσαρμοσμένο πρότυπο που θα εμφανίζεται στους χρήστες όταν αποστέλλεται αίτημα συμμετοχής"
       membership_request:
@@ -384,12 +363,6 @@ el:
       mentions: "Αναφορές"
       messages: "Μηνύματα"
       notification_level: "Προκαθορισμένο επίπεδο ειδοποιήσεων για μηνύματα ομάδων"
-      visibility_levels:
-        title: "Ποιος μπορεί να δει αυτή την ομάδα;"
-        public: "Όλοι"
-        members: "Ιδιοκτήτες ομάδας, μέλη και διαχειριστές"
-        staff: "Ιδιοκτήτες ομάδας και συνεργάτες"
-        owners: "Ιδιοκτήτες ομάδας και διαχειριστές"
       alias_levels:
         mentionable: "Ποιός μπορεί να @αναφέρει αυτή την ομάδα;"
         messageable: "Ποιός μπορεί να στείλει μήνυμα σε αυτή την ομάδα;"
@@ -398,9 +371,6 @@ el:
         mods_and_admins: "Μόνο συντονιστές και διαχειριστές"
         members_mods_and_admins: "Μόνο τα μέλη της ομάδας, οι συντονιστές και οι διαχειριστές"
         everyone: "Όλοι"
-      trust_levels:
-        title: "Επίπεδο εμπιστοσύνης που δίνεται αυτόματα στα μέλη όταν προστίθενται:"
-        none: "Κανένα"
       notifications:
         watching:
           title: "Επιτηρείται"
@@ -425,7 +395,6 @@ el:
       flair_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
       flair_preview_icon: "Εικονίδιο Προεπισκόπησης"
       flair_preview_image: "Εικόνα Προεπισκόπησης"
-      flair_note: "Σημείωση: Το Flair θα εμφανιστεί μονο για την κύρια ομάδα του χρήστη"
     user_action_groups:
       '1': "Αρέσει που Έδωσα"
       '2': "Αρέσει που Έλαβα"
@@ -1167,19 +1136,6 @@ el:
       group_message_summary:
         one: "{{count}} μήνυμα στα εισερχόμενα της ομάδας {{group_name}}"
         other: "{{count}} μηνύματα στα εισερχόμενα της ομάδας {{group_name}} "
-      alt:
-        mentioned: "Αναφέρθηκε από"
-        quoted: "Παράθεση από "
-        replied: "Απαντήθηκε"
-        posted: "Ανάρτηση από"
-        edited: "Επεξεργασία της ανάρτησής σου από"
-        liked: "Η ανάρτησή σου έχει \"μου αρέσει\""
-        invited_to_topic: "Προσκλήθηκε στο νήμα από"
-        invitee_accepted: "Η πρόσκληση έγινε δεκτή από"
-        moved_post: "Η ανάρτησή σου μετακινήθηκε από"
-        linked: "Σύνδεση στην ανάρτησή σου"
-        granted_badge: "Χορηγήθηκε παράσημο"
-        group_message_summary: "Μηνύματα στα εισερχόμενα ομάδας"
       popup:
         mentioned: '{{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
@@ -2403,7 +2359,6 @@ el:
         title: "Ομάδες"
         edit: "Επεξεργασία Ομάδων"
         refresh: "Ανανέωση "
-        new: "Νέα"
         about: "Επεξεργασία των μελών και των ονομάτων της ομάδας εδώ"
         group_members: "Μέλη ομάδας"
         delete: "Διαγραφή"
@@ -2411,22 +2366,11 @@ el:
         delete_failed: "Δεν είναι δυνατή η διαγραφή της ομάδας. Αν αυτή είναι μια αυτόματη ομάδα, δεν μπορεί να σβηστεί."
         delete_owner_confirm: "Αφαίρεσε το προνόμιο του ιδιοκτήτη για '%{username}';"
         add: "Προσθήκη"
-        add_members: "Προσθήκη μελών"
         custom: "Προσαρμοσμένο"
-        bulk_complete: "Οι χρήστες έχουν προστεθεί στην ομάδα."
-        bulk_complete_users_not_added: "Αυτοί οι χρήστες δεν προστέθηκαν (βεβαιώσου ότι έχουν λογαριασμό χρήστη):"
-        bulk: "Μαζική Προσθήκη σε Ομάδα"
-        bulk_paste: "Κάνε επικόλληση μια λίστα με ονόματα χρηστών η διευθύνσεις email, ένα σε κάθε σειρά:"
-        bulk_select: "(επέλεξε μια ομάδα)"
         automatic: "Αυτόματα"
-        automatic_membership_email_domains: "Οι χρήστης των οποίων το email domain ταιριάζει με κάποιο από αυτά της λίστας, θα προστίθενται αυτόματα σε αυτή την ομάδα:"
-        automatic_membership_retroactive: "Εφάρμοσε αυτόν τον κανόνα και σε υπάρχοντες χρήστες, για να τους προσθέσεις στην ομάδα:"
         default_title: "Προκαθορισμένος τίτλος για όλους τους χρήστες αυτής της ομάδας"
-        primary_group: "Να οριστεί αυτόματα σαν η κύρια ομάδα"
         group_owners: Ιδιοκτήτες
         add_owners: Προσθήκη ιδιοκτητών
-        incoming_email: "Προσαρμοσμένη διεύθυνση email για εισερχόμενα μηνύματα"
-        incoming_email_placeholder: "πρόσθεσε διεύθυνση email"
         none_selected: "Επίλεξε ομάδα για να ξεκινήσεις"
         no_custom_groups: "Δημιουργία νέας προσαρμοσμένης ομάδας"
       api:
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 523163cd46..21e7f3c7cc 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -403,22 +403,35 @@ en:
         remove_user_as_group_owner: "Revoke owner"
 
     groups:
-      logs:
-        title: "Logs"
-        when: "When"
-        action: "Action"
-        acting_user: "Acting user"
-        target_user: "Target user"
-        subject: "Subject"
-        details: "Details"
-        from: "From"
-        to: "To"
-      edit:
-        title: 'Edit Group'
+      add_members:
+        title: "Add Members"
+        description: "Manage the membership of this group"
+        usernames: "Usernames"
+      manage:
+        title: 'Manage'
+        name: 'Name'
         full_name: 'Full Name'
         add_members: "Add Members"
         delete_member_confirm: "Remove '%{username}' from the '%{group}' group?"
-      name_placeholder: "Group name, no spaces, same as username rule"
+        profile:
+          title: Profile
+        interaction:
+          title: Interaction
+          posting: Posting
+          notification: Notification
+        membership:
+          title: Membership
+          access: Access
+        logs:
+          title: "Logs"
+          when: "When"
+          action: "Action"
+          acting_user: "Acting user"
+          target_user: "Target user"
+          subject: "Subject"
+          details: "Details"
+          from: "From"
+          to: "To"
       public_admission: "Allow users to join the group freely (Requires publicly visible group)"
       public_exit: "Allow users to leave the group freely"
       empty:
@@ -429,46 +442,47 @@ en:
         topics: "There are no topics by members of this group."
         logs: "There are no logs for this group."
       add: "Add"
-      join: "Join Group"
-      leave: "Leave Group"
-      request: "Request to Join Group"
-      filter_name: "filter by group name"
+      join: "Join"
+      leave: "Leave"
+      request: "Request"
       message: "Message"
-      automatic_group: Automatic Group
-      close_group: Close Group
-      is_group_user: "You are a member of this group"
-      is_group_owner: "You are an owner of this group"
       allow_membership_requests: "Allow users to send membership requests to group owners"
       membership_request_template: "Custom template to display to users when sending a membership request"
       membership_request:
         submit: "Submit Request"
         title: "Request to join @%{group_name}"
         reason: "Let the group owners know why you belong in this group"
-
       membership: "Membership"
       name: "Name"
-      user_count: "Members Count"
+      group_name: "Group name"
+      user_count: "Users"
       bio: "About Group"
       selector_placeholder: "enter username"
       owner: "owner"
       index:
         title: "Groups"
+        all: "All Groups"
         empty: "There are no visible groups."
+        filter: "Filter by group type"
         all_groups: "All Groups"
         owner_groups: "Groups I am an owner of"
-        close_groups: "Close Groups"
+        close_groups: "Closed Groups"
         automatic_groups: "Automatic Groups"
+        automatic: "Automatic"
+        closed: "Closed"
+        public: "Public"
+        private: "Private"
         public_groups: "Public Groups"
+        automatic_group: Automatic Group
+        close_group: Close Group
         my_groups: "My Groups"
+        group_type: "Group type"
+        is_group_user: "Member"
+        is_group_owner: "Owner"
       title:
         one: "Group"
         other: "Groups"
       activity: "Activity"
-      add_members:
-        title: "Add Members"
-        description: "Manage the membership of this group"
-        usernames: "Usernames"
-        as_owner: "Set user(s) as owner(s) of this group"
       members:
         title: "Members"
         filter_placeholder_admin: "username or email"
@@ -479,17 +493,12 @@ en:
         make_owner_description: "Make <b>%{username}</b> an owner of this group"
         remove_owner: "Remove as Owner"
         remove_owner_description: "Remove <b>%{username}</b> as an owner of this group"
+        owner: "Owner"
       topics: "Topics"
       posts: "Posts"
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Default notification level for group messages"
-      visibility_levels:
-        title: "Who can see this group?"
-        public: "Everyone"
-        members: "Group owners, members and admins"
-        staff: "Group owners and staff"
-        owners: "Group owners and admins"
       alias_levels:
         mentionable: "Who can @mention this group?"
         messageable: "Who can message this group?"
@@ -498,9 +507,6 @@ en:
         mods_and_admins: "Only moderators and Admins"
         members_mods_and_admins: "Only group members, moderators and admins"
         everyone: "Everyone"
-      trust_levels:
-        title: "Trust level automatically granted to members when they're added:"
-        none: "None"
       notifications:
         watching:
           title: "Watching"
@@ -525,7 +531,6 @@ en:
       flair_color_placeholder: "(Optional) Hex color value"
       flair_preview_icon: "Preview Icon"
       flair_preview_image: "Preview Image"
-      flair_note: "Note: Flair will only show for a user's primary group."
 
     user_action_groups:
       "1": "Likes Given"
@@ -604,6 +609,7 @@ en:
       activity_stream: "Activity"
       preferences: "Preferences"
       expand_profile: "Expand"
+      collapse_profile: "Collapse"
       bookmarks: "Bookmarks"
       bio: "About me"
       invited_by: "Invited By"
@@ -992,6 +998,7 @@ en:
         header_title: "profile, messages, bookmarks and preferences"
       title:
         title: "Title"
+        none: "(none)"
 
       filters:
         all: "All"
@@ -1228,7 +1235,12 @@ en:
       no_content: No matches found
       filter_placeholder: Search...
       create: "Create: '{{content}}'"
-      max_content_reached: "You can only select {{count}} items."
+      max_content_reached:
+        one: "You can only select {{count}} item."
+        other: "You can only select {{count}} items."
+      min_content_not_reached:
+        one: "Select at least {{count}} item."
+        other: "Select at least {{count}} items."
 
     emoji_picker:
       filter_placeholder: Search for emoji
@@ -1291,6 +1303,7 @@ en:
         post_length: "Post must be at least {{min}} characters"
         try_like: 'Have you tried the <i class="fa fa-heart"></i> button?'
         category_missing: "You must choose a category"
+        tags_missing: "You must choose at least {{count}} tags"
 
       save_edit: "Save Edit"
       reply_original: "Reply on Original Topic"
@@ -1301,6 +1314,7 @@ en:
       create_pm: "Message"
       create_whisper: "Whisper"
       create_shared_draft: "Create Shared Draft"
+      edit_shared_draft: "Edit Shared Draft"
       title: "Or press Ctrl+Enter"
 
       users_placeholder: "Add a user"
@@ -1312,6 +1326,7 @@ en:
       remove_featured_link: "Remove link from topic."
       reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images."
       reply_placeholder_no_images: "Type here. Use Markdown, BBCode, or HTML to format."
+      reply_placeholder_choose_category: "You must select a category before typing here."
       view_new_post: "View your new post."
       saving: "Saving"
       saved: "Saved!"
@@ -1415,23 +1430,6 @@ en:
           one: "{{count}} message in your {{group_name}} inbox"
           other: "{{count}} messages in your {{group_name}} inbox"
 
-      alt:
-        mentioned: "Mentioned by"
-        quoted: "Quoted by"
-        replied: "Replied"
-        posted: "Post by"
-        edited: "Edit your post by"
-        liked: "Liked your post"
-        private_message: "Personal message from"
-        invited_to_private_message: "Invited to a personal message from"
-        invited_to_topic: "Invited to a topic from"
-        invitee_accepted: "Invite accepted by"
-        moved_post: "Your post was moved by"
-        linked: "Link to your post"
-        granted_badge: "Badge granted"
-        group_message_summary: "Messages in group inbox"
-        topic_reminder: "A reminder"
-
       popup:
         mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
@@ -1468,8 +1466,8 @@ en:
       clear_all: "Clear All"
       too_short: "Your search term is too short."
       result_count:
-        one: "1 result for <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} results for <span class='term'>{{term}}</span>"
+        one: "<span>1 result for</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} results for</span><span class='term'>{{term}}</span>"
       title: "search topics, posts, users, or categories"
       no_results: "No results found."
       no_more_results: "No more results found."
@@ -2270,6 +2268,7 @@ en:
       default_position: "Default Position"
       position_disabled: "Categories will be displayed in order of activity. To control the order of categories in lists, "
       position_disabled_click: 'enable the "fixed category positions" setting.'
+      minimum_required_tags: 'Minimum number of tags required in a topic:'
       parent: "Parent Category"
       notifications:
         watching:
@@ -2662,6 +2661,7 @@ en:
         save: "Save"
         delete: "Delete"
         confirm_delete: "Are you sure you want to delete this tag group?"
+        visible_only_to_staff: "Tags are visible only to staff"
 
       topics:
         none:
@@ -2797,6 +2797,9 @@ en:
         more: "(more replies...)"
         suspend_user: "Suspend User"
         suspend_user_title: "Suspend user for this post"
+        replies:
+          one: "[1 reply]"
+          other: "[%{count} replies]"
 
         dispositions:
           agreed: "agreed"
@@ -2832,12 +2835,48 @@ en:
           notify_moderators: "custom"
 
       groups:
+        new:
+          title: "New Group"
+          create: "Create"
+          name:
+            too_short: "Group name is too short"
+            too_long: "Group name is too long"
+            checking: "Checking group name availability..."
+            available: "Group name is available"
+            not_available: "Group name is not available"
+            blank: "Group name cannot be blank"
+        bulk_add:
+          title: "Bulk Add to Group"
+          complete_users_not_added: "These users were not added (make sure they have an account):"
+          paste: "Paste a list of usernames or emails, one per line:"
+        add_members:
+          as_owner: "Set user(s) as owner(s) of this group"
+        manage:
+          interaction:
+            email: Email
+            incoming_email: "Custom incoming email address"
+            incoming_email_placeholder: "enter email address"
+            visibility: Visibility
+            visibility_levels:
+              title: "Who can see this group?"
+              public: "Everyone"
+              members: "Group owners, members and admins"
+              staff: "Group owners and staff"
+              owners: "Group owners and admins"
+          membership:
+            automatic: Automatic
+            trust_level: Trust Level
+            trust_levels_title: "Trust level automatically granted to members when they're added:"
+            trust_levels_none: "None"
+            automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
+            automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"
+            primary_group: "Automatically set as primary group"
+        name_placeholder: "Group name, no spaces, same as username rule"
         primary: "Primary Group"
         no_primary: "(no primary group)"
         title: "Groups"
         edit: "Edit Groups"
         refresh: "Refresh"
-        new: "New"
         about: "Edit your group membership and names here"
         group_members: "Group members"
         delete: "Delete"
@@ -2845,22 +2884,12 @@ en:
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_owner_confirm: "Remove owner privilege for '%{username}'?"
         add: "Add"
-        add_members: "Add members"
         custom: "Custom"
-        bulk_complete: "The users have been added to the group."
-        bulk_complete_users_not_added: "These users were not added (make sure they have an account):"
-        bulk: "Bulk Add to Group"
-        bulk_paste: "Paste a list of usernames or emails, one per line:"
-        bulk_select: "(select a group)"
         automatic: "Automatic"
-        automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:"
-        automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users"
-        default_title: "Default title for all users in this group"
-        primary_group: "Automatically set as primary group"
+        default_title: "Default title"
+        default_title_description: "will be applied to all users in the group"
         group_owners: Owners
         add_owners: Add owners
-        incoming_email: "Custom incoming email address"
-        incoming_email_placeholder: "enter email address"
         none_selected: "Select a group to get started"
         no_custom_groups: "Create a new custom group"
 
@@ -2920,6 +2949,18 @@ en:
         user_event:
           name: "User Event"
           details: "When a user logs in, logs out, is created, approved or updated."
+        group_event:
+          name: "Group Event"
+          details: "When a group is created, updated or destroyed."
+        category_event:
+          name: "Category Event"
+          details: "When a category is created, updated or destroyed."
+        tag_event:
+          name: "Tag Event"
+          details: "When a tag is created, updated or destroyed."
+        flag_event:
+          name: "Flag Event"
+          details: "When a flag is created, agreed, disagreed or deferred."
         delivery_status:
           title: "Delivery Status"
           inactive: "Inactive"
@@ -2961,6 +3002,7 @@ en:
         change_settings: "Change Settings"
         change_settings_short: "Settings"
         howto: "How do I install plugins?"
+        official: "Official Plugin"
 
       backups:
         title: "Backups"
@@ -3084,7 +3126,7 @@ en:
           add_upload: "Add Upload"
           upload_file_tip: "Choose an asset to upload (png, woff2, etc...)"
           variable_name: "SCSS var name:"
-          variable_name_invalid: "Invalid variable name. Only alphanumeric allowed. Must start with a letter."
+          variable_name_invalid: "Invalid variable name. Only alphanumeric allowed. Must start with a letter. Must be unique."
           upload: "Upload"
           child_themes_check: "Theme includes other child themes"
           css_html: "Custom CSS/HTML"
@@ -3332,6 +3374,7 @@ en:
             post_unlocked: "post unlocked"
             check_personal_message: "check personal message"
             disabled_second_factor: "disable Two Factor Authentication"
+            topic_published: "topic published"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 22a6031ac7..75a013f641 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -118,10 +118,11 @@ es:
       email: 'comparte este enlace por email'
     action_codes:
       public_topic: "hizo este tema público %{when}"
+      private_topic: "hizo este tema un mensaje personal %{when}"
       split_topic: "separó este tema %{when}"
       invited_user: "invitó a %{who} %{when}"
       invited_group: "invitó a %{who} %{when}"
-      user_left: "%{who} se han eliminado de este mensaje %{when}"
+      user_left: "%{who} se ha eliminado de este mensaje %{when}"
       removed_user: "eliminó a %{who} %{when}"
       removed_group: "eliminó a %{who} %{when}"
       autoclosed:
@@ -148,6 +149,8 @@ es:
     topic_admin_menu: "acciones de administrador para el tema"
     wizard_required: "¡Bienvenido a tu nuevo Discourse! Empezaremos con <a href='%{url}' data-auto-route='true'>el asistente de configuración</a>  ✨"
     emails_are_disabled: "Todos los emails salientes han sido desactivados por un administrador. No se enviará ninguna notificación por email."
+    bootstrap_mode_enabled: "Para facilitar el lanzamiento de tu nueva página, se ha activado el modo arranque. Todos los nuevos usuarios tendrán nivel de confianza 1 y se ha activado el email de resumen diario. Este modo se desactivará automáticamente cuando haya al menos %{min_users} usuarios registrados."
+    bootstrap_mode_disabled: "El modo de arranque se desactivará en las próximas 24 horas."
     themes:
       default_description: "Por defecto"
     s3:
@@ -171,6 +174,7 @@ es:
     not_implemented: "Esta característica no ha sido implementada aún, ¡lo sentimos!"
     no_value: "No"
     yes_value: "Sí"
+    submit: "Enviar"
     generic_error: "Lo sentimos, ha ocurrido un error."
     generic_error_with_reason: "Ha ocurrido un error: %{error}"
     sign_up: "Registrarse"
@@ -211,7 +215,7 @@ es:
       one: "{{count}} carácter"
       other: "{{count}} caracteres"
     suggested_topics:
-      title: "Temas Sugeridos"
+      title: "Temas sugeridos"
       pm_title: "Mensajes sugeridos"
     about:
       simple_title: "Acerca de"
@@ -225,7 +229,7 @@ es:
         last_30_days: "Últimos 30 días"
       like_count: "Me gusta"
       topic_count: "Temas"
-      post_count: "Posts"
+      post_count: "Mensajes"
       user_count: "Usuarios"
       active_user_count: "Usuarios activos"
       contact: "Contáctanos"
@@ -234,15 +238,24 @@ es:
       title: "Marcador"
       clear_bookmarks: "Quitar Marcadores"
       help:
-        bookmark: "Haz clic para guardar en marcadores el primer post de este tema"
+        bookmark: "Haz clic para guardar en marcadores el primer mensaje de este tema"
         unbookmark: "Haz clic para quitar todos los marcadores de este tema"
     bookmarks:
-      not_logged_in: "Lo sentimos, debes iniciar sesión para guardar posts en marcadores."
-      created: "has guardado este post en marcadores"
+      not_logged_in: "lo sentimos, debes iniciar sesión para guardar mensajes en tus marcadores"
+      created: "has guardado este mensaje en marcadores"
       not_bookmarked: "has leído este post, haz clic para guardarlo en marcadores"
       last_read: "este es el último post que has leído; haz clic para guardarlo en marcadores"
       remove: "Eliminar marcador"
       confirm_clear: "¿Seguro que deseas borrar todos los marcadores de este tema?"
+    topic_count_latest:
+      one: "Ver {{count}} tema nuevo o actualizado"
+      other: "Ver {{count}} temas nuevos o actualizados"
+    topic_count_unread:
+      one: "Ver {{count}} tema sin leer"
+      other: "Ver {{count}} temas sin leer"
+    topic_count_new:
+      one: "Ver {{count}} tema nuevo"
+      other: "Ver {{count}} temas nuevos"
     preview: "vista previa"
     cancel: "cancelar"
     save: "Guardar cambios"
@@ -255,6 +268,7 @@ es:
     pasting: "Copiando..."
     enable: "Activar"
     disable: "Desactivar"
+    continue: "Continuar"
     undo: "Deshacer"
     revert: "Revertir"
     failed: "Falló"
@@ -277,18 +291,18 @@ es:
       none: "No hay posts para revisar."
       edit: "Editar"
       cancel: "Cancelar"
-      view_pending: "ver posts pendientes"
+      view_pending: "ver mensajes pendientes"
       has_pending_posts:
         one: "Este tema tiene <b>1</b> post esperando aprobación"
-        other: "Este tema tiene <b>{{count}}</b> posts esperando aprobación"
+        other: "Este tema tiene <b>{{count}}</b> mensajes esperando aprobación"
       confirm: "Guardar cambios"
-      delete_prompt: "¿Seguro que quieres eliminar a <b>%{username}</b>? Se eliminarán todos sus posts y se bloqueará su email y dirección IP."
+      delete_prompt: "¿Seguro que quieres eliminar a <b>%{username}</b>? Se eliminarán todos sus mensajes y se bloqueará su email y dirección IP."
       approval:
-        title: "El post necesita aprobación"
-        description: "Hemos recibido tu nuevo post pero necesita ser aprobado por un moderador antes de aparecer. Por favor, ten paciencia."
+        title: "El mensaje necesita aprobación"
+        description: "Hemos recibido tu nuevo mensaje pero necesita ser aprobado por un moderador antes de aparecer. Por favor, ten paciencia."
         pending_posts:
           one: "Tienes <strong>1</strong> post pendiente."
-          other: "Tienes <strong>{{count}}</strong> posts pendientes."
+          other: "Tienes <strong>{{count}}</strong> mensajes pendientes."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicó <a href='{{topicUrl}}'>el tema</a>"
@@ -320,7 +334,7 @@ es:
       days_visited: "Visitas"
       days_visited_long: "Días visitados"
       posts_read: "Leídos"
-      posts_read_long: "Posts leídos"
+      posts_read_long: "Mensajes leídos"
       total_rows:
         one: "1 usuario"
         other: "%{count} usuarios"
@@ -332,22 +346,35 @@ es:
         make_user_group_owner: "Convertir en dueño"
         remove_user_as_group_owner: "Quitar de dueño"
     groups:
-      logs:
-        title: "Registros"
-        when: "Cuándo"
-        action: "Acción"
-        acting_user: "Usuario que actuó"
-        target_user: "Usuario objetivo"
-        subject: "Asunto"
-        details: "Detalles"
-        from: "De"
-        to: "A"
-      edit:
-        title: 'Editar grupo'
+      add_members:
+        title: "Añadir miembros"
+        description: "Gestionar los miembros de este grupo"
+        usernames: "Nombres de usuari"
+      manage:
+        title: 'Gestionar'
+        name: 'Nombre'
         full_name: 'Nombre completo'
         add_members: "Añadir miembros"
         delete_member_confirm: "¿Quitar a '%{username}' del grupo '%{group}'?"
-      name_placeholder: "Nombre del grupo, sin espacios, igual que los nombres de usuarios"
+        profile:
+          title: Perfil
+        interaction:
+          title: Interacción
+          posting: Publicaciones
+          notification: Notificación
+        membership:
+          title: Membresía
+          access: Acceso
+        logs:
+          title: "Registros"
+          when: "Cuándo"
+          action: "Acción"
+          acting_user: "Usuario origen"
+          target_user: "Usuario objetivo"
+          subject: "Sujeto"
+          details: "Detalles"
+          from: "De"
+          to: "A"
       public_admission: "Permitir a los usuarios unirse al grupo cuando quieran (Requiere que el grupo sea visible)"
       public_exit: "Permitir a los usuarios dejar el grupo libremente"
       empty:
@@ -358,12 +385,10 @@ es:
         topics: "No hay temas de miembros de este grupo."
         logs: "No hay registros para este grupo."
       add: "Añadir"
-      join: "Unirse al grupo"
-      leave: "Salir del grupo"
-      request: "Solicitar unirse al grupo"
+      join: "Unirse"
+      leave: "Abandonar"
+      request: "Solicitar"
       message: "Mensaje"
-      automatic_group: Grupo automático
-      is_group_user: "Eres miembro de este grupo"
       allow_membership_requests: "Permitir a los usuarios solicitudes para ser miembro a los dueños del grupo"
       membership_request_template: "Template personalizado para mostrar a los usuarios cuando envían una solicitud de membresía"
       membership_request:
@@ -372,26 +397,51 @@ es:
         reason: "Permitir a los propietarios del grupo saber por qué perteneces a este grupo"
       membership: "Membresía"
       name: "Nombre"
+      group_name: "Nombre del grupo"
+      user_count: "Usuarios"
       bio: "Acerca del grupo"
+      selector_placeholder: "introducir nombre de usuario"
       owner: "propietario"
       index:
         title: "Grupos"
+        all: "Todos los grupos"
         empty: "No hay grupos visibles."
+        filter: "Filtrar por tipo de grupo"
+        all_groups: "Todos los grupos"
+        owner_groups: "Grupos de los que soy dueño"
+        close_groups: "Grupos cerrados"
+        automatic_groups: "Grupos automáticos"
+        automatic: "Automático"
+        closed: "Cerrado"
+        public: "Público"
+        private: "Privado"
+        public_groups: "Grupos públicos"
+        automatic_group: Grupos automáticos
+        close_group: Cerrar grupo
+        my_groups: "Mis grupos"
+        group_type: "Tipo de grupo"
+        is_group_user: "Miembro"
+        is_group_owner: "Dueño"
       title:
         one: "Grupo"
         other: "Grupos"
       activity: "Actividad"
+      members:
+        title: "Miembros"
+        filter_placeholder_admin: "nombre de usuario o email"
+        filter_placeholder: "nombre de usuario"
+        remove_member: "Quitar miembro"
+        remove_member_description: "Quitar a <b>%{username}</b> de este grupo"
+        make_owner: "Convertir en dueño"
+        make_owner_description: "Hacer a <b>%{username}</b> un dueño de este grupo"
+        remove_owner: "Quitar de dueño"
+        remove_owner_description: "Quitar a <b>%{username}</b> sus poderes de dueño de este grupo"
+        owner: "Dueño"
       topics: "Temas"
-      posts: "Posts"
+      posts: "Mensajes"
       mentions: "Menciones"
       messages: "Mensajes"
       notification_level: "Nivel de notificación por defecto para mensajes en grupo"
-      visibility_levels:
-        title: "¿Quién puede ver este grupo?"
-        public: "Todos"
-        members: "Propietarios del grupo, miembros y administradores"
-        staff: "Propietarios del grupo, y staff"
-        owners: "Propietarios del grupo y administradores"
       alias_levels:
         mentionable: "¿Quién puede @mencionar este grupo?"
         messageable: "¿Quién puede mensajear este grupo?"
@@ -400,13 +450,10 @@ es:
         mods_and_admins: "Solo moderadores y administradores"
         members_mods_and_admins: "Solo miembros del grupo, moderadores y administradores"
         everyone: "Todos"
-      trust_levels:
-        title: "Nivel de confianza entregado automáticamente a miembros cuando son añadidos:"
-        none: "Ninguno"
       notifications:
         watching:
           title: "Vigilando"
-          description: "Se te notificará de cada nuevo post en este mensaje y se mostrará un contador de nuevos posts."
+          description: "Se te notificará de cada nuevo mensaje de esta conversación y se mostrará un contador de respuestas sin leer."
         watching_first_post:
           title: "Vigilar Primer Post"
           description: "Sólo se te notificará del primer post en cada nuevo tema en este grupo."
@@ -427,7 +474,6 @@ es:
       flair_color_placeholder: "(Opcional) Valor del color en hexadecimal"
       flair_preview_icon: "Previsualización del icono"
       flair_preview_image: "Previsualización de la imagen"
-      flair_note: "Nota: el sub-avatar solo se mostrará para el grupo primario del usuario."
     user_action_groups:
       '1': "'Me gusta' Dados"
       '2': "'Me gusta' Recibidos"
@@ -492,15 +538,16 @@ es:
       edit: "Editar Preferencias"
       download_archive:
         button_text: "Descargar todos"
-        confirm: "¿Seguro que quieres descargar tus posts?"
+        confirm: "¿Seguro que quieres descargar tus mensajes?"
         success: "Descarga iniciada, se te notificará por mensaje cuando el proceso se haya completado."
-        rate_limit_error: "Los posts pueden ser descargados una vez por día, por favor, inténtalo de nuevo mañana."
+        rate_limit_error: "Los mensajes pueden ser descargados una vez por día, por favor, inténtalo de nuevo mañana."
       new_private_message: "Nuevo mensaje"
       private_message: "Mensaje"
       private_messages: "Mensajes"
       activity_stream: "Actividad"
       preferences: "Preferencias"
       expand_profile: "Expandir"
+      collapse_profile: "Colapsar"
       bookmarks: "Marcadores"
       bio: "Acerca de mí"
       invited_by: "Invitado Por"
@@ -543,7 +590,7 @@ es:
         instructions: |
           Esta opción sobreescribe el resumen de actividad.<br />
           Los temas y categorías silenciadas no se incluyen en estos emails.
-        individual: "Enviar un email por cada nuevo post"
+        individual: "Enviarme un email por cada nuevo mensaje"
         individual_no_echo: "Envíame un email por cada nuevo post excepto los publicados por mí"
         many_per_day: "Enviarme un email por cada nuevo post (unos {{dailyEmailEstimate}} por día)"
         few_per_day: "Enviarme un email por cada nuevo post (unos 2 por día)"
@@ -560,7 +607,7 @@ es:
       tracked_categories_instructions: "Seguirás automáticamente todos los temas en estas categorías. Aparecerá un contador de nuevos posts al lado del tema."
       watched_first_post_categories: "Vigilar Primer Post"
       watched_first_post_categories_instructions: "Se te notificará del primer post de cada nuevo tema en estas categorías."
-      watched_first_post_tags: "Vigilando Primer Post"
+      watched_first_post_tags: "Vigilando primer post"
       watched_first_post_tags_instructions: "Se te notificará del primer post en cada nuevo tema con estas etiquetas."
       muted_categories: "Silenciado"
       muted_categories_instructions: "No serás notificado de ningún tema en estas categorías, y no aparecerán en la página de mensajes recientes."
@@ -602,6 +649,7 @@ es:
         move_to_archive: "Archivar"
         failed_to_move: "No se han podido mover los mensajes seleccionados (puede haber problemas de conexión)"
         select_all: "Seleccionar todo"
+        tags: "Etiquetas"
       preferences_nav:
         account: "Cuenta"
         profile: "Perfil"
@@ -619,6 +667,19 @@ es:
         set_password: "Establecer contraseña"
         choose_new: "Escoge una nueva contraseña"
         choose: "Escoge una contraseña"
+      second_factor:
+        title: "Verificación en dos pasos"
+        disable: "Verificación en dos pasos"
+        enable: "para mejorar la seguridad de tu cuenta"
+        confirm_password_description: "Por favor, confirma tu contraseña para continuar"
+        label: "Código"
+        enable_description: |
+          Escanea este código QR en una aplicación compatible (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – Windows Phone<a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>) e introduce el código de verificación recibido.
+        disable_description: "Por favor, introduce el código de verificación de tu aplicación"
+        show_key_description: "Introducir manualmente"
+        extended_description: |
+          La verificación en dos pasos añade una capa extra de seguridad a tu cuenta haciendo que, para iniciar sesión, tengas que introducir un código de un solo uso además de tu contraseña. Los códigos se generan en aplicaciones para dispositivos móviles en <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a> y <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>.
+        oauth_enabled_warning: "Ten en cuenta que se desactivarán los inicios de sesión con cuentas sociales cuando actives la verificación en dos pasos en tu cuenta."
       change_about:
         title: "Cambiar 'Acerca de mí'"
         error: "Hubo un error al cambiar este valor."
@@ -650,7 +711,7 @@ es:
         title: "Fondo de perfil"
         instructions: "Fondos de perfil serán centrados y tendrán un ancho por default de 850px."
       change_card_background:
-        title: "Fondo de Tarjeta de Usuario"
+        title: "Fondo de la tarjeta de usuario"
         instructions: "Imágenes de fondo serán centrados y tendrán un ancho por default de 590px."
       email:
         title: "E-mail"
@@ -693,8 +754,8 @@ es:
       log_out: "Cerrar sesión"
       location: "Ubicación"
       card_badge:
-        title: "Distintivo de Tarjeta de Usuario"
-      website: "Sitio Web"
+        title: "Distintivo de la tarjeta de usuario"
+      website: "Sitio web"
       email_settings: "E-mail"
       like_notification_frequency:
         title: "Notificar cuando me dan Me gusta"
@@ -747,6 +808,7 @@ es:
         title: "Invitaciones"
         user: "Invitar Usuario"
         sent: "Enviadas"
+        none: "Ninguna invitación que mostrar."
         truncated:
           one: "Mostrando la primera invitación."
           other: "Mostrando las primeras {{count}} invitaciones."
@@ -774,7 +836,7 @@ es:
         days_visited: "Días Visitados"
         account_age_days: "Antigüedad de la cuenta en días"
         create: "Enviar una Invitación"
-        generate_link: "Copiar Enlace de Invitación"
+        generate_link: "Copiar enlace de invitación"
         link_generated: "¡Enlace de invitación generado satisfactoriamente!"
         valid_for: "El enlace de invitación sólo es válido para esta dirección: %{email}"
         bulk_invite:
@@ -844,6 +906,7 @@ es:
         header_title: "perfil, mensajes, marcadores y preferencias"
       title:
         title: "Título"
+        none: "(ninguno)"
       filters:
         all: "Todos"
       stream:
@@ -943,7 +1006,7 @@ es:
     search_hint: 'usuario, email o dirección IP'
     create_account:
       disclaimer: "Al registrarte, aceptas la <a href='{{privacy_link}}'>política de privacidad</a> y los <a href='{{tos_link}}'>términos de servicio</a>."
-      title: "Crear Cuenta Nueva"
+      title: "Crear cuenta nueva"
       failed: "Algo ha salido mal, tal vez este e-mail ya fue registrado, intenta con el enlace 'olvidé la contraseña'"
     forgot_password:
       title: "Restablecer contraseña"
@@ -959,14 +1022,26 @@ es:
       help: "¿No llegó el email? Asegúrese de chequear primero su carpeta de correo no deseado. <p>¿No estás seguro de qué email usaste? Ingrese su email y le avisaremos si existe aquí.</p><p>Si no tienes acceso al email de tu cuenta, por favor contacta <a href='/about'>a nuestro staff.</a></p>"
       button_ok: "OK"
       button_help: "Ayuda"
+    email_login:
+      link_label: "Enviar un enlace para iniciar sesión por email"
+      button_label: "por email"
+      complete_username: "Si alguna cuenta coincide con el nombre de usuario <b>%{username}</b> recibirá un email con un enlace para iniciar sesión en unos instantes."
+      complete_email: "Si coincide alguna cuenta con el email <b>%{email}</b> enviaremos un mensaje con un enlace para iniciar sesión en unos instantes"
+      complete_username_found: "Hemos encontrado una cuenta que coincide con el nombre de usuario <b>%{username}</b>. Recibirá un email dentro de poco con un enlace para iniciar sesión."
+      complete_email_found: "Hemos encontrado una cuenta que coincide con <b>%{email}</b>, recibirá un email con un enlace para iniciar sesión en unos instantes."
+      complete_username_not_found: "Ninguna cuenta coincide con el nombre de usuario <b>%{username}</b>"
+      complete_email_not_found: "Ninguna cuenta coincide con <b>%{email}</b>"
     login:
-      title: "Iniciar Sesión"
+      title: "Iniciar sesión"
       username: "Usuario"
       password: "Contraseña"
+      second_factor_title: "Verificación en dos pasos"
+      second_factor_description: "Por favor, introduce el código de verificación de tu aplicación:"
       email_placeholder: "dirección de e-mail o nombre de usuario"
       caps_lock_warning: "Está activado Bloqueo de Mayúsculas"
       error: "Error desconocido"
       rate_limit: "Por favor, espera un poco antes de volver a intentar iniciar sesión."
+      blank_username: "Por favor, introduce tu email o nombre de usuario."
       blank_username_or_password: "Por favor, introducir tu e-mail o usuario, y tu contraseña."
       reset_password: 'Restablecer Contraseña'
       logging_in: "Iniciando Sesión..."
@@ -979,6 +1054,7 @@ es:
       not_allowed_from_ip_address: "No puedes iniciar sesión desde esa dirección IP."
       admin_not_allowed_from_ip_address: "No puedes iniciar sesión como admin desde esta dirección IP."
       resend_activation_email: "Has clic aquí para enviar el email de activación nuevamente."
+      omniauth_disallow_totp: "Tu cuenta tiene activada la verificación en dos pasos. Por favor, inicia sesión con tu contraseña."
       resend_title: "Volver a enviar email de activación"
       change_email: "Cambiar dirección de email"
       provide_new_email: "Poner un nuevo email, y te reenviaremos una confirmación de email."
@@ -1034,6 +1110,7 @@ es:
       categories_only: "Sólo categorías"
       categories_with_featured_topics: "Categorías y temas destacados"
       categories_and_latest_topics: "Categorías y temas recientes"
+      categories_and_top_topics: "Categorías y temas top"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -1042,23 +1119,31 @@ es:
       default_header_text: Seleccionar...
       no_content: Ninguna coincidencia encontrada
       filter_placeholder: Buscar...
+      create: "Crear: `{{content}}'"
     emoji_picker:
       filter_placeholder: Buscar emoji
-      people: People
-      nature: Nature
-      food: Food
-      activity: Activity
-      travel: Travel
-      objects: Objects
-      celebration: Celebration
+      people: Personas
+      nature: Naturaleza
+      food: Comida
+      activity: Actividad
+      travel: Viajes
+      objects: Objetos
+      celebration: Celebraciones
       custom: Emojis personalizados
-      recent: Recientemente usados
+      recent: Utilizados recientemente
       default_tone: Sin tono de piel
       light_tone: Tono de piel claro
       medium_light_tone: Tono de piel medio claro
       medium_tone: Tono de piel medio
       medium_dark_tone: Tono de piel medio oscuro
       dark_tone: Tono de piel oscuro
+    shared_drafts:
+      title: "Borradores compartidos"
+      notice: "Este tema es solo visible para los que puedan ver la categoría <b>{{category}}</b>."
+      destination_category: "Categoría de destino"
+      publish: "Publicar borrador compartido"
+      confirm_publish: "¿Seguro de que quieres publicar este borrador?"
+      publishing: "Publicando tema..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "más..."
@@ -1099,6 +1184,8 @@ es:
       create_topic: "Crear tema"
       create_pm: "Mensaje"
       create_whisper: "Susurrar"
+      create_shared_draft: "Crear borrador compartido"
+      edit_shared_draft: "Editar borrador compartido"
       title: "O pulsa Ctrl+Intro"
       users_placeholder: "Añadir usuario"
       title_placeholder: "En una frase breve, ¿de qué trata este tema?"
@@ -1138,6 +1225,7 @@ es:
       olist_title: "Lista numerada"
       ulist_title: "Lista con viñetas"
       list_item: "Lista de ítems"
+      toggle_direction: "Cambiar dirección"
       help: "Ayuda de Edición con Markdown"
       collapse: "minimizar el panel de edición"
       abandon: "cerrar el editor y descartar borrador"
@@ -1148,6 +1236,27 @@ es:
         title: "¿Olvidaste añadir destinatarios?"
         body: "¡Vas a enviarte este mensaje a ti mismo!"
       admin_options_title: "Opciones de moderación para este tema"
+      composer_actions:
+        reply_to_post:
+          label: Responder al mensaje %{postNumber} por %{postUsername}
+          desc: Responder a un mensaje específico
+        reply_as_new_topic:
+          label: Responder como tema enlazado
+          desc: Crear un nuevo tema enlazado a este
+        reply_as_private_message:
+          label: Nuevo mensaje
+          desc: Crear un nuevo mensaje personal
+        reply_to_topic:
+          label: Responder al tema
+          desc: Responder al tema, sin responder a un mensaje en concreto
+        toggle_whisper:
+          label: Activar/desactivar susurro
+          desc: Los susurros solo son visibles para miembros del staff
+        create_topic:
+          label: "Nuevo tema"
+        shared_draft:
+          label: "Borrador compartido"
+          desc: "Empieza un borrador que solo será visible para el staff"
     notifications:
       tooltip:
         regular:
@@ -1178,28 +1287,12 @@ es:
       invitee_accepted: "<span>{{username}}</span> ha aceptado tu invitación"
       moved_post: "<span>{{username}}</span> movió {{description}}"
       linked: "<span>{{username}}</span> {{description}}"
-      granted_badge: "Ganó '{{description}}'"
+      granted_badge: "Ganaste '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nuevo Tema</span> {{description}}"
       group_message_summary:
         one: "{{count}} mensaje en tu bandeja de {{group_name}}"
         other: "{{count}} mensajes en tu bandeja de {{group_name}} "
-      alt:
-        mentioned: "Mencionado por"
-        quoted: "Citado por"
-        replied: "Respondido"
-        posted: "Publicado por"
-        edited: "Editado tu post por"
-        liked: "Gustado tu post"
-        private_message: "Mensaje personal de"
-        invited_to_private_message: "Invitado a un mensaje personal de"
-        invited_to_topic: "Invitado a un tema de"
-        invitee_accepted: "Invitación aceptada por"
-        moved_post: "Tu post fue eliminado por"
-        linked: "Enlace a tu post"
-        granted_badge: "Distintivo concedido"
-        group_message_summary: "Mensajes en la bandeja del grupo"
-        topic_reminder: "Un recordatorio"
       popup:
         mentioned: '{{username}} te mencionó en "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} te ha mencionado en "{{topic}}" - {{site_title}}'
@@ -1217,7 +1310,7 @@ es:
       remote_tip_with_attachments: "enlace a imagen o archivo {{authorized_extensions}}"
       local_tip: "selecciona las imágenes desde tu dispositivo"
       local_tip_with_attachments: "selecciona imágenes o archivos desde tu dispositivo {{authorized_extensions}}"
-      hint: "(también puedes arrastrarlos al editor para subirlos)"
+      hint: "(también puedes arrastrarlas y soltarlas en el editor para subirlas)"
       hint_for_supported_browsers: "puedes también arrastrar o pegar imágenes en el editor"
       uploading: "Subiendo"
       select_file: "Selecciona Archivo"
@@ -1233,9 +1326,6 @@ es:
       select_all: "Seleccionar todo"
       clear_all: "Limpiar todo"
       too_short: "El término de búsqueda es demasiado corto."
-      result_count:
-        one: "1 resultado para <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} resultados para <span class='term'>{{term}}</span>"
       title: "buscar temas, posts, usuarios o categorías"
       no_results: "No se ha encontrado ningún resultado."
       no_more_results: "No se encontraron más resultados."
@@ -1372,6 +1462,9 @@ es:
       move_to_inbox:
         title: 'Mover a la bandeja de entrada'
         help: 'Restaurar mensaje a la bandeja de entrada'
+      edit_message:
+        help: 'Editar el primer mensaje'
+        title: 'Editar mensaje'
       list: 'Temas'
       new: 'nuevo tema'
       unread: 'sin leer'
@@ -1419,7 +1512,7 @@ es:
       deleted: "El tema ha sido borrado"
       topic_status_update:
         title: "Temporizador de Temas"
-        save: "Configurar Temporizador"
+        save: "Configurar temporizador"
         num_of_hours: "Número de horas:"
         remove: "Quitar Temporizador"
         publish_to: "Publicar el:"
@@ -1495,10 +1588,10 @@ es:
           '3_2': 'Recibirás notificaciones porque estás vigilando este tema.'
           '3_1': 'Recibirás notificaciones porque creaste este tema.'
           '3': 'Recibirás notificaciones porque estás vigilando este tema.'
-          '2_8': 'Tú verás la cuenta de nuevas respuestas porque estás siguiendo esta categoría.'
-          '2_4': 'Tú verás la cuenta de nuevas respuestas porque has publicado una respuesta en este tema.'
-          '2_2': 'Tú verás la cuenta de nuevas respuestas porque estás siguiendo este tema.'
-          '2': 'Tú verás la cuenta de nuevas respuestas porque has <a href="/u/{{username}}/preferences">leído este tema</a>.'
+          '2_8': 'Verás la cuenta de nuevas respuestas porque estás siguiendo esta categoría.'
+          '2_4': 'Verás la cuenta de nuevas respuestas porque has publicado una respuesta en este tema.'
+          '2_2': 'Verás la cuenta de nuevas respuestas porque estás siguiendo este tema.'
+          '2': 'Verás la cuenta de nuevas respuestas porque has <a href="/u/{{username}}/preferences">leído este tema</a>.'
           '1_2': 'Se te notificará solo si alguien menciona tu @nombre o te responde a un post.'
           '1': 'Se te notificará si alguien menciona tu @nombre o te responde a un post.'
           '0_7': 'Estás ignorando todas las notificaciones en esta categoría.'
@@ -1534,11 +1627,11 @@ es:
         open: "Abrir tema"
         close: "Cerrar tema"
         multi_select: "Seleccionar posts..."
-        timed_update: "Configurar Temporizador de temas..."
+        timed_update: "Configurar temporizador de temas..."
         pin: "Destacar tema..."
         unpin: "Dejar de destacar..."
-        unarchive: "Desarchivar Tema"
-        archive: "Archivar Tema"
+        unarchive: "Desarchivar tema"
+        archive: "Archivar tema"
         invisible: "Hacer invisible"
         visible: "Hacer visible"
         reset_read: "Restablecer datos de lectura"
@@ -1656,11 +1749,11 @@ es:
           other: "Por favor escoge el nuevo dueño de los {{count}} posts de <b>{{old_user}}</b>."
         instructions_warn: "Ten en cuenta que las notificaciones sobre este post no serán transferidas al nuevo usuario de forma retroactiva.<br>Aviso: actualmente, los datos que no dependen del post son transferidos al nuevo usuario. Usar con precaución."
       change_timestamp:
-        title: "Cambiar Timestamp..."
-        action: "cambiar timestamp"
-        invalid_timestamp: "El Timestamp no puede ser futuro"
-        error: "Hubo un error cambiando el timestamp de este tema."
-        instructions: "Por favor, señecciona el nuevo timestamp del tema. Los posts en el tema serán actualizados para mantener la diferencia de tiempo."
+        title: "Cambiar fecha..."
+        action: "cambiar fecha"
+        invalid_timestamp: "La fecha no puede ser futura"
+        error: "Ha ocurrido un error al cambiar la fecha de este tema."
+        instructions: "Por favor, selecciona una nueva fecha para el tema. Los mensajes en el tema serán actualizados para mantener la diferencia de tiempo."
       multi_select:
         select: 'seleccionar'
         selected: 'seleccionado ({{count}})'
@@ -1950,6 +2043,7 @@ es:
       email_in_disabled: "La posibilidad de publicar nuevos temas por email está deshabilitada en los ajustes del sitio. Para habilitar la publicación de nuevos temas por email,"
       email_in_disabled_click: 'activa la opción "email in".'
       mailinglist_mirror: "La categoría refleja una lista de correo"
+      suppress_from_latest: "Ocultar categoría de los temas recientes."
       show_subcategory_list: "Mostrar la lista de subcategorías arriba de la lista de temas en esta categoría."
       num_featured_topics: "Número de temas a mostrar en la página de categorías:"
       subcategory_num_featured_topics: "Número de temas destacados a mostrar en la página superior de categorías:"
@@ -2219,6 +2313,7 @@ es:
         dismiss_topics: '<b>x</b>, <b>t</b> Descartar temas'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Cerrar sesión'
       composing:
+        title: 'Editor'
         return: '<b>shift</b>+<b>c</b> Volver al editor'
       actions:
         title: 'Acciones'
@@ -2260,6 +2355,7 @@ es:
         other: "%{count} concedidos"
       select_badge_for_title: Seleccionar una distinción para utilizar como tu título
       none: "(ninguno)"
+      successfully_granted: "%{badge} otorgada con éxito a %{username}"
       badge_grouping:
         getting_started:
           name: Primeros pasos
@@ -2287,7 +2383,7 @@ es:
       selector_no_tags: "sin etiquetas"
       changed: "etiquetas cambiadas:"
       tags: "Etiquetas"
-      choose_for_topic: "etiquetas opcionales"
+      choose_for_topic: "etiquetas (opcional)"
       delete_tag: "Eliminar etiqueta"
       delete_confirm:
         one: "¿Estás seguro de querer borrar esta etiqueta y eliminarla de 1 tema asignado?"
@@ -2308,15 +2404,19 @@ es:
       notifications:
         watching:
           title: "Vigilar"
+          description: "Vigilarás automáticamente todos los temas con esta etiqueta. Se te notificará de cada nuevo tema y mensaje, y, además, el contador de mensajes nuevos sin leer aparecerá junto al tema."
         watching_first_post:
           title: "Vigilar Primer Post"
+          description: "Solo se te notificará de cada primer mensaje por nuevo tema con esta etiqueta."
         tracking:
           title: "Seguir"
+          description: "Seguirás automáticamente todos los temas con esta etiqueta. Un contador de nuevos mensajes aparecerá junto a los temas."
         regular:
           title: "Normal"
           description: "Se te notificará solo si alguien te menciona con tu @usuario o responde a algún post tuyo."
         muted:
           title: "Silenciado"
+          description: "No se te notificará de nada relacionado con nuevos temas con esta etiqueta, y no aparecerán en tu pestaña de sin leer"
       groups:
         title: "Grupos de etiquetas"
         about: "Agregar etiquetas en grupos para administrarlas más fácilmente."
@@ -2330,6 +2430,7 @@ es:
         save: "Guardar"
         delete: "Eliminar"
         confirm_delete: "¿Seguro que quieres eliminar este grupo de etiquetas?"
+        visible_only_to_staff: "Etiquetas solo visibles para staff"
       topics:
         none:
           unread: "No hay temas que sigas y que no hayas leído ya."
@@ -2352,7 +2453,7 @@ es:
           bookmarks: "No hay más temas guardados en marcadores."
           search: "No hay más resultados de búsqueda."
     invite:
-      custom_message: "Darle a tu invitación un toque personal escribiendo un"
+      custom_message: "Dale a tu invitación un toque personal escribiendo un"
       custom_message_link: "mensaje personalizado"
       custom_message_placeholder: "Introducir un mensaje personalizado"
       custom_message_template_forum: "Hey, ¡quizá deberías unirte a este foro!"
@@ -2419,12 +2520,18 @@ es:
         active_posts: "Posts Reportados"
         old_posts: "Post reportados antiguos"
         topics: "Temas Reportados"
-        moderation_history: "Histórico de moderación"
+        moderation_history: "Registro de moderación"
         agree: "De acuerdo"
         agree_title: "Confirmar esta indicación como válido y correcto."
+        agree_flag_hide_post: "Ocultar mensaje"
         agree_flag_hide_post_title: "Ocultar este post y enviar automáticamente un mensaje al usuario para que lo edite de forma urgente"
         agree_flag_restore_post: "Coincidir y Restaurar Mensaje"
         agree_flag_restore_post_title: "Restaurar el post para que todos los usuarios puedan verlo."
+        agree_flag_suspend: "Suspender usuario"
+        agree_flag_suspend_title: "Coincidir con el reporte y suspender al usuario."
+        agree_flag_silence: "Silenciar usuario"
+        agree_flag_silence_title: "Coincidir con el reporte y silenciar al usuario."
+        agree_flag: "Mantener mensaje"
         agree_flag_title: "Estar de acuerdo con el reporte y mantener la publicación intacta."
         ignore_flag: "Ignorar"
         ignore_flag_title: "Quitar este reporte; no requiere tomar medidas en este momento."
@@ -2446,6 +2553,9 @@ es:
         more: "(más respuestas...)"
         suspend_user: "Suspender Usuario"
         suspend_user_title: "Suspender usuario de este post"
+        replies:
+          one: "[1 respuesta]"
+          other: "[%{count} respuestas]"
         dispositions:
           agreed: "coincidió"
           disagreed: "no coincidió"
@@ -2476,12 +2586,48 @@ es:
           notify_user: "personalizado"
           notify_moderators: "personalizado"
       groups:
+        new:
+          title: "Nuevo grupo"
+          create: "Crear"
+          name:
+            too_short: "El nombre del grupo es muy corto"
+            too_long: "El nombre del grupo es muy largo"
+            checking: "Comprobando disponibilidad del nombre del grupo..."
+            available: "El nombre del grupo está disponible"
+            not_available: "El nombre del grupo no está disponible"
+            blank: "El nombre del grupo no puede estar vacío"
+        bulk_add:
+          title: "Añadir en masa al grupo"
+          complete_users_not_added: "Los siguientes usuarios no han sido añadidos (asegúrate de que tengan cuenta):"
+          paste: "Pega una lista de nombres de usuario o emails, uno por línea:"
+        add_members:
+          as_owner: "Establecer usuario(s) como dueño(s) de este grupo"
+        manage:
+          interaction:
+            email: Email
+            incoming_email: "Dirección de email entrante personalizada"
+            incoming_email_placeholder: "introduce un email"
+            visibility: Visibilidad
+            visibility_levels:
+              title: "¿Quién puede ver este grupo?"
+              public: "Todo el mundo"
+              members: "Dueños del grupo, miembros y administradores"
+              staff: "Dueños del grupo y staff"
+              owners: "Dueños del grupo y administradores"
+          membership:
+            automatic: Automático
+            trust_level: Nivel de confianza
+            trust_levels_title: "Nivel de confianza asignado automáticamente a los miembros cuando son añadidos:"
+            trust_levels_none: "Ninguno"
+            automatic_membership_email_domains: "Los usuarios que se registren con un email cuyo dominio coincida exactamente con uno en esta lista serán añadidos automáticamente a este grupo:"
+            automatic_membership_retroactive: "Aplicar la misma regla de dominios de email para añadir usuarios ya registrados"
+            primary_group: "Establecer como grupo primario automáticamente"
+        name_placeholder: "Nombre del grupo, sin espacios, mismos requisitos que los nombres de usuario"
         primary: "Grupo principal"
         no_primary: "(ningún grupo principal)"
         title: "Grupos"
         edit: "Editar grupos"
         refresh: "Actualizar"
-        new: "Nuevo"
         about: "Edita los aquí los nombres de los grupos y sus miembros"
         group_members: "Miembros del grupo"
         delete: "Borrar"
@@ -2489,22 +2635,11 @@ es:
         delete_failed: "No se pudo borrar el grupo. Si este es un grupo automático, no se puede destruir."
         delete_owner_confirm: "¿Quitar privilegios de propietario para '%{username}'?"
         add: "Añadir"
-        add_members: "Añadir miembros"
         custom: "Personalizado"
-        bulk_complete: "Los usuarios han sido añadidos al grupo."
-        bulk_complete_users_not_added: "Estos usuarios no fueron agregados (asegurar que ellos tengan una cuenta):"
-        bulk: "Añadir al grupo en masa"
-        bulk_paste: "Pega una lista de nombres de usuario o emails, uno por línea:"
-        bulk_select: "(selecciona un grupo)"
         automatic: "Automático"
-        automatic_membership_email_domains: "Los usuarios que se registren con un dominio de e-mail que esté en esta lista serán automáticamente añadidos a este grupo:"
-        automatic_membership_retroactive: "Aplicar la misma regla de dominio de email para usuarios registrados existentes "
         default_title: "Título por defecto para todos los miembros en este grupo"
-        primary_group: "Establecer automáticamente como grupo principal"
         group_owners: Propietarios
         add_owners: Añadir propietarios
-        incoming_email: "Correos electrónicos entrantes personalizados"
-        incoming_email_placeholder: "introducir dirección de email"
         none_selected: "Selecciona un grupo para empezar"
         no_custom_groups: "Crear un nuevo grupo personalizado"
       api:
@@ -2562,6 +2697,15 @@ es:
         user_event:
           name: "Evento de usuario"
           details: "Cuando un usuario inicia sesión, la cierra o es creado, aprobado o actualizado."
+        group_event:
+          name: "Evento de grupo"
+          details: "Cuando se cree, actualice o borre un grupo."
+        category_event:
+          name: "Evento de categoría"
+          details: "Cuando se cree, actualice o borre una categoría."
+        tag_event:
+          name: "Evento de etiqueta"
+          details: "Cuando se cree, edite o borre una etiqueta."
         delivery_status:
           title: "Estado de entrega"
           inactive: "Inactivo"
@@ -2603,6 +2747,7 @@ es:
         change_settings: "Cambiar preferencias"
         change_settings_short: "Ajustes"
         howto: "¿Cómo instalo plugins?"
+        official: "Plugin oficial"
       backups:
         title: "Copia de seguridad"
         menu:
@@ -2626,6 +2771,7 @@ es:
           label: "Subir"
           title: "Subir un backup a esta instancia"
           uploading: "Subiendo..."
+          success: "'{{filename}}' subido con éxito. El archivo está siendo ahora procesado y tardará hasta un minuto en aparecer en la lista."
           error: "Ha ocurrido un error al subir el archivo '{{filename}}': {{message}}"
         operations:
           is_running: "Actualmente una operación se está procesando..."
@@ -2707,6 +2853,7 @@ es:
           common: "Común"
           desktop: "Escritorio"
           mobile: "Móvil"
+          settings: "Ajustes"
           preview: "Vista previa"
           is_default: "Theme habilitado por defecto"
           user_selectable: "Theme puede ser seleccionado por usuarios"
@@ -2719,6 +2866,7 @@ es:
           add_upload: "Agregar Subido"
           upload_file_tip: "Selecciona un archivo a subir (png, woff2, etc...)"
           variable_name: "Nombre de variable SCSS:"
+          variable_name_invalid: "Nombre de variable no válido. Solo se permiten caracteres alfanuméricos. Debe empezar con una letra y ser único."
           upload: "Subir"
           child_themes_check: "Theme incluye otros themes hijos"
           css_html: "Personalizar CSS/HTML"
@@ -2727,6 +2875,8 @@ es:
           delete_upload_confirm: "Borrar este upload? (El theme CSS puede dejar de funcionar!)"
           import_web_tip: "Repositorio que contiene el theme"
           import_file_tip: "archivo .dcstyle.json que contiene el theme"
+          is_private: "El tema está en un repositorio git privado"
+          public_key: "Permite el acceso al repositorio a la siguiente clave pública:"
           about_theme: "Acerca del Theme"
           license: "Licencia"
           component_of: "Theme es un componente de:"
@@ -2735,6 +2885,8 @@ es:
           updating: "Actualizando..."
           up_to_date: "Theme actualizado, última verificación:"
           add: "Agregar"
+          theme_settings: "Ajustes del tema"
+          no_settings: "Este tema no tiene ajustes"
           commits_behind:
             one: "Theme está 1 commit detrás!"
             other: "Theme está {{count}} commits detrás!"
@@ -2759,6 +2911,9 @@ es:
           body_tag:
             text: "</body>"
             title: "HTML que será insertado antes del tag </body>"
+          yaml:
+            text: "YAML"
+            title: "Definir ajustes de tema en formato YAML"
         colors:
           select_base:
             title: "Selecciona esquema base de color"
@@ -2869,7 +3024,7 @@ es:
             skipped_reason_placeholder: "motivo"
       moderation_history:
         performed_by: "Realizado por"
-        no_results: "Histórico de moderación no disponible."
+        no_results: "Registro de moderación no disponible."
         actions:
           delete_user: "Usuario eliminado"
           suspend_user: "Usuario suspendido"
@@ -2924,6 +3079,7 @@ es:
             revoke_badge: "revocar distintivo"
             check_email: "comprobar e-mail"
             delete_topic: "eliminar tema"
+            recover_topic: "restaurar tema"
             delete_post: "eliminar post"
             impersonate: "impersonar"
             anonymize_user: "anonimizar usuario"
@@ -2951,8 +3107,11 @@ es:
             reviewed_post: "posts revisados"
             custom_staff: "acción personalizada por plugin"
             post_locked: "mensaje bloqueado"
+            post_edit: "edición de mensaje"
             post_unlocked: "mensaje desbloqueado"
             check_personal_message: "comprobar mensaje personal"
+            disabled_second_factor: "desactivación de Verificación en dos pasos"
+            topic_published: "tema despublicado"
         screened_emails:
           title: "Correos bloqueados"
           description: "Cuando alguien trata de crear una cuenta nueva, los siguientes correos serán revisados y el registro será bloqueado, o alguna otra acción será realizada."
@@ -2995,6 +3154,7 @@ es:
             header: "Encabezado"
             full_page: "Página Completa"
             click_through_only: "Todo (solo entrados)"
+          header_search_results: "Resultados de búsqueda de encabezado"
         logster:
           title: "Registros de errores"
       watched_words:
@@ -3098,6 +3258,10 @@ es:
         suspended_until: "(hasta %{until})"
         cant_suspend: "Este usuario no puede ser suspendido."
         delete_all_posts: "Eliminar todos los posts"
+        penalty_post_actions: "¿Qué te gustaría hacer con el mensaje asociado?"
+        penalty_post_delete: "Eliminar el mensaje"
+        penalty_post_edit: "Editar el mensaje"
+        penalty_post_none: "No hacer nada"
         delete_all_posts_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {1 post} other {# posts}} y {TOPICS, plural, one {1 topic} other {# topics}}. ¿Seguro?"
         silence: "Silenciar"
         unsilence: "No silenciar"
@@ -3133,6 +3297,7 @@ es:
         private_topics_count: Temas privados
         posts_read_count: Posts leídos
         post_count: Posts publicados
+        second_factor_enabled: Verificación en dos pasos activada
         topics_entered: Temas vistos
         flags_given_count: Reportes enviados
         flags_received_count: Reportes recibidos
@@ -3274,6 +3439,10 @@ es:
         go_back: "Volver a la búsqueda"
         recommended: "Recomendamos personalizar los siguientes textos para que se ajusten a tus necesidades:"
         show_overriden: 'Sólo mostrar textos editados'
+      settings:
+        show_overriden: 'Solo mostrar lo editado'
+        reset: 'resetear'
+        none: 'ninguno'
       site_settings:
         title: 'Ajustes del sitio'
         no_results: "Ningún resultado encontrado"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 3061b09ba0..7d6138ff6f 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -328,22 +328,6 @@ et:
         make_user_group_owner: "Määra omanikuks"
         remove_user_as_group_owner: "Eemalda omanik"
     groups:
-      logs:
-        title: "Logid"
-        when: "Millal"
-        action: "Tegevus"
-        acting_user: "Tegev kasutaja"
-        target_user: "Sihtkasutaja"
-        subject: "Teema"
-        details: "Detailid"
-        from: "Kellelt"
-        to: "Kellele"
-      edit:
-        title: 'Muuda gruppi'
-        full_name: 'Täisnimi'
-        add_members: "Lisa liikmed"
-        delete_member_confirm: "Eemalda '%{username}' grupist '%{group}'?"
-      name_placeholder: "Grupi nimi, tühikuteta, vastab kasutajanime reeglitele"
       public_exit: "Luba kasutajatel vabalt grupist lahkuda"
       empty:
         posts: "Selle grupi liikmetelt ei ole postitusi."
@@ -353,12 +337,7 @@ et:
         topics: "Selle grupi liikmetelt ei ole teemasid."
         logs: "Sellele grupile logid puuduvad."
       add: "Lisa"
-      join: "Liitu grupiga"
-      leave: "Lahku grupist"
-      request: "Taotle liitumist grupiga"
       message: "Sõnum"
-      automatic_group: Automaatne grupp
-      is_group_user: "Oled selle grupi liige"
       membership_request:
         submit: "Saada päring"
       membership: "Liikmelisus"
@@ -377,12 +356,6 @@ et:
       posts: "Postitused"
       mentions: "Mainimisi"
       messages: "Sõnumid"
-      visibility_levels:
-        title: "Kes näevad seda gruppi?"
-        public: "Kõik"
-        members: "Grupi omanikud, liikmed ja adminid"
-        staff: "Grupi omanikud ja töötajad"
-        owners: "Grupi omanikud ja adminid"
       alias_levels:
         messageable: "Kes saab sellele grupile sõnumeid saata?"
         nobody: "Mitte keegi"
@@ -390,9 +363,6 @@ et:
         mods_and_admins: "Vaid moderaatorid ja adminnid"
         members_mods_and_admins: "Vaid grupi liikmed, moderaatorid ja adminnid"
         everyone: "Igaüks"
-      trust_levels:
-        title: "Liikmetele peale lisamist automaatselt omistatud usaldustase:"
-        none: "Puudub"
       notifications:
         watching:
           title: "Vaatlen"
@@ -417,7 +387,6 @@ et:
       flair_color_placeholder: "(Valikuline) Värvi väärtus heksakoodis"
       flair_preview_icon: "Ikooni eelvaatlus"
       flair_preview_image: "Pildi eelvaatlus"
-      flair_note: "Märkus: Andekus kuvatakse vaid kasutaja põhigrupi jaoks."
     user_action_groups:
       '1': "Meeldimisi antud"
       '2': "Meeldimisi saadud"
@@ -1145,21 +1114,6 @@ et:
       linked: "<span>{{username}}</span> {{description}}"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>New Topic</span> {{description}}"
-      alt:
-        mentioned: "Mainis"
-        quoted: "Tsiteeris"
-        replied: "Vastas"
-        posted: "Postitas"
-        edited: "Muuda oma postitust"
-        liked: "Sinu postitus meeldis"
-        private_message: "Privaatsõnum kasutajalt"
-        invited_to_topic: "Teemasse kutsus"
-        invitee_accepted: "Kutse võttis vastu"
-        moved_post: "Sinu postituse liigutas"
-        linked: "Viide sinu postitusele"
-        granted_badge: "Märgis antud"
-        group_message_summary: "Sõnumeid grupi postkastis"
-        topic_reminder: "Meelespea"
       popup:
         mentioned: '{{username}} mainis Sind teemas "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mainis Sind teemas "{{topic}}" - {{site_title}}'
@@ -2316,7 +2270,6 @@ et:
         title: "Grupid"
         edit: "Muuda gruppe"
         refresh: "Värskenda"
-        new: "Uus"
         about: "Siin saad muuta oma grupi liikmelisust ja nimesid"
         group_members: "Grupi liikmed"
         delete: "Kustuta"
@@ -2324,21 +2277,11 @@ et:
         delete_failed: "Ei suuda kustutada seda gruppi. Kui see on automaatne grupp, ei saa seda hävitada."
         delete_owner_confirm: "Eemaldan kasutajalt '%{username}' omaniku õigused?"
         add: "Lisa"
-        add_members: "Lisa liikmeid"
         custom: "Individuaalne"
-        bulk_complete: "Kasutajad lisati gruppi."
-        bulk: "Lisa massina gruppi"
-        bulk_paste: "Kleebi kas"
-        bulk_select: "(vali grupp)"
         automatic: "Automaatne"
-        automatic_membership_email_domains: "Kasutajad, kes registreeruvad meiliaadressiga, mille domeen ühtib täpselt mõnega sellest loetelust, lisatakse siia gruppi automaatselt:"
-        automatic_membership_retroactive: "Olemasolevate registreeritud kasutajate lisamiseks rakenda sama meiliaadressi domeeni reeglit"
         default_title: "Vaikimisi tiitel kõigile kasutajatele siin grupis"
-        primary_group: "Muuda automaatselt peamiseks grupiks"
         group_owners: Omanikud
         add_owners: Lisa omanikke
-        incoming_email: "Individuaalne sissetuleva meili aadress"
-        incoming_email_placeholder: "sisesta meiliaadress"
         none_selected: "Vali alustamiseks grupp"
         no_custom_groups: "Loo uus kohandatud grupp"
       api:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index e1e34a2ee7..e6f3323d5c 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -221,6 +221,8 @@ fa_IR:
       last_read: "این آخرین نوشته ای است که خوانده‌اید؛ بفشارید تا روی آن نشانک بگذارید."
       remove: "پاک کردن نشانک"
       confirm_clear: "آیا مطمئنید که می‌خواهید همه نشانک ها را از این موضوع پاک کنید؟"
+    topic_count_latest:
+      other: "{{count}} موضوع تازه یا به‌ روز شده."
     preview: "پیش‌نمایش"
     cancel: "لغو"
     save: "ذخیره سازی تغییرات"
@@ -307,22 +309,6 @@ fa_IR:
         make_user_group_owner: "مدیر کردن"
         remove_user_as_group_owner: "لغو مالکیت"
     groups:
-      logs:
-        title: "گزارش‌ها"
-        when: "چه زمانی"
-        action: "عمل"
-        acting_user: "کاربر اجرایی"
-        target_user: "کاربر مقصد"
-        subject: "موضوع"
-        details: "جزئیات"
-        from: "از"
-        to: "به"
-      edit:
-        title: 'ویرایش گروه'
-        full_name: 'نام و نام خانوادگی'
-        add_members: "افزودن اعضا"
-        delete_member_confirm: "کاربر '%{username}' از گروه '%{group}' حذف شود؟"
-      name_placeholder: "در نام گروه نمی توان از فاصله استفاده کرد، مانند قوانین نامگذاری نام کاربری"
       empty:
         posts: "در این گروه هیچ نوشته ای توسط کاربران ارسال نشده."
         members: "این گروه هیچ عضوی ندارد"
@@ -331,12 +317,7 @@ fa_IR:
         topics: "در این گروه هیچ موضوعی توسط اعضای آن ایجاد نشده."
         logs: "هیچ گزارشی برای این گروه موجود نیست."
       add: "افزودن"
-      join: "پیوستن به گروه"
-      leave: "ترک گروه"
-      request: "درخواست پیوستن به گروه"
       message: "پیام"
-      automatic_group: گروه خودکار
-      is_group_user: "شما عضو این گروه هستید"
       allow_membership_requests: "اجازه ارسال درخواست عضویت در گروه به کاربران"
       membership_request:
         submit: "ارسال درخواست"
@@ -356,21 +337,12 @@ fa_IR:
       mentions: "اشاره‌ها"
       messages: "پیام‌ها"
       notification_level: "سطح آگاه‌سازی پیش‌فرض برای پیام‌های گروهی"
-      visibility_levels:
-        title: "چه کسی می‌تواند این گروه را ببیند؟"
-        public: "همه"
-        members: "صاحبان گروه، اعضا، و مدیران"
-        staff: "صاحبان گروه و کارکنان"
-        owners: "صاحبان گروه و مدیران"
       alias_levels:
         nobody: "هیچ‌کس"
         only_admins: "فقط مدیران ارشد"
         mods_and_admins: "فقط مدیران و مدیران ارشد"
         members_mods_and_admins: "تنها اعضای گروه، مدیران ومدیران ارشد"
         everyone: "همه"
-      trust_levels:
-        title: "سطح اعتماد به صورت خودکار به اعضایی که اضافه می‌شوند داده می‌شود:"
-        none: "هیچ کدام"
       notifications:
         watching:
           title: "در حال مشاهده"
@@ -395,7 +367,6 @@ fa_IR:
       flair_color_placeholder: "(اختیاری) کد HEX رنگ"
       flair_preview_icon: "پیش‌نمایش آیکن"
       flair_preview_image: "پیش‌نمایش تصویر"
-      flair_note: "نکته:‌ خصیصه فقط برای گروه اصلی کاربر نمایش داده می‌شود."
     user_action_groups:
       '1': "پسندهای داده شده"
       '2': "پسندهای دریافت شده"
@@ -1070,19 +1041,6 @@ fa_IR:
       empty: "اعلانی پیدا نشد."
       more: "نمایش اعلان‌های قدیمی‌تر"
       total_flagged: "همه‌ی نوشته‌های پرچم خورده"
-      alt:
-        mentioned: "اشاره شده توسط"
-        quoted: "نقل‌قول شده توسط"
-        replied: "پاسخ داده شد"
-        posted: "نوشته شده توسط"
-        edited: "نوشته‌تان را ویرایش کنید توسط"
-        liked: "ارسال شما را پسندید"
-        invited_to_topic: "دعوت شده به یک موضوع توسط"
-        invitee_accepted: "دعوت قبول شد توسط"
-        moved_post: "نوشته‌ی شما منتقل شد توسط"
-        linked: "پیوند به ارسال شما"
-        granted_badge: "نشان اعطا شد"
-        group_message_summary: "پیام‌های صندوق ورودی گروه"
       popup:
         mentioned: '{{username}} در "{{topic}}" - {{site_title}} به شما اشاره کرد'
         group_mentioned: '{{username}} به شما در "{{topic}}" - {{site_title}} اشاره نمود'
@@ -2185,7 +2143,6 @@ fa_IR:
         title: "گروه‌ها"
         edit: "ویرایش گروه‌ها"
         refresh: "تازه کردن"
-        new: "جدید"
         about: "عضویت و نام‌های گروه را در اینجا ویرایش کنید"
         group_members: "اعضای گروه"
         delete: "حذف"
@@ -2193,22 +2150,11 @@ fa_IR:
         delete_failed: "قادر به حذف گروه نیستیم. اگر این یک گروه خودکار است، نمی توان آن را از بین برد."
         delete_owner_confirm: "حذف حق مالکیت برای '%{username}'؟"
         add: "اضافه کردن"
-        add_members: "اضافه کردن عضو"
         custom: "سفارشی"
-        bulk_complete: "کاربران به گروه اضافه شدند."
-        bulk_complete_users_not_added: "این کاربران اضافه نشدند (مطمئن شوید که حساب عضو هستند)"
-        bulk: "اضافه کردن تعداد زیادی به گروه"
-        bulk_paste: "یک لیست از نام های کاربری و یا ایمیل ها وارد کنید, در هر خط فقط یکی:"
-        bulk_select: "(یک گروه انتخاب کنید)"
         automatic: "خودکار"
-        automatic_membership_email_domains: " کاربرانی که با ایمیل  دامنه ثبت نام کرده اند،دقیقا شبیه دامنه های لیست، بصورت خودکار به این گروه اضافه می شوند :"
-        automatic_membership_retroactive: "درخواست همان قاعده دامنه ایمیل برای اضافه کردن برای کاربران ثبت نام کرده"
         default_title: "عنوان را پیش فرض کن برای تمام اعضا در این گروه"
-        primary_group: "بطور خودکار به گروه اصلی تبدیل شد"
         group_owners: مالکین
         add_owners: افزودن مالک
-        incoming_email: "آدرس ایمیل های دریافتی سفارشی"
-        incoming_email_placeholder: "آدرس ایمیل را وارد کنید"
         none_selected: "برای شروع یک گروه انتخاب کنید"
         no_custom_groups: "ایجاد گروه سفارشی"
       api:
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 0581fc702e..723086f832 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -149,6 +149,8 @@ fi:
     topic_admin_menu: "ketjun ylläpitotoimet"
     wizard_required: "Tervetuloa uuteen Discourseesi! Aloitetaan <a href='%{url}' data-auto-route='true'>ohjattu asennus</a> ✨"
     emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä."
+    bootstrap_mode_enabled: "Jotta uuden palstan vauhtiin saaminen olisi helpompaa, sivusto on aloitustilassa. Kaikki uudet käyttäjät saavat luottamustason 1 ja heille lähetetään sähköpostitiivistelmät päivittäin. Tila poistetaan automaattisesti, kun %{min_users}käyttäjää on liittynyt."
+    bootstrap_mode_disabled: "Aloitustila poistetaan seuraavan 24 tunnin aikana."
     themes:
       default_description: "Oletus"
     s3:
@@ -248,6 +250,12 @@ fi:
     topic_count_latest:
       one: "Katso {{count}} uusi tai päivittynyt ketju"
       other: "Katso {{count}} uutta tai päivittynyttä ketjua"
+    topic_count_unread:
+      one: "Näytä {{count}} lukematon ketju"
+      other: "Näytä {{count}} lukematonta ketjua"
+    topic_count_new:
+      one: "Näytä {{count}} uusi ketju"
+      other: "Näytä {{count}} uutta ketjua"
     preview: "esikatselu"
     cancel: "peruuta"
     save: "Tallenna muutokset"
@@ -260,6 +268,7 @@ fi:
     pasting: "Liitetään..."
     enable: "Ota käyttöön"
     disable: "Poista käytöstä"
+    continue: "Jatka"
     undo: "Peru"
     revert: "Palauta"
     failed: "Epäonnistui"
@@ -337,22 +346,30 @@ fi:
         make_user_group_owner: "Myönnä isännyys"
         remove_user_as_group_owner: "Peru isännyys"
     groups:
-      logs:
-        title: "Lokit"
-        when: "Milloin"
-        action: "Toiminta"
-        acting_user: "Toimiva käyttäjä"
-        target_user: "Kohdekäyttäjä"
-        subject: "Aihe"
-        details: "Yksityiskohdat"
-        from: "Lähettäjä"
-        to: "Vastaanottaja"
-      edit:
-        title: 'Muuta ryhmää'
-        full_name: 'Täysimittainen nimi'
+      add_members:
+        title: "Lisää jäseniä"
+        description: "Hallinnoi ryhmän jäsenyyksiä"
+        usernames: "Käyttäjänimet"
+      manage:
+        title: 'Hallinnoi'
+        name: 'Nimi'
+        full_name: 'Täysmittainen nimi'
         add_members: "Lisää jäseniä"
         delete_member_confirm: "Poista '%{username}' ryhmästä '%{group}'?"
-      name_placeholder: "Ryhmän nimi. Ei välilyöntejä, samat säännöt kuin käyttäjänimillä"
+        profile:
+          title: Profiili
+        interaction:
+          title: Vuorovaikutus
+        logs:
+          title: "Lokit"
+          when: "Milloin"
+          action: "Toimi"
+          acting_user: "Toimija"
+          target_user: "Kohdekäyttäjä"
+          subject: "Aihe"
+          details: "Yksityiskohdat"
+          from: "Mistä"
+          to: "Minne"
       public_admission: "Salli käyttäjien liittyä ryhmään vapaasti (Ryhmän täytyy olla julkinen)"
       public_exit: "Salli käyttäjien poistua ryhmästä vapaasti"
       empty:
@@ -363,15 +380,10 @@ fi:
         topics: "Ryhmän jäsenet eivät ole aloittaneet ketjuja."
         logs: "Ryhmälle ei ole lokitietoja."
       add: "Lisää"
-      join: "Liity ryhmään"
-      leave: "Poistu ryhmästä"
-      request: "Hae ryhmään"
-      filter_name: "suodata ryhmän nimen perusteella"
+      join: "Liity"
+      leave: "Poistu"
+      request: "Pyyntö"
       message: "Viesti"
-      automatic_group: Automaattinen ryhmä
-      close_group: Sulje ryhmä
-      is_group_user: "Olet tämän ryhmän jäsen"
-      is_group_owner: "Olet ryhmän isäntä"
       allow_membership_requests: "Salli käyttäjän lähettää jäsenhakemuksia ryhmien isännille"
       membership_request_template: "Viestipohja, joka näytetään käyttäjälle, kun hän lähettää jäsenhakemusta ryhmään."
       membership_request:
@@ -380,34 +392,51 @@ fi:
         reason: "Kerro ryhmän isännille, miksi haluat kuulua tähän ryhmään"
       membership: "Jäsenyys"
       name: "Nimi"
-      user_count: "Jäsenmäärä"
+      group_name: "Ryhmän nimi"
+      user_count: "Käyttäjät"
       bio: "Tietoa ryhmästä"
       selector_placeholder: "syötä käyttäjänimi"
       owner: "isäntä"
       index:
         title: "Ryhmät"
+        all: "Kaikki ryhmät"
         empty: "Näkyvillä olevia ryhmiä ei ole."
+        filter: "Suodata ryhmän tyypin mukaan"
         all_groups: "Kaikki ryhmät"
         owner_groups: "Ryhmät joiden isäntä olen"
-        close_groups: "Sulje ryhmät"
+        close_groups: "Suljetut ryhmät"
         automatic_groups: "Automaattiset ryhmät"
+        automatic: "Automaattinen"
+        closed: "Suljettu"
+        public: "Julkinen"
+        private: "Yksityinen"
         public_groups: "Julkiset ryhmät"
+        automatic_group: Automaattinen ryhmä
+        close_group: Sulje ryhmä
         my_groups: "Minun ryhmäni"
+        group_type: "Ryhmän tyyppi"
+        is_group_user: "Jäsen"
+        is_group_owner: "Isäntä"
       title:
         one: "Ryhmä"
         other: "Ryhmät"
       activity: "Toiminta"
+      members:
+        title: "Jäsenet"
+        filter_placeholder_admin: "käyttäjänimi tai sähköposti"
+        filter_placeholder: "käyttäjänimi"
+        remove_member: "Poista jäsen"
+        remove_member_description: "Poista <b>%{username}</b> ryhmästä"
+        make_owner: "Myönnä isännyys"
+        make_owner_description: "Tee käyttäjästä <b>%{username}</b> ryhmän isäntä"
+        remove_owner: "Peru isännyys"
+        remove_owner_description: "Peru käyttäjältä <b>%{username}</b> ryhmän isännyys"
+        owner: "Isäntä"
       topics: "Ketjut"
       posts: "Viestit"
       mentions: "Maininnat"
       messages: "Viestit"
       notification_level: "Ryhmäviestien oletusilmoitusasetus"
-      visibility_levels:
-        title: "Ketkä näkevät tämän ryhmän?"
-        public: "Kaikk"
-        members: "Ryhmän isännät, jäsenet ja ylläpitäjät"
-        staff: "Ryhmän isännät ja henkilökunta"
-        owners: "Ryhmän isännät ja ylläpitäjät"
       alias_levels:
         mentionable: "Ketkä voivat @mainita ryhmän?"
         messageable: "Ketkä voivat lähettää ryhmälle viestin?"
@@ -416,9 +445,6 @@ fi:
         mods_and_admins: "Vain ylläpitäjät ja valvojat"
         members_mods_and_admins: "Vain ryhmän jäsenet, valvojat ja ylläpitäjät"
         everyone: "Kaikki"
-      trust_levels:
-        title: "Luottamustaso, joka annetaan automaattisesti lisättäessä tähän ryhmään:"
-        none: "Ei mitään"
       notifications:
         watching:
           title: "Tarkkailussa"
@@ -443,7 +469,6 @@ fi:
       flair_color_placeholder: "(Valinnainen) värin Hex-arvo"
       flair_preview_icon: "Ikonin esikatselu"
       flair_preview_image: "Kuvan esikatselu"
-      flair_note: "Huom. Käyttäjän ensisijainen ryhmä määrää pinssin."
     user_action_groups:
       '1': "Annetut tykkäykset"
       '2': "Saadut tykkäykset"
@@ -639,6 +664,17 @@ fi:
         choose: "Valitse salasana"
       second_factor:
         title: "Kaksivaiheinen tunnistautuminen"
+        disable: "Poista kaksivaiheinen tunnistautuminen käytöstä"
+        enable: "tilin tietoturvan parantamiseksi"
+        confirm_password_description: "Jatka vahvistamalla salasanasi"
+        label: "Koodi"
+        enable_description: |
+          Skannaa QR-koodi laitteellesi sopivalla sovelluksella (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) ja syötä tunnistautumiskoodi.
+        disable_description: "Syötä sovelluksen tarjoama tunnistautumiskoodi"
+        show_key_description: "Syötä manuaalisesti"
+        extended_description: |
+          Kaksivaiheinen tunnistautuminen lisää tilisi tietoturvaa vaatimalla kertakäyttöisen koodin salasanan lisäksi. Koodeja voi luoda <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a> ja <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> -laitteilla.
+        oauth_enabled_warning: "Huomioi, ettet voi kirjautua some-tilien avulla, jos kaksivaiheinen tunnistautuminen on käytössä."
       change_about:
         title: "Muokkaa kuvaustasi"
         error: "Arvon muuttamisessa tapahtui virhe."
@@ -981,13 +1017,20 @@ fi:
       button_ok: "OK"
       button_help: "Apua"
     email_login:
+      link_label: "Lähetä minulle kirjautumislinkki"
       button_label: "sähköpostitse"
+      complete_username: "Jos on olemassa käyttäjätili käyttäjänimellä <b>%{username}</b>, kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
+      complete_email: "Jos on olemassa käyttäjätili sähköpostiosoitteella <b>%{email}</b>, kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
+      complete_username_found: "Käyttäjätili käyttäjänimellä <b>%{username}</b> löytyi. Kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
+      complete_email_found: "Käyttäjätili sähköpostiosoitteella <b>%{email}</b> löytyi. Kirjautumislinkin sisältävän sähköpostiviestin pitäisi saapua sinulle tuota pikaa."
       complete_username_not_found: "Ei löytynyt käyttäjänimeä <b>%{username}</b>"
       complete_email_not_found: "Ei löytynyt sähköpostiosoitetta <b>%{email}</b>"
     login:
       title: "Kirjaudu"
       username: "Käyttäjä"
       password: "Salasana"
+      second_factor_title: "Kaksivaiheinen tunnistautuminen"
+      second_factor_description: "Syötä sovelluksen antama todennuskoodi:"
       email_placeholder: "sähköposti tai käyttäjätunnus"
       caps_lock_warning: "Caps Lock on päällä"
       error: "Tuntematon virhe"
@@ -1005,6 +1048,7 @@ fi:
       not_allowed_from_ip_address: "Kirjautuminen estetty tästä IP-osoitteesta."
       admin_not_allowed_from_ip_address: "Et voi kirjautua ylläpitäjänä tästä IP-osoitteesta."
       resend_activation_email: "Klikkaa tästä lähettääksesi vahvistusviestin uudelleen."
+      omniauth_disallow_totp: "Käyttäjätilisi käyttää kaksivaiheista tunnistautumista. Kirjaudu salasanasi avulla."
       resend_title: "Lähetä aktivointisähköposti uudelleen"
       change_email: "Vaihda sähköpostiosoitetta"
       provide_new_email: "Anna uusi osoite niin lähetämme sinulle vahvistamissähköpostin."
@@ -1070,7 +1114,6 @@ fi:
       no_content: Ei osumia
       filter_placeholder: Hae...
       create: "Luo: '{{content}}'"
-      max_content_reached: "Voit valita enintään {{count}} ."
     emoji_picker:
       filter_placeholder: Etsi emojia
       people: Ihmiset
@@ -1088,6 +1131,13 @@ fi:
       medium_tone: Ruskea ihonväri
       medium_dark_tone: Tummanruskea ihonväri
       dark_tone: Tumma ihonväri
+    shared_drafts:
+      title: "Jaetut luonnokset"
+      notice: "Tämä ketju näkyy vain niille, jotka näkevät <b>{{category}}</b> -alueen."
+      destination_category: "Kohdealue"
+      publish: "Julkaise jaettu luonnos"
+      confirm_publish: "Haluatko varmasti julkaista luonnoksen?"
+      publishing: "Julkaistaan ketjua..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "lisää..."
@@ -1128,6 +1178,8 @@ fi:
       create_topic: "Aloita ketju"
       create_pm: "Viesti"
       create_whisper: "Kuiskaa"
+      create_shared_draft: "Luo jaettu luonnos"
+      edit_shared_draft: "Muokkaa jaettua luonnosta"
       title: "Tai paina Ctrl+Enter"
       users_placeholder: "Lisää käyttäjä"
       title_placeholder: "Kuvaile lyhyesti mistä tässä ketjussa on kyse?"
@@ -1184,6 +1236,21 @@ fi:
           desc: Vastaa tiettyyn viestiin
         reply_as_new_topic:
           label: Vastaa sivuavassa ketjussa
+          desc: Aloita uusi, tähän ketjuun linkittyvä ketju
+        reply_as_private_message:
+          label: Uusi viesti
+          desc: Aloita uusi yksityiskeskustelu
+        reply_to_topic:
+          label: Vastaa ketjuun
+          desc: Vastaa ketjuun muttei mihinkään tiettyyn viestiin
+        toggle_whisper:
+          label: Kuiskaus päälle/pois
+          desc: Kuiskaukset näkyvät vain henkilökuntalaisille
+        create_topic:
+          label: "Uusi ketju"
+        shared_draft:
+          label: "Jaettu luonnos"
+          desc: "Luonnostele ketju, joka näkyy vain henkilökunnalle"
     notifications:
       tooltip:
         regular:
@@ -1220,27 +1287,13 @@ fi:
       group_message_summary:
         one: "{{count}} viesti ryhmän {{group_name}} saapuneissa"
         other: "{{count}} viestiä ryhmän {{group_name}} saapuneissa"
-      alt:
-        mentioned: "Mainitsija"
-        quoted: "Lainaaja"
-        replied: "Vastasi"
-        posted: "Kirjoittaja"
-        edited: "Viestieäsi muokkasi"
-        liked: "Viestistäsi tykkäsi"
-        private_message: "Yksityisviesti käyttäjältä"
-        invited_to_topic: "Kutsu ketjuun käyttäjältä"
-        invitee_accepted: "Kutsun hyväksyi"
-        moved_post: "Viestisi siirsi"
-        linked: "Linkki viestiisi"
-        granted_badge: "Ansiomerkki myönnetty"
-        group_message_summary: "Viestejä ryhmän saapuneissa viesteissä."
-        topic_reminder: "Muistutus"
       popup:
         mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
         quoted: '{{username}} lainasi sinua ketjussa "{{topic}}" - {{site_title}}'
         replied: '{{username}} vastasi sinulle ketjussa "{{topic}}" - {{site_title}}'
         posted: '{{username}} vastasi ketjuun "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} lähetti sinulle yksityisviestin keskustelussa "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkitti viestiisi ketjusta "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Lisää kuva"
@@ -1267,9 +1320,6 @@ fi:
       select_all: "Valitse kaikki"
       clear_all: "Tyhjennä kaikki"
       too_short: "Hakusana on liian lyhyt."
-      result_count:
-        one: "Yksi tulos haulle <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} tulosta haulle <span class='term'>{{term}}</span>"
       title: "etsi ketjuja, viestejä, käyttäjiä tai alueita"
       no_results: "Ei tuloksia."
       no_more_results: "Enempää tuloksia ei löytynyt."
@@ -1406,6 +1456,9 @@ fi:
       move_to_inbox:
         title: 'Siirrä saapuneisiin'
         help: 'Siirrä takaisin saapuneisiin.'
+      edit_message:
+        help: 'Muokkaa keskustelun ensimmäistä viestiä'
+        title: 'Muokkaa viestiä'
       list: 'Ketjut'
       new: 'uusi ketju'
       unread: 'lukematta'
@@ -1735,6 +1788,7 @@ fi:
         other: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos se liputetaan)"
       collapse: "kutista"
       expand_collapse: "laajenna/pienennä"
+      locked: "henkilökunnan jäsen on estänyt tämän viestin muokkaamisen"
       gap:
         one: "näytä 1 piilotettu vastaus"
         other: "näytä {{count}} piilotettua vastausta"
@@ -1806,6 +1860,10 @@ fi:
         unhide: "Poista piilotus"
         change_owner: "Vaihda omistajuutta"
         grant_badge: "Myönnä ansiomerkki"
+        lock_post: "Lukitse viesti"
+        lock_post_description: "estä kirjoittajaa muokkaamasta tätä viestiä"
+        unlock_post: "Vapauta viesti"
+        unlock_post_description: "salli kirjoittajan muokata viestiä"
       actions:
         flag: 'Liputa'
         defer_flags:
@@ -1979,6 +2037,7 @@ fi:
       email_in_disabled: "Uusien ketjujen aloittaminen sähköpostitse on otettu pois käytöstä sivuston asetuksissa. Salliaksesi uusien ketjujen luomisen sähköpostilla, "
       email_in_disabled_click: 'ota käyttöön "email in" asetus.'
       mailinglist_mirror: "Alue jäljittelee postituslistaa"
+      suppress_from_latest: "Vaimenna alue Tuoreimmat-näkymästä"
       show_subcategory_list: "Näytä lista tytäralueista ketjujen yläpuolella tällä alueella."
       num_featured_topics: "Kuinka monta ketjua näytetään Keskustelualueet-sivulla:"
       subcategory_num_featured_topics: "Kuinka monta ketjua näytetään emoalueen sivulla:"
@@ -2289,6 +2348,7 @@ fi:
         one: "1 myönnetty"
         other: "%{count} myönnettyä"
       select_badge_for_title: Valitse tittelisi ansiomerkeistä
+      none: "(ei mitään)"
       successfully_granted: "Ansiomerkin %{badge} myöntäminen käyttäjälle %{username} onnistui"
       badge_grouping:
         getting_started:
@@ -2511,7 +2571,6 @@ fi:
         title: "Ryhmät"
         edit: "Muokkaa ryhmiä"
         refresh: "Lataa uudelleen"
-        new: "Uusi"
         about: "Muokkaa ryhmien jäsenyyksiä ja nimiä täällä"
         group_members: "Ryhmään kuuluvat"
         delete: "Poista"
@@ -2519,22 +2578,11 @@ fi:
         delete_failed: "Ryhmän poistaminen ei onnistu. Jos tämä on automaattinen ryhmä, sitä ei voi poistaa."
         delete_owner_confirm: "Poista omistajan etuudet käyttäjältä '%{username}'?"
         add: "Lisää"
-        add_members: "Lisää jäseniä"
         custom: "Mukautetut"
-        bulk_complete: "Käyttäjät on lisätty ryhmään."
-        bulk_complete_users_not_added: "Näitä käyttäjiä ei lisätty (varmista, että tilit ovat olemassa):"
-        bulk: "Lisää ryhmään useita"
-        bulk_paste: "Liitä lista käyttäjänimistä tai sähköpostiosoitteista, yksi per rivi:"
-        bulk_select: "(valitse ryhmä)"
         automatic: "Automaattiset"
-        automatic_membership_email_domains: "Käyttäjät, jotka luovat tunnuksen sähköpostiosoitteella, jonka verkkotunnus on tällä listalla, lisätään tähän ryhmään:"
-        automatic_membership_retroactive: "Lisää jo olemassa olevat käyttäjät käyttäen samaa sääntöä verkkotunnuksista"
         default_title: "Tämä ryhmän jäsenten oletustitteli"
-        primary_group: "Aseta automaattisesti ensisijaiseksi ryhmäksi"
         group_owners: Omistajat
         add_owners: Lisää omistajia
-        incoming_email: "Saapuvan sähköpostin osoite"
-        incoming_email_placeholder: "aseta sähköpostiosoite"
         none_selected: "Aloita valitsemalla ryhmä"
         no_custom_groups: "Luo uusi mukautettu ryhmä"
       api:
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 3618d9cd37..3879aac887 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -147,9 +147,9 @@ fr:
         enabled: 'a mis à la une %{when}. Il sera affiché en haut de chaque page jusqu’à ce qu''il soit ignoré par un utilisateur.'
         disabled: 'a supprimé de la une %{when}. Il ne sera plus affiché en haut de chaque page.'
     topic_admin_menu: "actions d'administration sur le sujet"
-    wizard_required: "Bienvenue sur votre nouveau Discourse ! Démarrons pas <a href='%{url}' data-auto-route='true'>l'assistant de configuration</a> ✨"
+    wizard_required: "Bienvenue sur votre nouveau Discourse ! Démarrons par <a href='%{url}' data-auto-route='true'>l'assistant de configuration</a> ✨"
     emails_are_disabled: "Le courriel sortant a été désactivé par un administrateur. Aucune notification courriel ne sera envoyée."
-    bootstrap_mode_enabled: "Pour rendre le lancement de votre site plus facile, vous êtes en mode 'bootstrap'. Tout nouveau utilisateur sera accordé le niveau de confirance 1 et aura les résumés par courriel hebdomadaires activés. Ceci cessera d'être le cas lorsque %{min_users} utilisateurs auront rejoints le site."
+    bootstrap_mode_enabled: "Pour rendre le lancement de votre site plus facile, vous êtes en mode 'bootstrap'. Tout nouveau utilisateur sera accordé le niveau de confiance 1 et aura les résumés par courriel hebdomadaires activés. Ceci cessera d'être le cas lorsque %{min_users} utilisateurs auront rejoints le site."
     bootstrap_mode_disabled: "Le mode Bootstrap sera désactivé dans les prochaines 24 heures."
     themes:
       default_description: "Par défaut"
@@ -249,7 +249,7 @@ fr:
       confirm_clear: "Êtes-vous sûr de vouloir retirer tous les signets de ce sujet ?"
     topic_count_latest:
       one: "Voir {{count}} sujet récent ou mis à jour."
-      other: "Voir {{count}} sujets récents ou mis à jour."
+      other: "Voir {{count}} sujets récents ou mis à jour"
     topic_count_unread:
       one: "Voir {{count}} sujet non lu"
       other: "Voir {{count}} sujets non lus"
@@ -346,22 +346,35 @@ fr:
         make_user_group_owner: "Rendre propriétaire"
         remove_user_as_group_owner: "Retirer le propriétaire"
     groups:
-      logs:
-        title: "Journaux"
-        when: "Quand"
-        action: "Action"
-        acting_user: "Utilisateur agissant"
-        target_user: "Utilisateur cible"
-        subject: "Sujet"
-        details: "Détails"
-        from: "De"
-        to: "À"
-      edit:
-        title: 'Modifier le groupe'
+      add_members:
+        title: "Ajouter membres"
+        description: "Gérer les membres de ce groupe"
+        usernames: "Pseudos"
+      manage:
+        title: 'Gérer'
+        name: 'Nom'
         full_name: 'Nom complet'
         add_members: "Ajouter des membres"
         delete_member_confirm: "Supprimer %{username} du groupe « %{group} » ?"
-      name_placeholder: "Nom du groupe, sans espaces, même règle que pour les pseudos"
+        profile:
+          title: Profil
+        interaction:
+          title: Intéraction
+          posting: Contribution
+          notification: Notification
+        membership:
+          title: Adhésion
+          access: Accès
+        logs:
+          title: "Journaux"
+          when: "Quand"
+          action: "Action"
+          acting_user: "Utilisateur agissant"
+          target_user: "Utilisateur cible"
+          subject: "Sujet"
+          details: "Détails"
+          from: "From"
+          to: "À"
       public_admission: "Autoriser les utilisateurs à rejoindre le groupe librement (nécessite que le groupe soit visible)"
       public_exit: "Autoriser les utilisateurs à quitter librement le groupe"
       empty:
@@ -372,36 +385,43 @@ fr:
         topics: "Il n'y a aucun sujet par des membres de ce groupe."
         logs: "Il n'y a aucun journal pour ce groupe."
       add: "Ajouter"
-      join: "Rejoindre le groupe"
-      leave: "Quitter le groupe"
-      request: "Demander à rejoindre le groupe"
-      filter_name: "filtrer par nom de groupe"
+      join: "Rejoindre"
+      leave: "Quitter"
+      request: "Requête"
       message: "Message"
-      automatic_group: Groupe automatique
-      close_group: Fermer groupe
-      is_group_user: "Vous êtes membre de ce groupe"
-      is_group_owner: "Vous êtes un propriétaire de ce groupe"
       allow_membership_requests: "Autoriser les utilisateurs à envoyer des demandes d'adhésion aux propriétaires de groupe"
       membership_request_template: "Modèle personnalisé à afficher aux utilisateurs lors de l'envoi d'une demande d'adhésion"
       membership_request:
         submit: "Soumettre la demande"
-        title: "Demander à rejoindre %{group_name}"
+        title: "Demander à rejoindre @%{group_name}"
         reason: "Expliquez au propriétaire du groupe pourquoi vous avez votre place dans ce groupe"
       membership: "Adhésion"
       name: "Nom"
-      user_count: "Nombre de membres"
+      group_name: "Nom du groupe"
+      user_count: "Utilisateurs"
       bio: "À propos du groupe"
       selector_placeholder: "saisir pseudo"
       owner: "propriétaire"
       index:
         title: "Groupes"
+        all: "Tous les groupes"
         empty: "Il n'y a aucun groupe visible."
+        filter: "Filtrer par type de groupe"
         all_groups: "Tous les groupes"
         owner_groups: "Groupes dont je suis propriétaire"
-        close_groups: "Fermer groupes"
+        close_groups: "Groupes fermés"
         automatic_groups: "Groupes automatiques"
+        automatic: "Automatique"
+        closed: "Fermé"
+        public: "Public"
+        private: "Privé"
         public_groups: "Groupes publics"
+        automatic_group: Groupe automatique
+        close_group: Fermer groupe
         my_groups: "Mes groupes"
+        group_type: "Type de groupe"
+        is_group_user: "Membre"
+        is_group_owner: "Propriétaire"
       title:
         one: "Groupe"
         other: "Groupes"
@@ -416,17 +436,12 @@ fr:
         make_owner_description: "Rendre<b>%{username}</b> propriétaire de ce groupe"
         remove_owner: "Enlever comme propriétaire"
         remove_owner_description: "Enlever <b>%{username}</b> comme propriétaire de ce groupe"
+        owner: "Propriétaire"
       topics: "Sujets"
       posts: "Messages"
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Niveau de notification par défaut pour les messages de groupe"
-      visibility_levels:
-        title: "Qui peut voir ce groupe ?"
-        public: "Tout le monde"
-        members: "Propriétaires du groupe, membres et administrateurs"
-        staff: "Propriétaires du groupe et responsables"
-        owners: "Propriétaires du groupe et administrateurs"
       alias_levels:
         mentionable: "Qui peut @mentionner ce groupe ?"
         messageable: "Qui peut envoyer un message à ce groupe ?"
@@ -435,9 +450,6 @@ fr:
         mods_and_admins: "Seulement les modérateurs et les administrateurs "
         members_mods_and_admins: "Seulement les membres du groupe, les modérateurs et les administrateurs "
         everyone: "Tout le monde"
-      trust_levels:
-        title: "Niveau de confiance automatiquement attribué lorsque les membres sont ajoutés :"
-        none: "Aucun"
       notifications:
         watching:
           title: "Surveiller"
@@ -462,7 +474,6 @@ fr:
       flair_color_placeholder: "(Facultatif) Couleur en héxadécimal"
       flair_preview_icon: "Prévisualiser l'icône"
       flair_preview_image: "Prévisualiser l'image"
-      flair_note: "Note : la vignette d'avatar sera uniquement affichée pour le groupe principal d'un utilisateur."
     user_action_groups:
       '1': "J'aime donnés"
       '2': "J'aime reçus"
@@ -536,6 +547,7 @@ fr:
       activity_stream: "Activité"
       preferences: "Préférences"
       expand_profile: "Développer"
+      collapse_profile: "Réduire"
       bookmarks: "Signets"
       bio: "À propos de moi"
       invited_by: "Invité par"
@@ -619,7 +631,7 @@ fr:
       api_approved: "Approuvé :"
       theme: "Thème"
       home: "Page d'accueil par défaut"
-      staged: "En attente"
+      staged: "Distant"
       staff_counters:
         flags_given: "signalements utiles"
         flagged_posts: "messages signalés"
@@ -885,7 +897,7 @@ fr:
         most_liked_users: "A le plus aimé"
         most_replied_to_users: "A le plus répondu à"
         no_likes: "Pas encore de J'aime."
-      associated_accounts: "Connexions"
+      associated_accounts: "Identifiants"
       ip_address:
         title: "Dernières adresses IP"
       registration_ip_address:
@@ -895,6 +907,7 @@ fr:
         header_title: "profil, messages, signets et préférences"
       title:
         title: "Titre"
+        none: "(aucun)"
       filters:
         all: "Tous"
       stream:
@@ -1011,7 +1024,7 @@ fr:
       button_ok: "OK"
       button_help: "Aide"
     email_login:
-      link_label: "M'envoyer un lien login par courriel"
+      link_label: "M'envoyer un lien de connexion par courriel"
       button_label: "par courriel"
       complete_username: "Si un compte correspond au pseudo <b>%{username}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
       complete_email: "Si un compte correspond à l'adresse de courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec un lien pour vous connecter."
@@ -1096,7 +1109,7 @@ fr:
       facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Catégories seules"
-      categories_with_featured_topics: "Catégories et sujets sélectionnés"
+      categories_with_featured_topics: "Catégories avec sujets à la une"
       categories_and_latest_topics: "Catégories et sujets récents"
       categories_and_top_topics: "Catégories et meilleurs sujets"
     shortcut_modifier_key:
@@ -1108,7 +1121,6 @@ fr:
       no_content: Aucune correspondance trouvée
       filter_placeholder: Rechercher...
       create: "Créer : '{{content}}'"
-      max_content_reached: "Vous ne pouvez séléctionner que {{count}} éléments."
     emoji_picker:
       filter_placeholder: Chercher un emoji
       people: Personnes
@@ -1165,6 +1177,7 @@ fr:
         post_length: "Le message doit avoir au moins {{min}} caractères"
         try_like: 'Avez-vous essayé le bouton <i class="fa fa-heart"></i> ?'
         category_missing: "Vous devez choisir une catégorie"
+        tags_missing: "Vous devez choisir au moins {{count}} tags"
       save_edit: "Sauvegarder"
       reply_original: "Répondre sur le sujet d'origine"
       reply_here: "Répondre ici"
@@ -1174,6 +1187,7 @@ fr:
       create_pm: "Message privé"
       create_whisper: "Murmurer"
       create_shared_draft: "Créer ébauche partagée"
+      edit_shared_draft: "Modifier ébauche partagée"
       title: "ou appuyez sur Ctrl+Entrée"
       users_placeholder: "Ajouter un utilisateur"
       title_placeholder: "Quel est le sujet en une courte phrase ?"
@@ -1281,22 +1295,6 @@ fr:
       group_message_summary:
         one: "{{count}} message dans la boîte de réception de {{group_name}}"
         other: "{{count}} messages dans la boîte de réception de {{group_name}}"
-      alt:
-        mentioned: "Mentionné par"
-        quoted: "Cité par"
-        replied: "Répondu"
-        posted: "Message par"
-        edited: "Modifier votre message par"
-        liked: "A aimé votre message"
-        private_message: "Message direct de"
-        invited_to_private_message: "Invité à un message direct par"
-        invited_to_topic: "Invité à un sujet par"
-        invitee_accepted: "Invitation acceptée par"
-        moved_post: "Votre message a été déplacé par"
-        linked: "Lien vers votre message"
-        granted_badge: "Badge attribué"
-        group_message_summary: "Messages dans la boite de réception du groupe"
-        topic_reminder: "Un rappel"
       popup:
         mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
         group_mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
@@ -1331,8 +1329,8 @@ fr:
       clear_all: "Tout désélectionner"
       too_short: "Votre terme de recherche est trop court."
       result_count:
-        one: "1 résultat pour <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} résultats pour <span class='term'>{{term}}</span>"
+        one: "<span>1 résultat pour</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} résultats pour</span><span class='term'>{{term}}</span>"
       title: "rechercher des sujets, messages, utilisateurs ou catégories"
       no_results: "Aucun résultat."
       no_more_results: "Aucun résultat supplémentaire."
@@ -1542,7 +1540,7 @@ fr:
         pick_date_and_time: "Sélectionner une date et heure"
         set_based_on_last_post: "Fermer par rapport au dernier message"
       publish_to_category:
-        title: "Publier"
+        title: "Planifier publication"
       temp_open:
         title: "Ouvrir temporairement"
       auto_reopen:
@@ -1563,8 +1561,8 @@ fr:
         auto_close: "Ce sujet sera automatiquement fermé %{timeLeft}."
         auto_publish_to_category: "Ce sujet sera publié dans <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "Ce sujet sera fermé %{duration} après la dernière réponse."
-        auto_delete: "Ce sujet sera automatiquement supprimé %{timeLeft}"
-        auto_reminder: "Vous serez rappelé sur ce sujet %{timeLeft}"
+        auto_delete: "Ce sujet sera automatiquement supprimé %{timeLeft}."
+        auto_reminder: "Vous serez rappelé sur ce sujet %{timeLeft}."
       auto_close_title: 'Paramètres de fermeture automatique'
       auto_close_immediate:
         one: "Le dernier message dans ce sujet est déjà vieux de 1 heure donc le sujet sera immédiatement fermé."
@@ -1709,7 +1707,7 @@ fr:
         username_placeholder: "pseudo"
         action: 'Envoyer une invitation'
         help: 'inviter d''autres personnes sur ce sujet par email ou notifications'
-        to_forum: "Nous allons envoyer un courriel à votre ami pour lui permettre de participer au forum juste en cliquant sur un lien, sans qu'il ait à se connecter."
+        to_forum: "Nous allons envoyer un courriel à votre ami pour lui permettre de participer au forum juste en cliquant sur un lien, sans avoir à saisir un identifiant."
         sso_enabled: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter sur ce sujet."
         to_topic_blank: "Entrez le pseudo ou l'adresse email de la personne que vous souhaitez inviter sur ce sujet."
         to_topic_email: "Vous avez entré une adresse email. Nous allons envoyer une invitation à votre ami lui permettant de répondre immédiatement à ce sujet."
@@ -1771,10 +1769,10 @@ fr:
           label: 'sélectionné'
           title: 'Cliquer pour retirer le message de la sélection'
         select_replies:
-          label: 'sélectionner + les réponses'
+          label: 'sélectionner avec réponses'
           title: 'Ajouter le message et toutes ses réponses à la sélection'
         select_below:
-          label: 'sélectionner + le reste'
+          label: 'sélectionner avec suivants'
           title: 'Ajouter un message et tout ceux qui suivent à la sélection'
         delete: supprimer la sélection
         cancel: annuler la sélection
@@ -1788,8 +1786,8 @@ fr:
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Raison :"
       post_number: "message {{number}}"
-      wiki_last_edited_on: "Wiki dernièrement modifié le"
-      last_edited_on: "message dernièrement modifié le"
+      wiki_last_edited_on: "Wiki édité pour la dernière fois"
+      last_edited_on: "message édité pour la dernière fois"
       reply_as_new_topic: "Répondre par un nouveau sujet"
       reply_as_new_private_message: "Répondre par un nouveau message direct adressé aux mêmes destinataires"
       continue_discussion: "Suite du sujet {{postLink}} :"
@@ -1875,6 +1873,8 @@ fr:
         grant_badge: "Décerner le badge"
         lock_post: "Vérouiller message"
         lock_post_description: "empêcher l'utilisateur de modifier le message"
+        unlock_post: "Déverrouiller message"
+        unlock_post_description: "permettre l'utilisateur de modifier le message"
       actions:
         flag: 'Signaler'
         defer_flags:
@@ -2011,11 +2011,11 @@ fr:
       settings: 'Paramètres'
       topic_template: "Modèle de sujet"
       tags: "Tags"
-      tags_allowed_tags: "N'autoriser que ces tags à être utilisés dans cette catégorie:"
-      tags_allowed_tag_groups: "N'autoriser que les tags de ces groupes à être utilisés dans cette catégorie:"
+      tags_allowed_tags: "N'autoriser que ces tags à être utilisés dans cette catégorie :"
+      tags_allowed_tag_groups: "N'autoriser que les tags de ces groupes à être utilisés dans cette catégorie :"
       tags_placeholder: "(Facultatif) liste des tags autorisés"
       tag_groups_placeholder: "(Facultatif) liste des groupes de tags autorisés"
-      topic_featured_link_allowed: "Autoriser les sujets avec lien dans cette catégorie"
+      topic_featured_link_allowed: "Autoriser les liens à la une dans cette catégorie"
       delete: 'Supprimer la catégorie'
       create: 'Nouvelle catégorie'
       create_long: 'Créer une nouvelle catégorie'
@@ -2048,9 +2048,10 @@ fr:
       email_in_disabled: "La possibilité de créer des nouveaux sujets via courriel est désactivé dans les Paramètres. Pour l'activer,"
       email_in_disabled_click: 'activer le paramètre « email in ».'
       mailinglist_mirror: "La catégorie reflète une liste de diffusion"
+      suppress_from_latest: "Retirer cette catégorie des sujets récents."
       show_subcategory_list: "Afficher la liste des sous-catégories au dessus des sujets dans cette catégorie."
       num_featured_topics: "Nombre de sujets affichés sur la page des catégories :"
-      subcategory_num_featured_topics: "Nombre de sujets sélectionnés sur la page des catégories parentes :"
+      subcategory_num_featured_topics: "Nombre de sujets à la une sur la page de la catégorie parente :"
       all_topics_wiki: "Faire des nouveaux sujets des Wikis par défaut"
       subcategory_list_style: "Style des listes de sous-catégories :"
       sort_order: "Trier la liste de sujets par :"
@@ -2064,6 +2065,7 @@ fr:
       default_position: "Position par défaut"
       position_disabled: "Les catégories seront affichées dans l'ordre d'activité. Pour contrôler l'ordre des catégories dans la liste,"
       position_disabled_click: 'activer le paramètre "fixed category positions"'
+      minimum_required_tags: 'Nombre minimum de tags requis dans un sujet :'
       parent: "Catégorie parente"
       notifications:
         watching:
@@ -2095,9 +2097,9 @@ fr:
       sort_descending: 'Décroissant'
       subcategory_list_styles:
         rows: "Rangées"
-        rows_with_featured_topics: "Rangées avec sujets sélectionnés"
+        rows_with_featured_topics: "Rangées avec sujets à la une"
         boxes: "Boîtes"
-        boxes_with_featured_topics: "Boîtes avec sujets sélectionnés"
+        boxes_with_featured_topics: "Boîtes avec sujets à la une"
     flagging:
       title: 'Merci d''aider à garder notre communauté civilisée !'
       action: 'Signaler ce message'
@@ -2316,6 +2318,9 @@ fr:
         dismiss_new_posts: '<b>x</b>, <b>r</b> Ignorer les nouveaux messages'
         dismiss_topics: '<b>x</b>, <b>t</b> Ignorer les sujets'
         log_out: '<b>MAJ.</b>+<b>z</b> <b>MAJ.</b>+<b>z</b> Se déconnecter'
+      composing:
+        title: 'Edition'
+        return: '<b>shift</b>+<b>c</b> Revenir à l''éditeur'
       actions:
         title: 'Actions'
         bookmark_topic: '<b>f</b> Modifier le signet du sujet'
@@ -2355,6 +2360,8 @@ fr:
         one: "1 décerné"
         other: "%{count} décernés"
       select_badge_for_title: Sélectionner un badge comme titre
+      none: "(aucun)"
+      successfully_granted: "%{badge} accordé à %{username} avec succès"
       badge_grouping:
         getting_started:
           name: Initiation
@@ -2377,6 +2384,7 @@ fr:
       </p>
     tagging:
       all_tags: "Tous les tags"
+      other_tags: "Autres tags"
       selector_all_tags: "tous les tags"
       selector_no_tags: "aucun tag"
       changed: "tags modifiés :"
@@ -2402,15 +2410,19 @@ fr:
       notifications:
         watching:
           title: "Surveiller"
+          description: "Vous surveillerez automatiquement tous les sujets avec ce tag. Vous serez notifié de tous les nouveaux messages et sujets, et le nombre de messages non lus et nouveaux apparaîtra à côté du sujet."
         watching_first_post:
           title: "Surveiller les nouveaux sujets"
+          description: "Vous serez uniquement notifié du premier message de chaque sujet avec ce tag."
         tracking:
           title: "Suivi"
+          description: "Vous allez suivre automatiquement tous les sujets avec ce tag. Le nombre de messages non lus et nouveaux apparaîtra à côté du sujet."
         regular:
           title: "Normal"
           description: "Vous serez notifié si un utilisateur mentionne votre @pseudo ou répond à votre message."
         muted:
           title: "Silencieux"
+          description: "Vous ne recevrez aucune notification sur des nouveaux sujets avec ce tag, et ils n’apparaîtront pas dans l'onglet non lus."
       groups:
         title: "Groupes de tags"
         about: "Ajouter des tags aux groupes pour les gérer plus facilement."
@@ -2424,6 +2436,7 @@ fr:
         save: "Sauvegarder"
         delete: "Supprimer"
         confirm_delete: "Êtes-vous sûr de vouloir supprimer ce groupe de tags ?"
+        visible_only_to_staff: "Les tags ne sont visibles qu'aux responsables"
       topics:
         none:
           unread: "Vous n'avez aucun sujet non lu."
@@ -2516,10 +2529,18 @@ fr:
         moderation_history: "Historique de la modération"
         agree: "Accepter"
         agree_title: "Confirmer que le signalement est valide et correcte"
+        agree_flag_hide_post: "Cacher message"
         agree_flag_hide_post_title: "Cacher le message et envoyer automatiquement un message à l'utilisateur l'incitant à le modifier."
         agree_flag_restore_post: "Accepter et rétablir le message"
         agree_flag_restore_post_title: "Rétablir le message afin que tous les utilisateurs puissent le voir."
+        agree_flag_suspend: "Suspendre l'utilisateur"
+        agree_flag_suspend_title: "Accepter le signalement et suspendre l'utilisateur."
+        agree_flag_silence: "Mettre l'utilisateur sous silence"
+        agree_flag_silence_title: "Accepter le signalement et mettre l'utilisateur sous silence."
+        agree_flag: "Conserver le message"
         agree_flag_title: "Accepter le signalement et conserver le message tel quel."
+        ignore_flag: "Ignorer"
+        ignore_flag_title: "Retirer le signalement ; il ne nécessite aucune action pour le moment."
         delete: "Supprimer"
         delete_title: "Supprimer le message signalé."
         delete_post_defer_flag: "Supprimer le message et ignorer le signalement"
@@ -2538,6 +2559,9 @@ fr:
         more: "(plus de réponses…)"
         suspend_user: "Suspendre l'utilisateur"
         suspend_user_title: "Suspendre l'utilisateur pour ce message"
+        replies:
+          one: "[1 réponse]"
+          other: "[%{count} réponses]"
         dispositions:
           agreed: "accepté"
           disagreed: "refusé"
@@ -2560,7 +2584,7 @@ fr:
           topic: "Sujet"
           type: "Type"
           users: "Utilisateurs"
-          last_flagged: "Dernier signalés"
+          last_flagged: "Derniers signalés"
         short_names:
           off_topic: "hors-sujet"
           inappropriate: "inapproprié"
@@ -2568,12 +2592,48 @@ fr:
           notify_user: "personnalisé"
           notify_moderators: "personnalisé"
       groups:
+        new:
+          title: "Nouveau groupe"
+          create: "Créer"
+          name:
+            too_short: "Nom de groupe trop court"
+            too_long: "Nom de groupe trop long"
+            checking: "Vérification de la disponibilité du nom de groupe…"
+            available: "Nom de groupe disponible"
+            not_available: "Nom de groupe indisponible"
+            blank: "Nom de groupe ne peut être vide"
+        bulk_add:
+          title: "Ajouter au groupe en masse"
+          complete_users_not_added: "Ces utilisateurs n'ont pas été ajoutés (vérifiez qu'ils ont un compte) :"
+          paste: "Coller une liste de pseudo ou courriel, un par ligne :"
+        add_members:
+          as_owner: "Rendre utilisateur(s) propriétaire(s) de ce groupe"
+        manage:
+          interaction:
+            email: Courriel
+            incoming_email: "Adresse de courriel entrant personnalisée"
+            incoming_email_placeholder: "Entrer une adresse de courriel"
+            visibility: Visibilité
+            visibility_levels:
+              title: "Qui peut voir ce groupe ?"
+              public: "Tout le monde"
+              members: "Propriétaires du groupe, membres et administrateurs"
+              staff: "Propriétaires du groupe et responsables"
+              owners: "Propriétaires du groupe et administrateurs"
+          membership:
+            automatic: Automatique
+            trust_level: Niveau de confiance
+            trust_levels_title: "Niveau de confiance automatiquement attribué lorsque les membres sont ajoutés :"
+            trust_levels_none: "Aucun"
+            automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe:"
+            automatic_membership_retroactive: "Appliquer la même règle de domaine courriel pour les utilisateurs existants"
+            primary_group: "Définir comme groupe principal automatiquement"
+        name_placeholder: "Nom du groupe, sans espace, mêmes règles que pour les pseudos"
         primary: "Groupe principal"
         no_primary: "(pas de groupe principal)"
         title: "Groupes"
         edit: "Modifier les groupes"
         refresh: "Actualiser"
-        new: "Nouveau"
         about: "Modifier votre adhésion et les noms ici"
         group_members: "Membres du groupe"
         delete: "Supprimer"
@@ -2581,22 +2641,11 @@ fr:
         delete_failed: "Impossible de supprimer le groupe. Si c'est un groupe automatique il ne peut être détruit."
         delete_owner_confirm: "Retirer les privilèges de propriétaire pour %{username} ?"
         add: "Ajouter"
-        add_members: "Ajouter des membres"
         custom: "Personnalisé"
-        bulk_complete: "Les utilisateurs ont été ajoutés au groupe"
-        bulk_complete_users_not_added: "Ces utilisateurs n'ont pas été ajoutés (vérifiez qu'ils ont un compte):"
-        bulk: "Ajouter au groupe en masse"
-        bulk_paste: "Coller une liste de pseudo ou courriel, un par ligne :"
-        bulk_select: "(sélectionner un groupe)"
         automatic: "Automatique"
-        automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe:"
-        automatic_membership_retroactive: "Appliquer la même règle de domaine courriel pour les utilisateurs existants"
         default_title: "Titre par défaut pour tous les utilisateurs de ce groupe"
-        primary_group: "Définir comme groupe principal automatiquement"
         group_owners: Propriétaires
         add_owners: Ajouter des propriétaires
-        incoming_email: "Adresse de courriel entrant personnalisée"
-        incoming_email_placeholder: "Entrer une adresse de courriel"
         none_selected: "Sélectionnez un groupe pour commencer"
         no_custom_groups: "Créer un nouveau groupe personnalisé"
       api:
@@ -2654,6 +2703,15 @@ fr:
         user_event:
           name: "Événement d'utilisateur"
           details: "Quand un utilisateur se connecte, se déconnecte, est créé, approuvé ou mis à jour."
+        group_event:
+          name: "Événement de groupe"
+          details: "Quand un groupe est créé, mis à jour ou supprimé."
+        category_event:
+          name: "Événement de catégorie"
+          details: "Quand une catégorie est créée, mise à jour ou supprimée."
+        tag_event:
+          name: "Événement de tag"
+          details: "Quand un tag est créé, mis à jour ou supprimé."
         delivery_status:
           title: "État de l'envoi"
           inactive: "Inactif"
@@ -2695,6 +2753,7 @@ fr:
         change_settings: "Changer les paramètres"
         change_settings_short: "Paramètres"
         howto: "Comment installer des extensions ?"
+        official: "Plugin officiel"
       backups:
         title: "Sauvegardes"
         menu:
@@ -2718,6 +2777,7 @@ fr:
           label: "Envoyer"
           title: "Envoyer une sauvegarde à cette instance"
           uploading: "Envoi en cours…"
+          success: "« {{filename}} » a été envoyé avec succès. Le fichier est en cours de traitement et il faudra jusqu'à une minute pour qu'il apparaisse dans la liste."
           error: "Il y a eu une erreur lors de l'envoi de « {{filename}} » : {{message}}"
         operations:
           is_running: "Une opération est en cours d'exécution…"
@@ -2772,7 +2832,7 @@ fr:
         new_style: "Nouveau style"
         import: "Importer"
         delete: "Supprimer"
-        delete_confirm: "Suprimmer ce thème ?"
+        delete_confirm: "Supprimer ce thème ?"
         about: "Modification des feuilles de styles et en-têtes de votre site. Ajouter un style personnalisé pour commencer."
         color: "Couleur"
         opacity: "Opacité"
@@ -2799,6 +2859,7 @@ fr:
           common: "Général"
           desktop: "Bureau"
           mobile: "Mobile"
+          settings: "Paramètres"
           preview: "Prévisualiser"
           is_default: "Thème activé par défaut"
           user_selectable: "Thème sélectionnable par les utilisateurs"
@@ -2810,7 +2871,8 @@ fr:
           no_uploads: "Vous pouvez envoyer des ressources associées à votre thème comme des polices ou des images"
           add_upload: "Ajouter un fichier"
           upload_file_tip: "Choisir un fichier à téléverser (png, woff2, etc.)"
-          variable_name: "Nom de variable SCSS:"
+          variable_name: "Nom de variable SCSS :"
+          variable_name_invalid: "Nom de variable invalide. Seuls les caractères alphanumériques sont autorisés. Doit commencer par une lettre. Doit être unique."
           upload: "Upload"
           child_themes_check: "Thème incluant d'autres thèmes"
           css_html: "CSS/HTML personnalisé"
@@ -2819,6 +2881,8 @@ fr:
           delete_upload_confirm: "Supprimer cet upload? (Le thème CSS pourrait ne plus fonctionner!)"
           import_web_tip: "Dépôt contenant le thème"
           import_file_tip: "Fichier .dcstyle.json contenant le thème"
+          is_private: "Le thème est dans un dépôt git privé"
+          public_key: "Accorder un accès dépôt à la clef publique suivante :"
           about_theme: "À propos du thème"
           license: "Licence"
           component_of: "Le thème est un composant de :"
@@ -2827,6 +2891,8 @@ fr:
           updating: "Mise à jour…"
           up_to_date: "Thème à jour, dernière vérification :"
           add: "Ajouter"
+          theme_settings: "Paramètres thème"
+          no_settings: "Ce thème n'a pas de paramètres."
           commits_behind:
             one: "Le thème est en retard de 1 commit !"
             other: "Le thème est en retard de {{count}} commits !"
@@ -2851,6 +2917,9 @@ fr:
           body_tag:
             text: "</body>"
             title: "HTML qui sera inséré avant la balise </body>"
+          yaml:
+            text: "YAML"
+            title: "Définir les paramètres thème en format YAML"
         colors:
           select_base:
             title: "Sélectionner la palette de couleurs de base"
@@ -3016,6 +3085,7 @@ fr:
             revoke_badge: "retirer le badge"
             check_email: "vérifier l'adresse courriel"
             delete_topic: "supprimer le sujet"
+            recover_topic: "Annuler la suppression du sujet"
             delete_post: "supprimer le message"
             impersonate: "incarner"
             anonymize_user: "rendre l'utilisateur anonyme"
@@ -3042,7 +3112,12 @@ fr:
             backup_destroy: "détruire la sauvegarde"
             reviewed_post: "message vérifié"
             custom_staff: "action personnalisée de l'extension"
+            post_locked: "message vérouillé"
+            post_edit: "message modifié"
+            post_unlocked: "message dévérouillé"
             check_personal_message: "contrôler messages directs"
+            disabled_second_factor: "désactiver l'authentification à deux facteurs"
+            topic_published: "sujet publié"
         screened_emails:
           title: "Courriels affichés"
           description: "Lorsque quelqu'un essaye de créer un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée."
@@ -3085,6 +3160,7 @@ fr:
             header: "Entête"
             full_page: "Page complète"
             click_through_only: "Tous (clics uniquement)"
+          header_search_results: "Résultats de recherche d'entête"
         logster:
           title: "Journal d'erreurs"
       watched_words:
@@ -3188,6 +3264,10 @@ fr:
         suspended_until: "(jusqu'à %{until})"
         cant_suspend: "Cet utilisateur ne peut pas être suspendu."
         delete_all_posts: "Supprimer tous les messages"
+        penalty_post_actions: "Qu'aimeriez-vous faire du message associé ?"
+        penalty_post_delete: "Supprimer le message"
+        penalty_post_edit: "Modifier le message"
+        penalty_post_none: "Ne rien faire"
         delete_all_posts_confirm_MF: "Vous êtes sur le point de supprimer {POSTS, plural, one {1 message} other {# messages}} et {TOPICS, plural, one {1 sujet} other {# sujets}}. Êtes-vous sûr ?"
         silence: "Mettre sous silence"
         unsilence: "Ne pas mettre sous silence"
@@ -3195,7 +3275,7 @@ fr:
         moderator: "Modérateur ?"
         admin: "Administrateur ?"
         suspended: "Suspendu ?"
-        staged: "En attente ?"
+        staged: "Distant ?"
         show_admin_profile: "Administration"
         refresh_browsers: "Forcer le rafraîchissement du navigateur"
         refresh_browsers_message: "Message envoyé à tous les clients !"
@@ -3212,6 +3292,9 @@ fr:
         grant_moderation: 'Accorder les droits de modération'
         unsuspend: 'Annuler la suspension'
         suspend: 'Suspendre'
+        show_flags_received: "Afficher signalements reçus"
+        flags_received_by: "Signalements reçus par %{username}"
+        flags_received_none: "Cet utilisateur n'a pas reçu de signalement."
         reputation: Réputation
         permissions: Permissions
         activity: Activité
@@ -3220,6 +3303,7 @@ fr:
         private_topics_count: Sujets privés
         posts_read_count: Messages lus
         post_count: Messages créés
+        second_factor_enabled: Authentification à deux facteurs activée
         topics_entered: Sujets vus
         flags_given_count: Signalements effectués
         flags_received_count: Signalements reçus
@@ -3270,7 +3354,7 @@ fr:
         deactivate_explanation: "Un utilisateur désactivé doit revalider son adresse de courriel."
         suspended_explanation: "Un utilisateur suspendu ne peut pas se connecter."
         silence_explanation: "Un utilisateur mis sous silence ne peut pas créer des messages ou sujets."
-        staged_explanation: "Un utilisateur en attente ne peut envoyer des messages par courriel que pour des sujets spécifiques."
+        staged_explanation: "Un utilisateur distant ne peut envoyer des messages que par courriel et pour des sujets spécifiques."
         bounce_score_explanation:
           none: "Aucune rejet récent pour cette adresse courriel."
           some: "Quelques rejets récents pour cette adresse courriel."
@@ -3361,6 +3445,10 @@ fr:
         go_back: "Retour à la recherche"
         recommended: "Nous vous recommandons de personnaliser le texte suivant selon vos besoins :"
         show_overriden: 'Ne montrer que ce qui a été personnalisé'
+      settings:
+        show_overriden: 'Ne montrer que ce qui a été personnalisé'
+        reset: 'rétablir'
+        none: 'aucun'
       site_settings:
         title: 'Paramètres'
         no_results: "Aucun résultat trouvé."
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index e3b9c50df1..e0f89d916b 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -323,9 +323,6 @@ gl:
         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"
@@ -848,19 +845,6 @@ gl:
       none: "Non é posíbel cargar as notificacións neste intre"
       more: "ver notificacións anteriores"
       total_flagged: "total de publicacións denunciadas"
-      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"
-        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}}'
@@ -1650,7 +1634,6 @@ gl:
         title: "Grupos"
         edit: "Editar grupos"
         refresh: "Actualizar"
-        new: "Novo"
         about: "Edita aquí a túa pertenza a un grupo e nomes"
         group_members: "Membros do grupo"
         delete: "Eliminar"
@@ -1658,21 +1641,11 @@ gl:
         delete_failed: "Non é posíbel eliminar o grupo. Se este é un grupo automático, non se pode destruír."
         delete_owner_confirm: "Eliminar os privilexios de usuario de «%{username}»?"
         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."
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 9a9d3197be..b1fd27d1b7 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -323,22 +323,6 @@ he:
         make_user_group_owner: "הפיכה לבעלים"
         remove_user_as_group_owner: "שלילת בעלות"
     groups:
-      logs:
-        title: "לוגים"
-        when: "מתי"
-        action: "פעולה"
-        acting_user: "משתמשים פועלים"
-        target_user: "משתמשי מטרה"
-        subject: "נושא"
-        details: "פרטים"
-        from: "מאת"
-        to: "אל"
-      edit:
-        title: 'עריכת קבוצה'
-        full_name: 'שם מלא'
-        add_members: "הוספת חברים"
-        delete_member_confirm: "הסרת '%{username}' מהקבוצה '%{group}'?"
-      name_placeholder: "שם קבוצה, ללא רווחים, לפי הכללים של שמות משתמשים"
       public_admission: "אפשרו למשתמשים להצטרף לקבוצה בחופשיות (דורש קבוצה פומבית)"
       public_exit: "אפשרו למשתמשים לעזוב את הקבוצה בחופשיות"
       empty:
@@ -349,12 +333,7 @@ he:
         topics: "אין נושאים שנוצרו על ידי חברים של קבוצה זו."
         logs: "אין לוגים עבור קבוצה זו."
       add: "הוספה"
-      join: "הצטרפות לקבוצה"
-      leave: "עזיבת קבוצה"
-      request: "בקשה להצטרפות לקבוצה"
       message: "הודעה"
-      automatic_group: קבוצה אוטומטית
-      is_group_user: "אתם חברים בקבוצה זו."
       allow_membership_requests: "אפשרו למשתמשים לשלוח בקשות חברות לבעלי קבוצה"
       membership: "חברות"
       name: "שם"
@@ -369,21 +348,12 @@ he:
       mentions: "אזכורים"
       messages: "הודעות"
       notification_level: "ברירת מחדל של רמת התראות להודעות קבוצה"
-      visibility_levels:
-        title: "מי יכול לראות קבוצה זו?"
-        public: "כולם"
-        members: "בעלי קבוצה, חברים ואדמיניסטרטורים"
-        staff: "בעלי קבוצה וצוות"
-        owners: "בעלי קבוצה ואדמיניסטרטורים"
       alias_levels:
         nobody: "אף אחד"
         only_admins: "רק מנהלים"
         mods_and_admins: "רק מנחים ומנהלים"
         members_mods_and_admins: "רק חברי הקבוצה, מנחים ומנהלים"
         everyone: "כולם"
-      trust_levels:
-        title: "רמת אמון הניתנת אוטומטית למשתמשים כשהם נוספים:"
-        none: "ללא"
       notifications:
         watching:
           title: "במעקב"
@@ -408,7 +378,6 @@ he:
       flair_color_placeholder: "(אופציונלי) ערך הקסדצימלי של הצבע"
       flair_preview_icon: "תצוגה מקדימה של אייקון"
       flair_preview_image: "תצוגה מקדימה של תמונה"
-      flair_note: "שימו לב: פלייר יופיע רק עבור הקבוצה הראשית של משתמשים."
     user_action_groups:
       '1': "לייקים שניתנו"
       '2': "לייקים שהתקבלו"
@@ -1091,19 +1060,6 @@ he:
       empty: "לא נמצאו התראות."
       more: "הצגת התראות ישנות יותר"
       total_flagged: "סך הכל פוסטים מדוגלים"
-      alt:
-        mentioned: "הוזכר על ידי"
-        quoted: "צוטט על ידי"
-        replied: "השיב"
-        posted: "פורסם על ידי"
-        edited: "ערוך את הפוסט שלך על ידי"
-        liked: "אהב את הפוסט שלך"
-        invited_to_topic: "הוזמנת לנושא חדש מ"
-        invitee_accepted: "הזמנה התקבלה על ידי"
-        moved_post: "הפוסט שלך הוזז על ידי"
-        linked: "קישור לפוסט שלך"
-        granted_badge: "עיטור הוענק"
-        group_message_summary: "הודעות בדואר-נכנס קבוצתי"
       popup:
         mentioned: '{{username}} הזכיר/ה אותך ב{{topic}}" - {{site_title}}"'
         group_mentioned: '{{username}} הזכיר/ה אתכם ב "{{topic}}" - {{site_title}}'
@@ -2271,7 +2227,6 @@ he:
         title: "קבוצות"
         edit: "ערוך קבוצות"
         refresh: "רענן"
-        new: "חדש"
         about: "ערוך את חברות הקבוצה שלך והשמות כאן"
         group_members: "חברי הקבוצה"
         delete: "מחק"
@@ -2279,22 +2234,11 @@ he:
         delete_failed: "לא ניתן למחוק קבוצה זו. אם זו קבוצה אוטומטית, היא בלתי ניתנת למחיקה."
         delete_owner_confirm: "הסרת הרשאות מנהל עבור '%{username}'?"
         add: "הוספה"
-        add_members: "הוספת חברים וחברות"
         custom: "מותאם"
-        bulk_complete: "המשתמשים התווספו לקבוצה."
-        bulk_complete_users_not_added: "משתמשים אלו לא נוספו (וודאו שיש להם חשבון):"
-        bulk: "הוספה מרוכזת לקבוצה"
-        bulk_paste: "הדביקו רשימה של שמות משתמשים או כתובות אימייל, אחת בכל שורה:"
-        bulk_select: "(בחר קבוצה)"
         automatic: "אוטומטי"
-        automatic_membership_email_domains: "משתמשים אשר נרשמים עם מארח דוא\"ל שתואם בדיוק לאחד מהרשימה, יוספו באופן אוטומטי לקבוצה זו:"
-        automatic_membership_retroactive: "החלת כלל מארח דוא\"ל זהה כדי להוסיף משתמשים רשומים"
         default_title: "ברירת המחדל לכל המשתמשים בקבוצה זו"
-        primary_group: "קבע כקבוצה ראשית באופן אוטומטי"
         group_owners: מנהלים
         add_owners: הוספת בעלים
-        incoming_email: "התאימו אישית כתובת מייל נכנס"
-        incoming_email_placeholder: "הכניסו כתובת מייל"
         none_selected: "בחירת קבוצה כדי להתחיל"
         no_custom_groups: "יצירת קבוצה מותאמת אישית"
       api:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index d2b34522be..de567f669f 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -285,26 +285,12 @@ id:
         remove_user_from_group: "Hapus pengguna"
         make_user_group_owner: "Jadikan pemilik"
     groups:
-      logs:
-        action: "Aksi"
-        subject: "Subyek"
-        details: "Detil"
-        from: "Dari"
-        to: "Kepada"
-      edit:
-        full_name: 'Nama Lengkap'
-        add_members: "Tambah Anggota"
-        delete_member_confirm: "Hapus '%{username}' dari grup '%{group}'?"
-      name_placeholder: "Nama grup, tidak boleh menggunakan spasi, sama seperti aturan username"
       empty:
         members: "Tidak ada anggota dalam kelompok ini."
         messages: "Tidak ada pesan untuk kelompok ini."
         topics: "Tidak ada topik oleh anggota kelompok ini."
       add: "Menambahkan"
-      join: "Gabung dengan grup"
       message: "Pesan"
-      automatic_group: Kelompok Otomatis
-      is_group_user: "Anda adalah anggota dari kelompok ini."
       membership: "Keanggotaan"
       name: "Nama"
       bio: "Tentang Kelompok"
@@ -313,21 +299,12 @@ id:
       topics: "Topik-topik"
       mentions: "Balasan-balasan"
       messages: "Pesan-pesan"
-      visibility_levels:
-        title: "Siapa yang bisa melihat kelompok ini?"
-        public: "Semua orang"
-        members: "Pemilik kelompok, anggota, dan admin"
-        staff: "Pemilik kelompok dan staf"
-        owners: "Pemilik grup dan admin"
       alias_levels:
         messageable: "Siapa yang bisa mengirim pesan pada kelompok ini?"
         only_admins: "Hanya admin"
         mods_and_admins: "Hanya moderator dan Admin"
         members_mods_and_admins: "Hanya anggota grup, moderator dan admin"
         everyone: "Semua orang"
-      trust_levels:
-        title: "Tingkat kepercayaan otomatis diberikan kepada anggota ketika mereka ditambahkan:"
-        none: "Tidak ada"
       notifications:
         watching:
           title: "Melihat"
@@ -787,12 +764,6 @@ id:
     notifications:
       empty: "Tidak ada pemberitahuan."
       more: "lihat notifikasi sebelumnya"
-      alt:
-        mentioned: "Disebut oleh"
-        replied: "Telah dibalas"
-        posted: "Tulisan oleh"
-        linked: "Tautkan pada tulisan anda"
-        group_message_summary: "Pesan di kotak pesan grup"
     new_item: "baru"
     topics:
       bulk:
@@ -877,7 +848,6 @@ id:
       flags:
         system: "Sistem"
       groups:
-        new: "Baru"
         delete: "Hapus"
         delete_confirm: "Hapus grup ini?"
       backups:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index b2a73d4e88..8859d857d2 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -330,22 +330,6 @@ it:
         make_user_group_owner: "Assegna proprietà"
         remove_user_as_group_owner: "Revoca proprietà"
     groups:
-      logs:
-        title: "Log"
-        when: "Quando"
-        action: "Azione"
-        acting_user: "Utente attore"
-        target_user: "Utente destinatario"
-        subject: "Oggetto"
-        details: "Dettagli"
-        from: "Da"
-        to: "A"
-      edit:
-        title: 'Modifica Gruppo'
-        full_name: 'Nome Completo'
-        add_members: "Aggiungi Membri"
-        delete_member_confirm: "Rimuovere '%{username}' dal gruppo '%{group}'?"
-      name_placeholder: "Nome del gruppo, senza spazi, stesse regole del nome utente"
       public_admission: "Consenti agli utenti di unirsi al gruppo liberamente (Richiede che il gruppo sia visibile a tutti)"
       public_exit: "Consenti agli utenti di lasciare il gruppo liberamente"
       empty:
@@ -356,12 +340,7 @@ it:
         topics: "Non ci sono argomenti da membri di questo gruppo."
         logs: "Non ci sono log per questo gruppo."
       add: "Aggiungi"
-      join: "Partecipa al Gruppo"
-      leave: "Abbandona il Gruppo"
-      request: "Richiedi di partecipare al gruppo"
       message: "Messaggio"
-      automatic_group: Gruppo Automatico
-      is_group_user: "Sei un membro di questo gruppo"
       allow_membership_requests: "Permetti agli utenti di richiedere l'invito ai proprietari del gruppo"
       membership_request_template: "Template personalizzato da mostrare agli utenti quando inviano una richiesta di adesione"
       membership_request:
@@ -384,12 +363,6 @@ it:
       mentions: "Menzioni"
       messages: "Messaggi"
       notification_level: "Livello di notifica predefinito per i messaggi di gruppo"
-      visibility_levels:
-        title: "Chi può vedere questo gruppo?"
-        public: "Chiunque"
-        members: "Proprietari del gruppo, membri e amministratori"
-        staff: "Proprietari del gruppo e staff"
-        owners: "Proprietari del gruppo e amministratori"
       alias_levels:
         mentionable: "Chi può @menzionare questo gruppo?"
         messageable: "Chi può inviare messaggi a questo gruppo?"
@@ -398,9 +371,6 @@ it:
         mods_and_admins: "Solo i moderatori e gli amministratori"
         members_mods_and_admins: "Solo i membri del gruppo, i moderatori e gli amministratori"
         everyone: "Tutti"
-      trust_levels:
-        title: "Livello di esperienza automaticamente assegnato ai membri quando vengono aggiunti:"
-        none: "Nessuno"
       notifications:
         watching:
           title: "In osservazione"
@@ -425,7 +395,6 @@ it:
       flair_color_placeholder: "(Facoltativo) Codice esadecimale del colore"
       flair_preview_icon: "Anteprima Icona"
       flair_preview_image: "Anteprima Immagine"
-      flair_note: "Nota: Flair sarà mostrato solo per i gruppi primari dell'utente."
     user_action_groups:
       '1': "Mi piace - Assegnati"
       '2': "Mi piace - Ricevuti"
@@ -1179,20 +1148,6 @@ it:
       group_message_summary:
         one: "{{count}} messaggi in arrivo nella casella {{group_name}}"
         other: "{{count}} messaggi in arrivo nella casella {{group_name}}"
-      alt:
-        mentioned: "Menzionato da"
-        quoted: "Citato da"
-        replied: "Risposto"
-        posted: "Messaggio da"
-        edited: "Modifica il tuo messaggio da"
-        liked: "Ha assegnato un \"Mi piace\" al tuo messaggio"
-        invited_to_topic: "Invitato a un argomento da"
-        invitee_accepted: "Invito accettato da"
-        moved_post: "Il tuo messaggio è stato spostato da"
-        linked: "Collegamento al tuo messaggio"
-        granted_badge: "Distintivo assegnato"
-        group_message_summary: "Messaggi nel gruppo in arrivo"
-        topic_reminder: "Un promemoria"
       popup:
         mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
@@ -1225,9 +1180,6 @@ it:
       select_all: "Seleziona Tutto"
       clear_all: "Cancella Tutto"
       too_short: "La tua chiave di ricerca è troppo corta."
-      result_count:
-        one: "1 risultato per <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} risultati per <span class='term'>{{term}}</span>"
       title: "cerca argomenti, messaggi, utenti o categorie"
       no_results: "Nessun risultato trovato."
       no_more_results: "Nessun altro risultato trovato."
@@ -2436,7 +2388,6 @@ it:
         title: "Gruppi"
         edit: "Modifica Gruppi"
         refresh: "Aggiorna"
-        new: "Nuovo"
         about: "Modifica qui la tua appartenenza ai gruppi e i loro nomi"
         group_members: "Membri del gruppo"
         delete: "Cancella"
@@ -2444,22 +2395,11 @@ it:
         delete_failed: "Impossibile cancellare il gruppo. Se questo è un gruppo automatico, non può essere eliminato."
         delete_owner_confirm: "Rimuovere i privilegi per '%{username}'?"
         add: "Aggiungi"
-        add_members: "Aggiungi membri"
         custom: "Personalizzato"
-        bulk_complete: "Gli utenti sono stati aggiunti al gruppo."
-        bulk_complete_users_not_added: "Questi utenti non sono stati aggiunti (assicurati che abbiano un account):"
-        bulk: "Aggiunta Massiva al Gruppo"
-        bulk_paste: "Incolla una lista di nomi utente o di email, uno per riga:"
-        bulk_select: "(seleziona un gruppo)"
         automatic: "Automatico"
-        automatic_membership_email_domains: "Gli utenti che si registrano con un dominio email che corrisponde esattamente a uno presente in questa lista, saranno aggiunti automaticamente a questo gruppo:"
-        automatic_membership_retroactive: "Applica la stessa regola sul dominio email per aggiungere utenti registrati esistenti"
         default_title: "Titolo predefinito per tutti gli utenti di questo gruppo"
-        primary_group: "Imposta automaticamente come gruppo principale"
         group_owners: Proprietari
         add_owners: Aggiungi proprietari
-        incoming_email: "Indirizzo email personalizzato"
-        incoming_email_placeholder: "inserisci l'indirizzo e-mail"
         none_selected: "Seleziona un gruppo per iniziare"
         no_custom_groups: "Crea un nuovo gruppo personalizzato"
       api:
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 8d4fbe9e65..f9c8c96eb5 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -127,6 +127,7 @@ ja:
     topic_admin_menu: "トピックの管理"
     wizard_required: "Discourseへようこそ！ さあ<a href='%{url}' data-auto-route='true'>セットアップウィザード</a>から始めましょう"
     emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません"
+    bootstrap_mode_disabled: "ブートストラップモードは24時間以内に無効になります。"
     themes:
       default_description: "デフォルト"
     s3:
@@ -220,6 +221,12 @@ ja:
       last_read: "この投稿をブックマークする"
       remove: "ブックマークを削除"
       confirm_clear: "このトピックの全てのブックマークを削除してもよいですか？"
+    topic_count_latest:
+      other: "{{count}}件の新規/更新トピックがあります。"
+    topic_count_unread:
+      other: "{{count}} 件の未読トピックがあります。"
+    topic_count_new:
+      other: "{{count}} 件の新規トピックがあります。"
     preview: "プレビュー"
     cancel: "キャンセル"
     save: "変更を保存"
@@ -306,22 +313,10 @@ ja:
         make_user_group_owner: "オーナーにする"
         remove_user_as_group_owner: "オーナーから削除する"
     groups:
-      logs:
-        title: "ログ"
-        when: "日時"
-        action: "アクション"
-        acting_user: "アクションしたユーザー"
-        target_user: "対象ユーザー"
-        subject: "対象"
-        details: "詳細"
-        from: "差出人"
-        to: "宛先"
-      edit:
-        title: 'グループの編集'
-        full_name: 'フルネーム'
-        add_members: "メンバーを追加"
-        delete_member_confirm: "%{group}から%{username}を削除しますか?"
-      name_placeholder: "グループネームはユーザー名と同様にスペース無し"
+      add_members:
+        title: "メンバーを追加する"
+        description: "このグループのメンバーシップを管理する"
+        usernames: "ユーザーネーム"
       public_admission: "ユーザーがグループへ自由に参加できるようにする (一般公開グループである必要があります)"
       public_exit: "ユーザーがグループから自由に離脱できるようにする"
       empty:
@@ -332,12 +327,7 @@ ja:
         topics: "このグループのメンバーによるトピックはありません。"
         logs: "このグループに関するログはありません。"
       add: "追加"
-      join: "グループに参加"
-      leave: "グループから離脱"
-      request: "グループへの参加をリクエスト"
       message: "メッセージ"
-      automatic_group: 自動作成グループ
-      is_group_user: "このグループのメンバーです"
       allow_membership_requests: "ユーザーがグループオーナーにメンバーシップリクエストを送信できるようにする"
       membership_request_template: "メンバーシップリクエスト送信時に表示するカスタムテンプレート"
       membership_request:
@@ -359,12 +349,6 @@ ja:
       mentions: "メンション"
       messages: "メッセージ"
       notification_level: "グループメッセージのデフォルト通知レベル"
-      visibility_levels:
-        title: "誰がこのグループを見ることができますか?"
-        public: "誰でも"
-        members: "グループのオーナー、メンバーおよび管理者"
-        staff: "グループオーナーとスタッフのみ"
-        owners: "グループオーナーと管理者のみ"
       alias_levels:
         mentionable: "誰がこのグループに@メンションを送れますか?"
         messageable: "誰がこのグループにメッセージを送れますか?"
@@ -373,9 +357,6 @@ ja:
         mods_and_admins: "管理者とモデレータのみ"
         members_mods_and_admins: "管理者、モデレータ、グループメンバーのみ"
         everyone: "だれでも"
-      trust_levels:
-        title: "以下を追加した時に自動でトラストレベルを付与する:"
-        none: "なし"
       notifications:
         watching:
           title: "ウォッチ中"
@@ -400,7 +381,6 @@ ja:
       flair_color_placeholder: "(オプション) HEXカラー値"
       flair_preview_icon: "アイコンプレビュー"
       flair_preview_image: "画像プレビュー"
-      flair_note: "アバターはユーザーのプライマリーグループにだけ表示されます。"
     user_action_groups:
       '1': "「いいね！」 "
       '2': "「いいね！」 された"
@@ -908,10 +888,12 @@ ja:
       title: "ログイン"
       username: "ユーザ名"
       password: "パスワード"
+      second_factor_title: "２段階認証"
       email_placeholder: "メールアドレスかユーザ名"
       caps_lock_warning: "Caps Lockがオンになっています。"
       error: "不明なエラー"
       rate_limit: "しばらく待ってから再度ログインをお試しください。"
+      blank_username: "あなたのメールアドレスかユーザー名を入力してください。"
       blank_username_or_password: "あなたのメールアドレスかユーザ名、そしてパスワードを入力して下さい。"
       reset_password: 'パスワードをリセット'
       logging_in: "ログイン中..."
@@ -924,6 +906,7 @@ ja:
       not_allowed_from_ip_address: "このIPアドレスでログインできません"
       admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません"
       resend_activation_email: "再度アクティベーションメールを送信するにはここをクリックしてください。"
+      omniauth_disallow_totp: "あなたのアカウントは２段階認証が有効になっています。ログインにはパスワードが必要です。"
       resend_title: "アクティベーションメールの再送"
       change_email: "メールアドレスの変更"
       provide_new_email: "新しいメールアドレスを設定します。このあと、確認のメールを送信します。"
@@ -1114,19 +1097,6 @@ ja:
       watching_first_post: "<span>新しいトピック</span> {{description}}"
       group_message_summary:
         other: "{{group_name}} 宛のメッセージが {{count}} 通あります"
-      alt:
-        mentioned: "メンションされました: "
-        quoted: "引用されました: "
-        replied: "リプライ"
-        posted: "投稿者 "
-        edited: "投稿の編集者: "
-        liked: "あなたの投稿をいいねしました"
-        invited_to_topic: "トピックに招待されました: "
-        invitee_accepted: "招待が承認されました: "
-        moved_post: "投稿を移動しました: "
-        linked: "あなたの投稿にリンク"
-        granted_badge: "バッジを付与"
-        group_message_summary: "グループ宛のメッセージがあります"
       popup:
         mentioned: '"{{topic}}"で{{username}} にメンションされました - {{site_title}}'
         group_mentioned: '"{{topic}}"で{{username}} にメンションされました - {{site_title}}'
@@ -2157,26 +2127,17 @@ ja:
         title: "グループ"
         edit: "グループの編集"
         refresh: "更新"
-        new: "新規"
         about: "グループメンバーとグループ名を編集"
         group_members: "グループメンバー"
         delete: "削除"
         delete_confirm: "このグループを削除しますか?"
         delete_failed: "グループの削除に失敗しました。自動作成グループを削除することはできません。"
         add: "追加"
-        add_members: "メンバーを追加"
         custom: "カスタム"
-        bulk: "グループに一括追加"
-        bulk_paste: "1行ごとにユーザ名またはメールアドレスを貼り付けてください:"
-        bulk_select: "(グループを選択)"
         automatic: "自動で作成されたグループ"
-        automatic_membership_email_domains: "リスト内のメールアドレスのドメインに正確に一致したユーザは自動的にグループに追加される"
-        automatic_membership_retroactive: "同じメールアドレスドメインのルールを既に登録済みのユーザにも適用"
         default_title: "このグループのすべてのユーザーのデフォルトタイトル"
-        primary_group: "自動的にプライマリグループとして設定"
         group_owners: オーナー
         add_owners: オーナーを追加
-        incoming_email_placeholder: "メールアドレスを入力"
       api:
         generate_master: "マスターAPIキーを生成"
         none: "現在アクティブなAPIキーが存在しません。"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 1f58ba55c5..0b4367fc6a 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -304,22 +304,6 @@ ko:
         make_user_group_owner: "소유자로 지정하기"
         remove_user_as_group_owner: "소유자 지정 취소하기"
     groups:
-      logs:
-        title: "로그"
-        when: "언제"
-        action: "액션"
-        acting_user: "활동하는 사용자"
-        target_user: "대상 사용자"
-        subject: "제목"
-        details: "자세한 내용"
-        from: "부터"
-        to: "까지"
-      edit:
-        title: '그룹 편집'
-        full_name: '전체 이름'
-        add_members: "구성원 추가"
-        delete_member_confirm: "'%{username}'를 '%{group}' 그룹에서 삭제하겠습니까?"
-      name_placeholder: "그룹 이름, 공백 없이 username 규칙과 동일하게 입력하세요."
       public_admission: "사용자가 그룹에 자유롭게 가입할 수 있도록 허용합니다. (그룹이 공개되어야 함)"
       public_exit: "사용자가 그룹을 자유롭게 탈퇴할 수 있도록 허용합니다."
       empty:
@@ -330,12 +314,7 @@ ko:
         topics: "이 그룹의 멤버가 작성한 토픽이 없습니다."
         logs: "이 그룹에 대한 기록이 없습니다."
       add: "추가"
-      join: "그룹 참여하기"
-      leave: "그룹 나가기"
-      request: "그룹 참여 요청하기"
       message: "메세지"
-      automatic_group: 자동 그룹
-      is_group_user: "당신은 이 그룹의 구성원입니다."
       allow_membership_requests: "사용자가 그룹 소유자에게 가입신청을 할 수 있도록 허용합니다"
       membership_request_template: "가입 요청을 전송할 때 사용자에게 표시할 커스텀 템플릿"
       membership_request:
@@ -357,12 +336,6 @@ ko:
       mentions: "멘션"
       messages: "메시지"
       notification_level: "그룹 메시지의 기본 알림 레벨"
-      visibility_levels:
-        title: "누가 이 그룹을 볼 수 있나요?"
-        public: "모두"
-        members: "그룹 소유자, 멤버, 관리자"
-        staff: "그룹 소유자와 운영진"
-        owners: "그룹 소유자와 관리자"
       alias_levels:
         mentionable: "누가 이 그룹에 @멘션을 할 수 있나요?"
         messageable: "누가 이 그룹에 메시지를 보낼 수 있나요?"
@@ -371,9 +344,6 @@ ko:
         mods_and_admins: "운영자 및 관리자만"
         members_mods_and_admins: "그룹 멤버, 운영자, 관리자만"
         everyone: "모두"
-      trust_levels:
-        title: "멤버들이 추가되면 회원등급이 자동으로 부여됩니다:"
-        none: "없음"
       notifications:
         watching:
           title: "알림 : 주시 중"
@@ -398,7 +368,6 @@ ko:
       flair_color_placeholder: "(선택사항) 16진수 컬러 값"
       flair_preview_icon: "미리보기 아이콘"
       flair_preview_image: "미리보기 이미지"
-      flair_note: "주의사항: 플레어는 사용자의 주요 그룹에만 표시됩니다."
     user_action_groups:
       '1': "선사한 '좋아요'"
       '2': "받은 '좋아요'"
@@ -1115,19 +1084,6 @@ ko:
       watching_first_post: "<span>새 토픽</span> {{description}}"
       group_message_summary:
         other: " {{group_name}} 사서함에 {{count}} 개의 메시지가 있습니다"
-      alt:
-        mentioned: "멘션 by"
-        quoted: "인용  by"
-        replied: "답글을 전송했습니다."
-        posted: "포스트 by"
-        edited: "당신 글이 다음 이용자에 의해 수정"
-        liked: "당신의 글을 좋아했음."
-        invited_to_topic: "다음 사람으로부터 한 주제로 초대됨"
-        invitee_accepted: "다음 사람에 의해 초대가 수락됨."
-        moved_post: "다음 사람에 의해서 당신의 글이 이동됨"
-        linked: "당신 글로 링크하기"
-        granted_badge: "배지가 수여됨."
-        group_message_summary: "그룹 메시지함의 메시지"
       popup:
         mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 멘션했습니다'
         group_mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신을 언급했습니다'
@@ -2273,7 +2229,6 @@ ko:
         title: "그룹"
         edit: "그룹 수정"
         refresh: "새로고침"
-        new: "새로운"
         about: "회원과 이름을 변경"
         group_members: "그룹 멤버"
         delete: "삭제"
@@ -2281,22 +2236,11 @@ ko:
         delete_failed: "이것은 자동으로 생성된 그룹입니다. 삭제할 수 없습니다."
         delete_owner_confirm: "'%{username}' 님에게서 소유자권한을 제거할까요?"
         add: "추가"
-        add_members: "사용자 추가하기"
         custom: "Custom"
-        bulk_complete: "회원들이 그룹에 추가되었습니다."
-        bulk_complete_users_not_added: "이 사용자는 추가되지 않았습니다(계정이 있는지 확인해보세요):"
-        bulk: "그룹에 한꺼번에 추가하기"
-        bulk_paste: "한 줄당 하나씩 아이디 또는 이메일 리스트를 붙여넣기 하세요."
-        bulk_select: "(그룹을 선택하세요)"
         automatic: "자동화"
-        automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이  등록한 이메일 도메인이 일치할때 이 그룹에 포함"
-        automatic_membership_retroactive: "이미 등록된 사용자에게 같은 이메일 도메인 규칙 적용하기"
         default_title: "이 그룹의 모든 사용자를 위한 기본 제목"
-        primary_group: "기본 그룹으로 자동적으로 설정"
         group_owners: 소유자
         add_owners: 소유자 추가하기
-        incoming_email: "사용자 설정 수신 이메일 주소"
-        incoming_email_placeholder: "이메일 주소를 입력하세요"
         none_selected: "시작할 그룹을 선택하세요"
         no_custom_groups: "사용자 설정 그룹 만들기"
       api:
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 4a6f0524b3..2e2ff3017d 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -348,22 +348,6 @@ lv:
         make_user_group_owner: "Padarīt par īpašnieku"
         remove_user_as_group_owner: "Noņemt īpašnieka tiesības"
     groups:
-      logs:
-        title: "Žurnāls"
-        when: "Kad"
-        action: "Darbība"
-        acting_user: "Lietotājs, kas veica darbību"
-        target_user: "Mērķa lietotājs"
-        subject: "Tēma"
-        details: "Papildus informācija"
-        from: "No"
-        to: "Kam"
-      edit:
-        title: 'Labot grupu'
-        full_name: 'Pilns vārds'
-        add_members: "Pievienot dalībniekus"
-        delete_member_confirm: "Izņemt '%{username}' no grupas '%{group}'?"
-      name_placeholder: "Grupas nosaukums, bez atstarpēm, tādi paši noteikumi kā lietotāja vārdam"
       public_admission: "Atļaut lietotājiem brīvi pievienoties grupai (šai grupai jābūt publiski redzamai)"
       public_exit: "Ļaut lietotājiem brīvi pamest grupu"
       empty:
@@ -374,12 +358,7 @@ lv:
         topics: "Grupas dalībnieki nav izveidojuši nevienu tēmu."
         logs: "Par šo grupu nav žurnāla ierakstu."
       add: "Pievienot"
-      join: "Pievienoties grupai"
-      leave: "Pamest grupu"
-      request: "Pieprasīt pievienošanu grupai"
       message: "Ziņa"
-      automatic_group: Automātiska grupa
-      is_group_user: "Jūs esat šīs grupas dalībnieks"
       allow_membership_requests: "Ļauj lietotājiem sūtīt dalības pieprasījumus grupu īpašniekiem"
       membership: "Piederība"
       name: "Vārds"
@@ -394,21 +373,12 @@ lv:
       mentions: "Pieminēšanas"
       messages: "Ziņas"
       notification_level: "Noklusējuma līmenis paziņojumiem par jaunām grupas ziņām"
-      visibility_levels:
-        title: "Kas var redzēt grupu?"
-        public: "Ikviens"
-        members: "Grupu īpašnieki, biedri un administratori"
-        staff: "Grupu īpašnieki un personāls"
-        owners: "Grupu īpašnieki un administratori"
       alias_levels:
         nobody: "Neviens"
         only_admins: "Tikai administratori"
         mods_and_admins: "Tikai moderatori un administratori"
         members_mods_and_admins: "Tikai grupu biedri, moderatori un administratori"
         everyone: "Ikviens"
-      trust_levels:
-        title: "Uzticamības līmenis, ko automātiski piešķir visiem dalībniekiem pievienošanas brīdī:"
-        none: "Nav"
       notifications:
         watching:
           title: "Skatās"
@@ -433,7 +403,6 @@ lv:
       flair_color_placeholder: "(Neobligāti) Heksadecimālā krāsas vērtība"
       flair_preview_icon: "Priekšskatījuma ikona"
       flair_preview_image: "Priekšskatījuma attēls"
-      flair_note: "Piezīme: attēls parādīsies tikai lietotāja primārai grupai."
     user_action_groups:
       '1': "Veiktās atzinības"
       '2': "Saņemtās atzinības"
@@ -1136,19 +1105,6 @@ lv:
       empty: "Nav atrasti paziņojumi."
       more: "skatīt senākus paziņojumus"
       total_flagged: "pavisam ieraksti ar sūdzībam"
-      alt:
-        mentioned: "Pieminēja"
-        quoted: "Citēja"
-        replied: "Atbildēja"
-        posted: "Ieraksts"
-        edited: "Korektētēja"
-        liked: "Pauda atzinību jūsu ierakstam"
-        invited_to_topic: "Ielūgums uz tēmu no"
-        invitee_accepted: "Ielūgumu pieņēma "
-        moved_post: "Jūsu ierakstu pārvietoja"
-        linked: "Saite uz jūsu ierakstu"
-        granted_badge: "Žetonu piešķīra"
-        group_message_summary: "Ziņas grupas iesūtnē"
       popup:
         mentioned: '{{username}} pieminēja jūs "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} pieminēja jūs "{{topic}}" - {{site_title}}'
@@ -2355,7 +2311,6 @@ lv:
         title: "Grupas"
         edit: "Labot grupas"
         refresh: "Pārlādēt"
-        new: "Jauns"
         about: "Labot jūsu piederīgu grupām un to nosaukumus"
         group_members: "Grupas biedri"
         delete: "Dzēst"
@@ -2363,21 +2318,10 @@ lv:
         delete_failed: "Neizdevās izdzēst grupu. Ja šī ir automātiski izveidota grupa, to nav iespējams iznīcināt."
         delete_owner_confirm: "Noņemt lietotāja privilēģijas '%{username}'?"
         add: "Pievienot"
-        add_members: "Pievienot biedrus"
-        bulk_complete: "Šie lietotāji ir pievienoti grupai."
-        bulk_complete_users_not_added: "Šie lietotāji nav pievienoti (pārliecinieties, ka viņiem ir profili):"
-        bulk: "Pievienot grupai vairākus"
-        bulk_paste: "Kopēt lietotājvārdu vai e-pastu sarakstu, vienu katrā rindiņā:"
-        bulk_select: "(izvēlēties grupu)"
         automatic: "Automātiski"
-        automatic_membership_email_domains: "Lietotāji, kas reģistrējas ar e-pasta domēnu, kas precīzi sakrīt ar kādu no šī saraksta, tiks automātiski pievienoti šai grupai:"
-        automatic_membership_retroactive: "Izmantot viena e-pasta domēna noteikumu, lai pievienotu esošus lietotājus"
         default_title: "Noklusējuma apzīmējums visiem lietotājiem šajā grupā"
-        primary_group: "Automātiski padarīt par galveno grupu"
         group_owners: Īpašnieki
         add_owners: Pievienot īpašniekus
-        incoming_email: "Īpašas ienākošā e-pasta adreses"
-        incoming_email_placeholder: "ievadi e-pasta adresi"
         none_selected: "Izvēlēties grupu, lai uzsāktu"
         no_custom_groups: "Izveidot jaunu specifisku grupu"
       api:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index ad3814ae96..9e5f51d711 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -344,22 +344,20 @@ nb_NO:
         make_user_group_owner: "Gjør til eier"
         remove_user_as_group_owner: "Trekk tilbake eierstatus"
     groups:
-      logs:
-        title: "Logger"
-        when: "Når"
-        action: "Handling"
-        acting_user: "Utførende bruker"
-        target_user: "Målbruker"
-        subject: "Emne"
-        details: "Detaljer"
-        from: "Fra"
-        to: "Til"
-      edit:
-        title: 'Rediger gruppe'
+      manage:
+        title: 'Behandle'
+        name: 'Navn'
         full_name: 'Fullt navn'
         add_members: "Legg til medlemmer"
-        delete_member_confirm: "Fjern '%{username}' fra gruppen '%{group}'?"
-      name_placeholder: "Gruppenavn, ingen mellomrom, samme regler som for brukernavn"
+        profile:
+          title: Profil
+        logs:
+          title: "Logger"
+          when: "Når"
+          action: "Handling"
+          details: "Detaljer"
+          from: "Fra"
+          to: "Til"
       public_admission: "Tillat brukere å ta del i gruppen fritt (krever offentlig synlig gruppe)"
       public_exit: "Tillat brukere å fritt forlate gruppen"
       empty:
@@ -370,15 +368,7 @@ nb_NO:
         topics: "Det finnes ingen tråder opprettet av medlemmer av denne gruppen."
         logs: "Det finnes ingen logger for denne gruppen."
       add: "Legg til"
-      join: "Bli medlem av gruppe"
-      leave: "Forlat gruppe"
-      request: "Be om gruppemedlemskap"
-      filter_name: "filtrer etter gruppenavn"
       message: "Melding"
-      automatic_group: Automatisk gruppe
-      close_group: Lukk gruppe
-      is_group_user: "Du er medlem av denne gruppen"
-      is_group_owner: "Du er eieren av denne gruppen"
       allow_membership_requests: "Tillat brukere å sende forespørsler om medlemskap av gruppen til eiere"
       membership_request_template: "Egendefinert mal å vise brukere når du sender en medlemskapsforespørsel."
       membership_request:
@@ -387,19 +377,31 @@ nb_NO:
         reason: "La gruppeeierne vite hvorfor du ønsker å ta del i denne gruppen"
       membership: "Medlemskap"
       name: "Navn"
-      user_count: "Medlemsantall"
+      group_name: "Gruppenavn"
+      user_count: "Brukere"
       bio: "Om gruppe"
       selector_placeholder: "oppgi brukernavn"
       owner: "eier"
       index:
         title: "Grupper"
+        all: "Alle grupper"
         empty: "Det finnes ingen synlige grupper"
+        filter: "Filtrer etter gruppetype"
         all_groups: "Alle grupper"
         owner_groups: "Grupper jeg eier"
-        close_groups: "Lukk grupper"
+        close_groups: "Lukkede grupper"
         automatic_groups: "Automatiske grupper"
+        automatic: "Automatisk"
+        closed: "Lukket"
+        public: "Offentlig"
+        private: "Privat"
         public_groups: "Offentlige grupper"
+        automatic_group: Automatisk gruppe
+        close_group: Lukk gruppe
         my_groups: "Mine grupper"
+        group_type: "Gruppetype"
+        is_group_user: "Medlem"
+        is_group_owner: "Eier"
       title:
         one: "Gruppe"
         other: "Grupper"
@@ -414,17 +416,12 @@ nb_NO:
         make_owner_description: "Gjør <b>%{username}</b> til eier av denne gruppen"
         remove_owner: "Fjern som eier"
         remove_owner_description: "Fjern <b>%{username}</b> som eier av denne gruppen"
+        owner: "Eier"
       topics: "Tråder"
       posts: "Innlegg"
       mentions: "Omtalelser"
       messages: "Meldinger"
       notification_level: "Forvalgt merknadsnivå for gruppemeldinger"
-      visibility_levels:
-        title: "Hvem kan se denne gruppen?"
-        public: "Alle"
-        members: "Gruppeeiere, medlemmer og administratorer"
-        staff: "Gruppemedlemmer og personale"
-        owners: "Gruppeeiere og administratorer"
       alias_levels:
         mentionable: "Hvem kan @nevne denne gruppen?"
         messageable: "Hvem kan sende meldinger til denne gruppen?"
@@ -433,9 +430,6 @@ nb_NO:
         mods_and_admins: "Kun moderatorer og administratorer"
         members_mods_and_admins: "Kun gruppemedlemmer, moderatorer og administratorer"
         everyone: "Alle"
-      trust_levels:
-        title: "Tillitsnivå som automatisk gis til nye medlemmer når de legges til:"
-        none: "ingen"
       notifications:
         watching:
           title: "Følger"
@@ -460,7 +454,6 @@ nb_NO:
       flair_color_placeholder: "(Valgfritt) Fargekode som hex-verdi"
       flair_preview_icon: "Forhåndsvis ikon"
       flair_preview_image: "Forhåndsvis bilde"
-      flair_note: "Merk: Bilde for gruppetilhørighet på avatar vil bare vises for brukerens primære gruppe."
     user_action_groups:
       '1': "Likes tildelt"
       '2': "Likes mottatt"
@@ -534,6 +527,7 @@ nb_NO:
       activity_stream: "Aktivitet"
       preferences: "Innstillinger"
       expand_profile: "Utvid"
+      collapse_profile: "Fold sammen"
       bookmarks: "Bokmerker"
       bio: "Om meg"
       invited_by: "Invitert av"
@@ -1091,7 +1085,6 @@ nb_NO:
       no_content: Ingen treff funnet
       filter_placeholder: Søk…
       create: "Opprett: {{content}}"
-      max_content_reached: "Du kan kun velge {{count}} gjenstander."
     emoji_picker:
       filter_placeholder: Søk etter emoji
       people: Folk
@@ -1264,22 +1257,6 @@ nb_NO:
       group_message_summary:
         one: "{{count}} melding i din {{group_name}} innboks"
         other: "{{count}} meldinger i din innboks for {{group_name}}"
-      alt:
-        mentioned: "Nevnt av"
-        quoted: "Sitert av"
-        replied: "Svart"
-        posted: "Innlegg av"
-        edited: "Rediger ditt innlegg innen"
-        liked: "Likte innlegget ditt"
-        private_message: "Personlig melding fra"
-        invited_to_private_message: "Invitert til en personlig melding fra"
-        invited_to_topic: "Invitert til en tråd fra"
-        invitee_accepted: "Invitiasjon akseptert av"
-        moved_post: "Ditt innlegg ble flyttet av"
-        linked: "Link til innlegget ditt"
-        granted_badge: "Merke innvilget"
-        group_message_summary: "Meldinger i gruppeinnboks"
-        topic_reminder: "En påminnelse"
       popup:
         mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
@@ -1313,9 +1290,6 @@ nb_NO:
       select_all: "Velg alle"
       clear_all: "Fjern Alle"
       too_short: "Din søketekst er for kort."
-      result_count:
-        one: "1 resultat for <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} resultater for <span class='term'>{{term}}</span>"
       title: "søk etter tråder, innlegg, brukere eller kategorier"
       no_results: "Ingen resultater funnet."
       no_more_results: "Ingen flere resultater funnet."
@@ -2576,7 +2550,6 @@ nb_NO:
         title: "Grupper"
         edit: "Rediger grupper"
         refresh: "Last inn på nytt"
-        new: "Ny"
         about: "Rediger gruppemedlemskap og navn her."
         group_members: "Gruppemedlemmer"
         delete: "Slett"
@@ -2584,22 +2557,11 @@ nb_NO:
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_owner_confirm: "Frata '%{username}' eier-privilegium?"
         add: "Legg til"
-        add_members: "Legg til medlemmer"
         custom: "Egendefinert"
-        bulk_complete: "Brukeren er lagt til i gruppen."
-        bulk_complete_users_not_added: "Disse brukerne ble ikke lagt til (forsikre deg om at de har kontoer):"
-        bulk: "Legg flere til i gruppe"
-        bulk_paste: "Lim inn en liste med brukernavn eller e-postadresser, en per linje:"
-        bulk_select: "(velg en gruppe)"
         automatic: "Automatisk"
-        automatic_membership_email_domains: "Brukere som registererer seg med et e-postdomene som er det samme som et i denne listen, vil automatisk bli lagt til i denne gruppen."
-        automatic_membership_retroactive: "Benytt samme e-postdomeneregel for å legge til eksisterende brukere"
         default_title: "Forvalgt tittel for alle brukere i denne gruppen"
-        primary_group: "Sett som primærgruppe automatisk"
         group_owners: Eiere
         add_owners: Legg til eiere
-        incoming_email: "Egendefinert innkommende e-postadresse"
-        incoming_email_placeholder: "oppgi e-postadresse"
         none_selected: "Velg en gruppe for å komme i gang"
         no_custom_groups: "Opprett en ny egendefinert gruppe"
       api:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index fc697583f9..1341fd3e59 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -164,6 +164,7 @@ nl:
     not_implemented: "Deze functie is helaas nog niet beschikbaar, sorry!"
     no_value: "Nee"
     yes_value: "Ja"
+    submit: "Verstuur"
     generic_error: "Sorry, er is iets fout gegaan."
     generic_error_with_reason: "Er is iets fout gegaan: %{error}"
     sign_up: "Registreren"
@@ -247,6 +248,7 @@ nl:
     uploaded: "Geupload!"
     enable: "Inschakelen"
     disable: "Uitschakelen"
+    continue: "Doorgaan"
     undo: "Ongedaan maken"
     revert: "Terugzetten"
     failed: "Mislukt"
@@ -324,22 +326,15 @@ nl:
         make_user_group_owner: "Eigenaar maken"
         remove_user_as_group_owner: "Eigenaar intrekken"
     groups:
-      logs:
-        title: "Logboeken"
-        when: "Wanneer"
-        action: "Actie"
-        acting_user: "Uitvoerende gebruiker"
-        target_user: "Doelgebruiker"
-        subject: "Onderwerp"
-        details: "Details"
-        from: "Van"
-        to: "Tot"
-      edit:
-        title: 'Groep bewerken'
+      manage:
+        name: 'Naam'
         full_name: 'Volledige naam'
         add_members: "Leden toevoegen"
-        delete_member_confirm: "'%{username}' uit de groep '%{group}' verwijderen?"
-      name_placeholder: "Groepsnaam, geen spaties, hetzelfde als gebruikersnaamregel"
+        profile:
+          title: Profiel
+        logs:
+          from: "Van"
+          to: "Naar"
       public_admission: "Gebruikers toestaan om vrij aan de groep deel te nemen (Groep moet hiervoor zichtbaar zijn)"
       public_exit: "Gebruikers toestaan om vrij de groep te verlaten"
       empty:
@@ -350,12 +345,8 @@ nl:
         topics: "Er zijn geen topics van leden van deze groep."
         logs: "Er zijn geen logs voor deze groep."
       add: "Toevoegen"
-      join: "Deelnemen aan groep"
-      leave: "Groep verlaten"
-      request: "Verzoek voor deelname aan groep"
+      leave: "Verlaat"
       message: "Bericht"
-      automatic_group: Automatische groep
-      is_group_user: "U bent een lid van deze groep"
       allow_membership_requests: "Gebruikers toestaan om lidmaatschapsverzoeken naar groepseigenaren te sturen"
       membership_request_template: "Aangepaste template om aan gebruikers te laten zien bij het sturen van een lidmaatschap verzoek"
       membership_request:
@@ -364,26 +355,32 @@ nl:
         reason: "Laat de groepbeheerders weten waarom je in deze groep hoort"
       membership: "Lidmaatschap"
       name: "Naam"
+      user_count: "Gebruikers"
       bio: "Over groep"
       owner: "eigenaar"
       index:
         title: "Groepen"
         empty: "Er zijn geen zichtbare groepen."
+        automatic: "Automatisch"
+        closed: "Gesloten"
+        public: "Openbaar"
+        private: "Privaat"
+        public_groups: "Publieke groepen"
+        my_groups: "Mijn groepen"
+        is_group_user: "Lid"
+        is_group_owner: "Eigenaar"
       title:
         one: "Groep"
         other: "Groepen"
       activity: "Activiteit"
+      members:
+        filter_placeholder_admin: "gebruikersnaam of e-mail, e-mailadres"
+        filter_placeholder: "gebruikersnaam"
       topics: "Topics"
       posts: "Berichten"
       mentions: "Vermeldingen"
       messages: "Berichten"
       notification_level: "Standaard meldingsniveau voor groepsberichten"
-      visibility_levels:
-        title: "Voor wie is deze groep zichtbaar?"
-        public: "Iedereen"
-        members: "Groepseigenaars, -beheerders en -leden"
-        staff: "Groepseigenaars en -personeel"
-        owners: "Groepeigenaars en -beheerders"
       alias_levels:
         mentionable: "Wie kan deze groep taggen?"
         messageable: "Wie kan deze groep een bericht sturen?"
@@ -392,9 +389,6 @@ nl:
         mods_and_admins: "Alleen moderators en beheerders"
         members_mods_and_admins: "Alleen groepsleden, moderators en beheerders"
         everyone: "Iedereen"
-      trust_levels:
-        title: "Vertrouwensniveau dat automatisch aan nieuwe gebruikers wordt toegekend:"
-        none: "Geen"
       notifications:
         watching:
           title: "In de gaten houden"
@@ -419,7 +413,6 @@ nl:
       flair_color_placeholder: "(Optioneel) Hex-kleurwaarde"
       flair_preview_icon: "Pictogramvoorbeeld"
       flair_preview_image: "Afbeeldingsvoorbeeld"
-      flair_note: "Opmerking: flair is alleen zichtbaar voor de primaire groep van een gebruiker."
     user_action_groups:
       '1': "Gegeven likes"
       '2': "Ontvangen likes"
@@ -492,6 +485,7 @@ nl:
       activity_stream: "Activiteit"
       preferences: "Voorkeuren"
       expand_profile: "Uitvouwen"
+      collapse_profile: "Samenvouwen"
       bookmarks: "Favorieten"
       bio: "Over mij"
       invited_by: "Uitgenodigd door"
@@ -507,6 +501,7 @@ nl:
         disable: "Meldingen uitschakelen"
         enable: "Meldingen inschakelen"
         each_browser_note: "Opmerking: u moet deze instelling in elke browser die u gebruikt wijzigen."
+      dismiss: 'Negeren'
       dismiss_notifications: "Alle verwijderen"
       dismiss_notifications_tooltip: "Alle ongelezen meldingen markeren als gelezen"
       first_notification: "Uw eerste melding! Selecteer deze om te beginnen."
@@ -605,6 +600,8 @@ nl:
         set_password: "Wachtwoord instellen"
         choose_new: "Kies een nieuw wachtwoord"
         choose: "Kies een wachtwoord"
+      second_factor:
+        label: "Code"
       change_about:
         title: "Over mij wijzigen"
         error: "Er is een fout opgetreden bij het wijzigen van deze waarde."
@@ -882,6 +879,7 @@ nl:
     first_post: Eerste bericht
     mute: Negeren
     unmute: Tonen
+    time_read: Gelezen
     last_reply_lowercase: laatste antwoord
     replies_lowercase:
       one: antwoord
@@ -1142,19 +1140,6 @@ nl:
       group_message_summary:
         one: "{{count}} bericht in je Postvak IN voor {{group_name}}"
         other: "{{count}} berichten in je Postvak IN voor {{group_name}}"
-      alt:
-        mentioned: "Genoemd door"
-        quoted: "Geciteerd door"
-        replied: "Beantwoord"
-        posted: "Geplaatst door"
-        edited: "Uw bericht bewerkt door"
-        liked: "Heeft uw bericht geliket"
-        invited_to_topic: "Uitgenodigd voor een topic door"
-        invitee_accepted: "Uitnodiging geaccepteerd door"
-        moved_post: "Uw bericht is verplaatst door"
-        linked: "Koppeling naar uw bericht"
-        granted_badge: "Badge toegekend"
-        group_message_summary: "Berichten in groepspostvak"
       popup:
         mentioned: '{{username}} heeft u genoemd in ''{{topic}}'' - {{site_title}}'
         group_mentioned: '{{username}} heeft u genoemd in ''{{topic}}'' - {{site_title}}'
@@ -1620,6 +1605,7 @@ nl:
       deleted_by_author:
         one: "(bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)"
         other: "(bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)"
+      collapse: "samenvouwen"
       expand_collapse: "uitvouwen/samenvouwen"
       gap:
         one: "1 verborgen antwoord weergeven"
@@ -2351,7 +2337,6 @@ nl:
         title: "Groepen"
         edit: "Groepen bewerken"
         refresh: "Vernieuwen"
-        new: "Nieuw"
         about: "Bewerk hier uw groepslidmaatschap en namen"
         group_members: "Groepsleden"
         delete: "Verwijderen"
@@ -2359,22 +2344,11 @@ nl:
         delete_failed: "Kan groep niet verwijderen. Als dit een automatische groep is, kan deze niet worden verwijderd."
         delete_owner_confirm: "Eigenaarsprivileges van '% {username}' verwijderen?"
         add: "Toevoegen"
-        add_members: "Leden toevoegen"
         custom: "Aangepast"
-        bulk_complete: "De gebruikers zijn aan de groep toegevoegd."
-        bulk_complete_users_not_added: "Deze gebruikers zijn niet toegevoegd (controleer of ze een account hebben):"
-        bulk: "Bulk toevoegen aan groep"
-        bulk_paste: "Plak een lijst van gebruikersnamen of e-mailadressen, één per regel:"
-        bulk_select: "(selecteer een groep)"
         automatic: "Automatisch"
-        automatic_membership_email_domains: "Gebruikers die zich met een e-maildomein registeren dat precies overeenkomt met een domein in deze lijst worden automatisch aan deze groep toegevoegd:"
-        automatic_membership_retroactive: "Dezelfde e-maildomeinregel toepassen voor het toevoegen van bestaande geregistreerde gebruikers"
         default_title: "Standaardtitel voor alle gebruikers in deze groep"
-        primary_group: "Automatisch instellen als primaire groep"
         group_owners: Eigenaren
         add_owners: Eigenaren toevoegen
-        incoming_email: "Aangepast adres voor inkomende e-mail"
-        incoming_email_placeholder: "voer e-mailadres in"
         none_selected: "Selecteer een groep om te beginnen"
         no_custom_groups: "Een nieuwe aangepaste groep maken"
       api:
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 8b3583c0d2..96a640a56a 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -176,10 +176,10 @@ pl_PL:
         enabled: 'wylistowanie %{when}'
         disabled: 'odlistowanie %{when}'
       banner:
-        enabled: 'Ten temat został ustawiony jako baner %{when}. Będzie widoczny na górze każdej strony, póki nie zostanie ukryty przez użytkownika.'
+        enabled: 'Ten temat został ustawiony jako baner . Będzie widoczny na górze każdej strony, póki nie zostanie ukryty przez użytkownika.'
         disabled: 'Ten temat nie jest już banerem. Nie będzie dalej wyświetlany na górze każdej strony.'
     topic_admin_menu: "akcje administratora"
-    wizard_required: "Witaj na Twoim na nowym forum opartym na Discourse! Rozpocznij konfigurację w <a href='%{url}' data-auto-route='true'>panelu konfiguracyjnym</a> ✨"
+    wizard_required: "Witaj na Twoim na nowym forum Discourse! Zacznijmy od <a href='%{url}' data-auto-route='true'>kreatora ustawień</a> ✨"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
     themes:
       default_description: "Domyślny"
@@ -375,22 +375,6 @@ pl_PL:
         make_user_group_owner: "Nadaj prawa właściciela"
         remove_user_as_group_owner: "Usuń prawa właściciela"
     groups:
-      logs:
-        title: "Logi"
-        when: "Kiedy"
-        action: "Akcja"
-        acting_user: "Uczestniczący użytkownik "
-        target_user: "Wybrany użytkownik"
-        subject: "Temat"
-        details: "Szczegóły"
-        from: "Od"
-        to: "Do"
-      edit:
-        title: 'Edytuj grupę'
-        full_name: 'Pełna nazwa'
-        add_members: "Dodaj użytkowników"
-        delete_member_confirm: "Czy usunąć użytkownika '%{username}' z grupy '%{group}'?"
-      name_placeholder: "Nazwa grupy, bez spacji, takie same zasady jak przy nazwie użytkownika"
       public_admission: "Zezwól wszystkim użytkownikom na dołączanie do tej grupy (widoczność grupy musi być ustawiona na publiczną)"
       public_exit: "Zezwól wszystkim użytkownikom na opuszczanie tej grupy"
       empty:
@@ -401,12 +385,7 @@ pl_PL:
         topics: "Nie ma wątków stworzonych przez użytkowników tej grupy"
         logs: "Nie ma logów dla tej grupy"
       add: "Dodaj"
-      join: "Dołącz do grupy"
-      leave: "Opuść grupę"
-      request: "Żądanie dołączenia do grupy"
       message: "Wiadomość"
-      automatic_group: Automatyczna grupa
-      is_group_user: "Jesteś członkiem tej grupy"
       allow_membership_requests: "Zezwól użytkownikom na wysyłanie zaproszeń do właścicieli grupy."
       membership_request_template: "Wyświetl niestandardowy szablon użytkownikom, w momencie wysyłania wniosku o członkostwo."
       membership_request:
@@ -431,12 +410,6 @@ pl_PL:
       mentions: "Wzmianki"
       messages: "Wiadomości"
       notification_level: "Domyślny poziom powiadomień dla wiadomości grupy."
-      visibility_levels:
-        title: "Kto może widzieć grupę?"
-        public: "Wszyscy"
-        members: "Właściciele grupy, członkowie i administratorzy"
-        staff: "Właściciele grupy i zespół"
-        owners: "Właściciele grupy i administratorzy"
       alias_levels:
         mentionable: "Kto może @wspomnieć tę grupę?"
         messageable: "Kto może wysyłać wiadomości do tej grupy?"
@@ -445,9 +418,6 @@ pl_PL:
         mods_and_admins: "Tylko moderatorzy i administratorzy"
         members_mods_and_admins: "Tylko członkowie grupy, moderatorzy i administratorzy"
         everyone: "Wszyscy"
-      trust_levels:
-        title: "Domyślny poziom zaufania przyznawany nowych użytkownikom:"
-        none: "Brak"
       notifications:
         watching:
           title: "Obserwowanie"
@@ -472,7 +442,6 @@ pl_PL:
       flair_color_placeholder: "(Opcjonalne) Kolor w formacie Hex"
       flair_preview_icon: "Podgląd ikony"
       flair_preview_image: "Podgląd obrazka"
-      flair_note: "Uwaga: Będzie wyświetlana jedynie odznaka grupy głównej użytkownika "
     user_action_groups:
       '1': "Przyznane lajki"
       '2': "Otrzymane lajki"
@@ -570,7 +539,7 @@ pl_PL:
       first_notification: "Twoje pierwsze powiadomienie! Kliknij aby zacząć."
       disable_jump_reply: "Po odpowiedzi nie przechodź do nowego wpisu"
       dynamic_favicon: "Pokazuj licznik powiadomień na karcie jako dynamiczny favicon"
-      theme_default_on_all_devices: "Ustaw ten motyw jako domyślny na wszystkich moich urządzeniach"
+      theme_default_on_all_devices: "Ustaw jako mój domyślny motyw na wszystkich urządzeniach"
       allow_private_messages: "Pozwól innym użytkownikom wysyłać do mnie prywatne wiadomości"
       external_links_in_new_tab: "Otwieraj wszystkie zewnętrzne odnośniki w nowej karcie"
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
@@ -1250,20 +1219,6 @@ pl_PL:
         few: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
         many: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
         other: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
-      alt:
-        mentioned: "Wywołanie przez"
-        quoted: "Cytowanie przez"
-        replied: "Odpowiedź"
-        posted: "Autor wpisu"
-        edited: "Edycja twojego wpisu"
-        liked: "Lajk twojego wpisu"
-        invited_to_topic: "Zaproszenie do tematu od"
-        invitee_accepted: "Zaproszenie zaakceptowane przez"
-        moved_post: "Twój wpis został przeniesiony przez"
-        linked: "Linkownie do twojego wpisu"
-        granted_badge: "Przyznanie odznaki"
-        group_message_summary: "Wiadomości w grupowej skrzynce odbiorczej"
-        topic_reminder: "Przypomnienie"
       popup:
         mentioned: '{{username}} wspomina o tobie w "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} wspomniał o Tobie w "{{topic}}" - {{site_title}}'
@@ -2607,7 +2562,6 @@ pl_PL:
         title: "Grupy"
         edit: "Edytuj grupy"
         refresh: "Odśwież"
-        new: "Nowa"
         about: "Tu możesz edytować przypisania do grup oraz ich nazwy"
         group_members: "Członkowie grupy"
         delete: "Usuń"
@@ -2615,22 +2569,11 @@ pl_PL:
         delete_failed: "Nie można usunąć grupy. Jeżeli jest to grupa automatyczna, nie może zostać zniszczona."
         delete_owner_confirm: "Usunąć status właściciela dla  '%{username}'?"
         add: "Dodaj"
-        add_members: "Dodaj członków"
         custom: "Niestandardowe"
-        bulk_complete: "Użytkownicy zostali dodani do wskazanej grupy."
-        bulk_complete_users_not_added: "Podani użytkownicy nie mogą zostać dodani (Sprawdź, czy stworzyli konto):"
-        bulk: "Dodaj więcej do grupy"
-        bulk_paste: "Podaj listę nazw użytkowników lub adresów e-mail,  każdy w oddzielnej linii:"
-        bulk_select: "(wybierz grupę)"
         automatic: "Automatyczne"
-        automatic_membership_email_domains: "Użytkownicy rejestrujący się przy pomocy adresu z tej listy zostaną automatycznie przypisani do tej grupy."
-        automatic_membership_retroactive: "Zastosuj tę regułę domenową do już istniejących użytkowników."
         default_title: "Domyślny tytuł użytkowników należących do tej grupy"
-        primary_group: "Automatycznie ustawiaj jako główną grupę"
         group_owners: Właściciele
         add_owners: Dodaj właścicieli
-        incoming_email: "Niestandardowy adres poczty przychodzącej"
-        incoming_email_placeholder: "podaj adres e-mail"
         none_selected: "Wybierz grupę, aby rozpocząć"
         no_custom_groups: "Utwórz nową grupę"
       api:
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 0941d8f296..479e188b7b 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -325,22 +325,6 @@ pt:
         make_user_group_owner: "Tornar dono"
         remove_user_as_group_owner: "Remover dono"
     groups:
-      logs:
-        title: "Registos"
-        when: "Quando"
-        action: "Ação"
-        acting_user: "Utlizador ator"
-        target_user: "Utilizador alvo"
-        subject: "Assunto"
-        details: "Detalhes"
-        from: "De"
-        to: "Para"
-      edit:
-        title: 'Editar Grupo'
-        full_name: 'Nome Completo'
-        add_members: "Adicionar membros"
-        delete_member_confirm: "Remover '%{username}' do grupo '%{group}'?"
-      name_placeholder: "Nome do grupo, sem espaços, com as mesmas regras do nome de utilizador"
       public_exit: "Permitir que os utilizadores deixem o grupo livremente"
       empty:
         posts: "Não existem publicações por membros deste grupo."
@@ -350,12 +334,7 @@ pt:
         topics: "Não existem tópicos por membros deste grupo."
         logs: "Não existem registos para este grupo."
       add: "Adicionar"
-      join: "Aderir ao Grupo"
-      leave: "Deixar o Grupo"
-      request: "Pedir para Aderir ao Grupo"
       message: "Mensagem"
-      automatic_group: Grupo Automático
-      is_group_user: "É um membro deste grupo"
       allow_membership_requests: "Permitir que os utilizadores enviem pedidos de adesão aos donos do grupo"
       membership_request:
         submit: "Submeter Pedido"
@@ -374,21 +353,12 @@ pt:
       mentions: "Menções"
       messages: "Mensagens"
       notification_level: "Nível de notificação predefinido para mensagens de grupo"
-      visibility_levels:
-        title: "Quem pode ver este grupo?"
-        public: "Toda a gente"
-        members: "Donos do grupo, membros e administradores"
-        staff: "Donos do grupo e equipa"
-        owners: "Donos do grupo e administradores"
       alias_levels:
         nobody: "Ninguém"
         only_admins: "Apenas administradores"
         mods_and_admins: "Apenas moderadores e Administradores"
         members_mods_and_admins: "Apenas membros do grupo, moderadores e administradores"
         everyone: "Todos"
-      trust_levels:
-        title: "Nível de confiança concedido automaticamente a membros quando são adicionados:"
-        none: "Nenhum"
       notifications:
         watching:
           title: "A vigiar"
@@ -1024,7 +994,6 @@ pt:
       no_content: Não foram encontradas correspondências
       filter_placeholder: Pesquisar...
       create: "Criar: '{{content}}'"
-      max_content_reached: "Só pode selecionar {{count}} itens."
     emoji_picker:
       filter_placeholder: Pesquisar por emoji
       people: Pessoas
@@ -1175,22 +1144,6 @@ pt:
       linked: "<span>{{username}}</span> {{description}}"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Novo Tópico</span> {{description}}"
-      alt:
-        mentioned: "Mencionado por"
-        quoted: "Citado por"
-        replied: "Respondido"
-        posted: "Publicado por"
-        edited: "Edição da sua publicação por"
-        liked: "Gostou da sua publicação"
-        private_message: "Mensagem privada de"
-        invited_to_private_message: "Convidado para uma mensagem privada de"
-        invited_to_topic: "Convidado para um tópico de"
-        invitee_accepted: "Convite aceite por"
-        moved_post: "A sua publicação foi movida por"
-        linked: "Hiperligação para a sua publicação"
-        granted_badge: "Distintivo concedido"
-        group_message_summary: "Mensagens na caixa de entrada do seu grupo"
-        topic_reminder: "Um lembrete"
       popup:
         mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}'
@@ -1224,9 +1177,6 @@ pt:
       select_all: "Selecionar Tudo"
       clear_all: "Limpar Tudo"
       too_short: "O seu termo de pesquisa é muito curto."
-      result_count:
-        one: "1 resultado para <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} resultados para <span class='term'>{{term}}</span>"
       title: "pesquisar por tópicos, publicações, utilizadores, ou categorias"
       no_results: "Não foram encontrados resultados."
       no_more_results: "Não foram encontrados mais resultados."
@@ -2282,7 +2232,6 @@ pt:
         title: "Grupos"
         edit: "Editar Grupos"
         refresh: "Atualizar"
-        new: "Novo"
         about: "Editar aqui a sua participação e nomes no grupo"
         group_members: "Membros do grupo"
         delete: "Eliminar"
@@ -2290,21 +2239,11 @@ pt:
         delete_failed: "Impossível eliminar grupo. Se se trata de um grupo automático, não pode ser eliminado."
         delete_owner_confirm: "Remover privilégios do proprietário para '%{username}'?"
         add: "Adicionar"
-        add_members: "Adicionar membros"
         custom: "Personalizar"
-        bulk_complete: "Os utilizadores foram adicionados ao grupo."
-        bulk: "Adicionar ao Grupo em Massa"
-        bulk_paste: "Colar uma lista de nomes de utilizador ou emails, um por linha:"
-        bulk_select: "(selecionar um grupo)"
         automatic: "Automático"
-        automatic_membership_email_domains: "Utilizadores que registem um domínio de email que corresponde exactamente a algum desta lista irão ser automaticamente adicionados a este grupo:"
-        automatic_membership_retroactive: "Aplicar a mesma regra de domínio de email para adicionar utilizadores registados existentes"
         default_title: "Título padrão para todos os utilizadores neste grupo"
-        primary_group: "Definir automaticamente como grupo primário"
         group_owners: Proprietários
         add_owners: Adicionar proprietários
-        incoming_email: "Endereço de email de entrada personalizado"
-        incoming_email_placeholder: "introduza o endereço de email"
       api:
         generate_master: "Gerar Chave Mestra API "
         none: "Não existem chaves API ativas neste momento."
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 263812d7bf..1df3a988b8 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -324,22 +324,6 @@ pt_BR:
         make_user_group_owner: "Tornar proprietário"
         remove_user_as_group_owner: "Revogar proprietário"
     groups:
-      logs:
-        title: "Registros"
-        when: "Quando"
-        action: "Ação"
-        acting_user: "Usuário atuando"
-        target_user: "Usuário destino"
-        subject: "Assunto"
-        details: "Detalhes"
-        from: "De"
-        to: "Para"
-      edit:
-        title: 'Editar Grupo'
-        full_name: 'Nome Completo'
-        add_members: "Adicionar Membros"
-        delete_member_confirm: "Remover '%{username}' do grupo '%{group}'?"
-      name_placeholder: "Nome do grupo, sem espaços, regras iguais ao nome de usuário"
       public_admission: "Permitir que os usuários se juntem ao grupo livremente (Requer grupo visível ao público)"
       public_exit: "Permitir que os usuários deixem o grupo livremente"
       empty:
@@ -350,12 +334,7 @@ pt_BR:
         topics: "Não há tópicos de membros deste grupo."
         logs: "Não há registros para este grupo."
       add: "Adicionar"
-      join: "Entrar no Grupo"
-      leave: "Sair do Grupo"
-      request: "Pedir para Entrar no Grupo"
       message: "Mensagem"
-      automatic_group: Grupo Automático
-      is_group_user: "Você é membro deste grupo"
       allow_membership_requests: "Permitir usuários enviar pedidos de adesão a proprietários de grupos"
       membership_request:
         submit: "Enviar Pedido"
@@ -373,9 +352,6 @@ pt_BR:
       mentions: "Menções"
       messages: "Mensagens"
       notification_level: "Nível de notificação padrão para mensagens de grupo"
-      visibility_levels:
-        title: "Quem pode ver este grupo?"
-        public: "Todo mundo"
       alias_levels:
         mentionable: "Quem pode @mencionar este grupo?"
         messageable: "Quem pode enviar mensagens a este grupo?"
@@ -384,9 +360,6 @@ pt_BR:
         mods_and_admins: "Somente moderadores e Administradores"
         members_mods_and_admins: "Somente membros do grupo, moderadores e administradores"
         everyone: "Todos"
-      trust_levels:
-        title: "Nível de Confiança automaticamente concedido aos membros quando eles são incluídos"
-        none: "Nenhum"
       notifications:
         watching:
           title: "Observando"
@@ -411,7 +384,6 @@ pt_BR:
       flair_color_placeholder: "(Opcional) Valor em hexadecimal da cor"
       flair_preview_icon: "Pré-visualizar Ícone"
       flair_preview_image: "Pré-visualizar Imagem"
-      flair_note: "Nota: o Flair somente será exibido para o grupo primário do usuário."
     user_action_groups:
       '1': "Curtidas dadas"
       '2': "Curtidas recebidas"
@@ -1116,20 +1088,6 @@ pt_BR:
       granted_badge: "Adquiriu '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Novo Tópico</span> {{description}}"
-      alt:
-        mentioned: "Mencionado por"
-        quoted: "Citado por"
-        replied: "Respondido"
-        posted: "Mensagem por"
-        edited: "Edição na sua mensagem por"
-        liked: "Curtiu sua mensagem"
-        invited_to_topic: "Convite para um tópico de"
-        invitee_accepted: "Convite aceito por"
-        moved_post: "Seu tópico foi movido por"
-        linked: "Link para sua mensagem"
-        granted_badge: "Emblema concedido"
-        group_message_summary: "Mensagens na caixa de entrada do grupo"
-        topic_reminder: "Um lembrete"
       popup:
         mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
@@ -2293,7 +2251,6 @@ pt_BR:
         title: "Grupos"
         edit: "Editar Grupos"
         refresh: "Atualizar"
-        new: "Novo"
         about: "Editar participação no grupo e nomes aqui"
         group_members: "Membros do grupo"
         delete: "Apagar"
@@ -2301,21 +2258,11 @@ pt_BR:
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
         delete_owner_confirm: "Remover privilégio de proprietário de '%{username}'?"
         add: "Adicionar"
-        add_members: "Adicionar membros"
         custom: "Definidos"
-        bulk_complete: "Os usuários foram adicionados ao grupo."
-        bulk: "Adição em Massa ao Grupo"
-        bulk_paste: "Cole uma lista de usernames ou emails, um por linha:"
-        bulk_select: "(selecione um grupo)"
         automatic: "Automático"
-        automatic_membership_email_domains: "Usuários que se registram com um domínio de email que confere precisamente com algum desta lista serão automaticamente adicionados a este grupo:"
-        automatic_membership_retroactive: "Aplicar a mesma regra de domínio de email para adicionar usuários registrados"
         default_title: "Título padrão para todos usuários nesse grupo"
-        primary_group: "Configurar automaticamente como grupo primário"
         group_owners: Prorietários
         add_owners: Adicionar proprietários
-        incoming_email: "Endereço de email de entrada personalizado"
-        incoming_email_placeholder: "Insira um endereço de email"
         none_selected: "Selecione um grupo para começar"
         no_custom_groups: "Crie um novo grupo"
       api:
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 8f47aed309..b9d2758cf1 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -265,6 +265,10 @@ ro:
       last_read: "Acesta este ultimul mesaj citit de tine; fă click să adaugi semn de carte"
       remove: "Șterge semn de carte"
       confirm_clear: "Ești sigur că dorești să ștergi toate semnele de carte din acest subiect?"
+    topic_count_latest:
+      one: "Un subiect nou sau actualizat."
+      few: "{{count}} subiecte noi sau actualizate."
+      other: "{{count}} de subiecte noi sau actualizate."
     preview: "Previzualizează"
     cancel: "Anulează"
     save: "Salvează schimbările"
@@ -357,22 +361,6 @@ ro:
         make_user_group_owner: "Fă proprietar"
         remove_user_as_group_owner: "Revocă proprietar"
     groups:
-      logs:
-        title: "Jurnale"
-        when: "Când"
-        action: "Acțiune"
-        acting_user: "Utilizator temporar"
-        target_user: "Utilizator țintă"
-        subject: "Subiect"
-        details: "Detalii"
-        from: "De la"
-        to: "Către"
-      edit:
-        title: 'Editează grup'
-        full_name: 'Nume complet'
-        add_members: "Adaugă membri"
-        delete_member_confirm: "Șterge utilizatorul '%{username}' din grupul '%{group}'?"
-      name_placeholder: "Numele grupului, fără spații, la fel ca regula pentru nume utilizator"
       public_admission: "Permite utilizatorilor să adere la grup fără restricții (Presupune ca grupul să fie vizibil)"
       public_exit: "Permite utilizatorilor să părăsească grupul în mod liber."
       empty:
@@ -383,12 +371,7 @@ ro:
         topics: "Nu există nici un subiect creat de vreun membru al acestui grup."
         logs: "Nu există nici un jurnal pentru acest grup."
       add: "Adaugă"
-      join: "Alătură-te grupului"
-      leave: "Părăsește grupul"
-      request: "Cere să te alături grupului"
       message: "Mesaj"
-      automatic_group: Grup automat
-      is_group_user: "Ești membru al acestui grup"
       allow_membership_requests: "Permite utilizatorilor să trimită cereri de membru către proprietarul grupului."
       membership_request_template: "Șablonul personalizat pentru a fi afișat utilizatorilor atunci când trimiteți o solicitare de membru"
       membership_request:
@@ -412,12 +395,6 @@ ro:
       mentions: "Mențiuni"
       messages: "Mesaje"
       notification_level: "Nivelul de notificare prestabilit pentru mesajele de grup"
-      visibility_levels:
-        title: "Cine poate vedea acest grup?"
-        public: "Toată lumea"
-        members: "Proprietarii grupului, membrii și adminii"
-        staff: "Proprietarii grupului și echipa"
-        owners: "Proprietarii și adminii din grup"
       alias_levels:
         mentionable: "Cine poate @menționa acest grup?"
         messageable: "Cine poate trimite mesaje acestui grup?"
@@ -426,9 +403,6 @@ ro:
         mods_and_admins: "Doar moderatorii și adminii"
         members_mods_and_admins: "Membrii grupului, moderatorii și adminii"
         everyone: "Toată lumea"
-      trust_levels:
-        title: "Nivel de încredere acordat automat membrilor atunci când sunt adăugați:"
-        none: "Nimeni"
       notifications:
         watching:
           title: "Urmărind activ"
@@ -453,7 +427,6 @@ ro:
       flair_color_placeholder: "(Opțional) Valoarea Hex a culorii"
       flair_preview_icon: "Previzualizează iconiță"
       flair_preview_image: "Previzualizează imagine"
-      flair_note: "Observație: Elementul distinct va fi afișat doar pentru grupul principal al utilizatorului."
     user_action_groups:
       '1': "Aprecieri date"
       '2': "Aprecieri primite"
@@ -1218,21 +1191,6 @@ ro:
       granted_badge: "Ai câștigat '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Subiect nou</span> {{description}}"
-      alt:
-        mentioned: "Menționat de"
-        quoted: "Citat de"
-        replied: "Răspuns"
-        posted: "Postat de"
-        edited: "Editează postarea prin"
-        liked: "V-a apreciat postarea"
-        private_message: "Mesaj personal de la"
-        invited_to_private_message: "Invitat la un mesaj privat de către"
-        invited_to_topic: "Invitat la un subiect de către"
-        invitee_accepted: "Invitație acceptată de către"
-        moved_post: "Postarea ta a fost mutată de către"
-        linked: "Link spre postarea ta"
-        granted_badge: "Ecuson acordat"
-        group_message_summary: "Mesaje în căsuța poștală a grupului"
       popup:
         mentioned: '{{username}} te-a menţionat în "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} te-a menţionat în "{{topic}}" - {{site_title}}'
@@ -2282,7 +2240,7 @@ ro:
         few: "A primit acest ecuson de %{count} ori"
         other: "A primit acest ecuson de %{count} de ori"
       granted_on: "Acordat acum %{date}"
-      others_count: "Numărul celorlalți care au acest ecuson (%{count})"
+      others_count: "Alții cu acest ecuson (%{count})"
       title: Ecusoane
       multiple_grant: "Poți primi asta de mai multe ori"
       badge_count:
@@ -2514,7 +2472,6 @@ ro:
         title: "Grupuri"
         edit: "Editează grupuri"
         refresh: "Reîmprospătează"
-        new: "Noi"
         about: "Editează aici numele și apartenența la grupuri"
         group_members: "Membrii grupului"
         delete: "Șterge"
@@ -2522,22 +2479,11 @@ ro:
         delete_failed: "Imposibil de șters grupul. Dacă este unul automat, nu se poate șterge."
         delete_owner_confirm: "Revocă dreptul de proprietar pentru '%{username}'?"
         add: "Adaugă"
-        add_members: "Adaugă membri"
         custom: "Personalizat"
-        bulk_complete: "Utilizatorii au fost adăugați în grup."
-        bulk_complete_users_not_added: "Acești utilizatori nu au fost adăugați (asigură-te că au cont):"
-        bulk: "Adaugă în grup mai mulți utilizatori odată"
-        bulk_paste: "Lipește o listă de utilizatori sau email-uri, câte unul pe linie:"
-        bulk_select: "(selectează un grup)"
         automatic: "Automat"
-        automatic_membership_email_domains: "Utilizatorii care se înregistrează cu un domeniu de email identic cu unul din lista asta vor fi adăugați automat în acest grup:"
-        automatic_membership_retroactive: "Aplică aceeaşi regulă pentru domeniul de email pentru a adauga utilizatorii existenţi"
         default_title: "Titlu implicit pentru toți utilizatorii din acest grup"
-        primary_group: "Setează automat ca grup principal"
         group_owners: Proprietari
         add_owners: Adaugă proprietari
-        incoming_email: "Adresă de primire emailuri personalizată"
-        incoming_email_placeholder: "introducere adresă de email"
         none_selected: "Alege un grup pentru a începe"
         no_custom_groups: "Creează un nou grup personalizat"
       api:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 2a65929fb8..71cba26d94 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -152,9 +152,11 @@ ru:
       email: 'Поделиться ссылкой по электронной почте'
     action_codes:
       public_topic: "Сделал эту тему публичной %{when}"
+      private_topic: "сделал эту тему персональным сообщением %{when}"
       split_topic: "Разделил эту тему %{when}"
       invited_user: "Пригласил %{who} %{when}"
       invited_group: "Пригласил %{who} %{when}"
+      user_left: "%{who} удалить себя из этого сообщения %{when}"
       removed_user: "Исключил %{who} %{when}"
       removed_group: "Исключил %{who} %{when}"
       autoclosed:
@@ -177,6 +179,7 @@ ru:
         disabled: 'Исключил из списков %{when}'
       banner:
         enabled: 'создал(а) из этого баннер %{when}. Он будет виден вверху каждой страницы пока пользователь не закроет его.'
+        disabled: 'удалил это объявление %{when}. Он больше не будет отображаться в верхней части каждой страницы.'
     topic_admin_menu: "действия администратора над темой"
     wizard_required: "Добро пожаловать в ваш новый Discourse! Начните с <a href='%{url}' data-auto-route='true'>мастера настройки</a> ✨"
     emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту."
@@ -203,6 +206,7 @@ ru:
     not_implemented: "Извините, эта функция еще не реализована!"
     no_value: "Нет"
     yes_value: "Да"
+    submit: "Представлять"
     generic_error: "Извините, произошла ошибка."
     generic_error_with_reason: "Произошла ошибка: %{error}"
     sign_up: "Зарегистрироваться"
@@ -278,6 +282,21 @@ ru:
       last_read: "это последнее прочитанное вами сообщение; нажмите, чтобы добавить его в закладки"
       remove: "Удалить закладку"
       confirm_clear: "Вы уверены, что хотите удалить все эти темы из Избранного?"
+    topic_count_latest:
+      one: "Есть {{count}} новая или обновленная тема"
+      few: "Есть {{count}} новых или обновленных тем"
+      many: "Есть {{count}} новых или обновленных тем"
+      other: "Есть {{count}} новых или обновленных тем"
+    topic_count_unread:
+      one: "Посмотреть {{count}} непрочитанную тему"
+      few: "Посмотреть {{count}} непрочитанных тем"
+      many: "Посмотреть {{count}} непрочитанных тем"
+      other: "Посмотреть {{count}} непрочитанных тем"
+    topic_count_new:
+      one: "Посмотреть {{count}} новую тему"
+      few: "Посмотреть {{count}} новые темы"
+      many: "Посмотреть {{count}} новые темы"
+      other: "Посмотреть {{count}} новые темы"
     preview: "предпросмотр"
     cancel: "отмена"
     save: "Сохранить"
@@ -290,6 +309,7 @@ ru:
     pasting: "Вставка..."
     enable: "Включить"
     disable: "Отключить"
+    continue: "Продолжать"
     undo: "Отменить"
     revert: "Вернуть"
     failed: "Проблема"
@@ -373,22 +393,21 @@ ru:
         make_user_group_owner: "Сделать владельцем"
         remove_user_as_group_owner: "Лишить прав владельца"
     groups:
-      logs:
-        title: "Логи"
-        when: "Когда"
-        action: "Действие"
-        acting_user: "Действующий пользователь"
-        target_user: "Целевой пользователь"
-        subject: "Тема"
-        details: "Подробности"
-        from: "От"
-        to: "Кому"
-      edit:
-        title: 'Редактировать Группу'
-        full_name: 'Полное Имя'
-        add_members: "Добавить Участников"
-        delete_member_confirm: "Удалить '%{username}' из группы '%{group}'?"
-      name_placeholder: "Название группы, без пробелов, по тем же правилам, что и для псевдонимов."
+      add_members:
+        usernames: "Псевдоним"
+      manage:
+        name: 'Имя'
+        full_name: 'Полное имя'
+        add_members: "Добавить участника"
+        delete_member_confirm: "Удалить '%{username}' из '%{group}' группы?"
+        profile:
+          title: Профиль
+        interaction:
+          notification: Уведомление
+        logs:
+          title: "Логи"
+          when: "Когда"
+          details: "Подробности"
       public_admission: "Разрешить пользователям свободно присоединяться к группе (требуется общедоступная группа)"
       public_exit: "Разрешить пользователям свободно покидать группу"
       empty:
@@ -399,47 +418,63 @@ ru:
         topics: "Нет тем от участников этой группы."
         logs: "Нет логов для этой группы."
       add: "Добавить"
-      join: "Вступить в Группу"
-      leave: "Покинуть Группу"
-      request: "Попроситься в Группу"
       message: "Сообщение"
-      automatic_group: Автоматическая Группа
-      is_group_user: "Вы участник этой группы"
       allow_membership_requests: "Разрешить пользователям отправлять запросы на вступление в группу владельцев"
       membership_request:
         submit: "Подтвердить запрос"
         title: "Запрос на вступление в группу %{group_name}"
       membership: "Участие"
       name: "Название"
+      group_name: "Название группы"
+      user_count: "Пользователи"
       bio: "О Группе"
+      selector_placeholder: "введите псевдоним"
       owner: "владелец"
       index:
         title: "Группы"
+        all: "Все Группы"
         empty: "Нет видимых групп."
+        filter: "Фильтр по типу группы"
+        all_groups: "Все Группы"
+        close_groups: "Закрытая группа"
+        automatic_groups: "Автоматические Группы"
+        automatic: "Автоматическая"
+        closed: "Закрыто"
+        public: "Публичный"
+        private: "Закрытый"
+        public_groups: "Публичные Группы"
+        automatic_group: Автоматическая группа
+        close_group: Закрытая группа
+        my_groups: "Мои Группы"
+        group_type: "Тип группы"
+        is_group_user: "Участник"
+        is_group_owner: "Владелец"
       title:
         one: "Группа"
         few: "Группы"
         many: "Группы"
         other: "Группы"
       activity: "Деятельность"
+      members:
+        title: "Участники"
+        filter_placeholder_admin: "псевдоним или e-mail"
+        filter_placeholder: "псевдоним"
+        remove_member: "Удалить Пользователя"
+        remove_member_description: "Удалить <b>%{username}</b> из группы"
+        make_owner: "Сделать Владельцем"
+        remove_owner: "Удалить Владельца"
       topics: "Темы"
       posts: "Сообщения"
       mentions: "Упоминания"
       messages: "Сообщения"
-      visibility_levels:
-        title: "Кто может видеть эту группу?"
-        public: "Все"
-        members: "Владельцы группы, участники и администраторы"
-        owners: "Владельцы группы и администраторы"
+      notification_level: "Уровень уведомлений по умолчанию для сообщений группы"
       alias_levels:
+        messageable: "Кто может писать сообщить в эту группу?"
         nobody: "Никто"
         only_admins: "Только администраторы"
         mods_and_admins: "Только модераторы и администраторы"
         members_mods_and_admins: "Только члены группы, модераторы и администраторы"
         everyone: "Все"
-      trust_levels:
-        title: "Уровень доверия участника при создании:"
-        none: "(Нет)"
       notifications:
         watching:
           title: "Наблюдать"
@@ -464,7 +499,6 @@ ru:
       flair_color_placeholder: "(Необязательно) Hex-код цвета"
       flair_preview_icon: "Иконка Предпросмотра"
       flair_preview_image: "Изображение Предпросмотра"
-      flair_note: "Внимание: Флаер будет показываться только основной группе пользователей."
     user_action_groups:
       '1': "Выразил симпатий"
       '2': "Получил симпатий"
@@ -555,6 +589,7 @@ ru:
         disable: "Отключить оповещения"
         enable: "Включить оповещения"
         each_browser_note: "Примечание: эта настройка устанавливается в каждом браузере индивидуально."
+      dismiss: 'Отложить'
       dismiss_notifications: "Отложить все"
       dismiss_notifications_tooltip: "Пометить все непрочитанные уведомления прочитанными"
       first_notification: "Ваше первое уведомление! Выберите его, чтобы начать."
@@ -637,6 +672,7 @@ ru:
         move_to_archive: "Архив"
         failed_to_move: "Невозможно переместить выделенные сообщения (возможно, у вас проблемы с Интернетом)"
         select_all: "Выбрать все"
+        tags: "Тэги"
       preferences_nav:
         account: "Учётная запись"
         profile: "Профиль"
@@ -654,6 +690,9 @@ ru:
         set_password: "Установить пароль"
         choose_new: "Выберите новый пароль"
         choose: "Выберите пароль"
+      second_factor:
+        title: "Двухфакторная аутентификация"
+        disable: "Отключить двухфакторную аутентификацию"
       change_about:
         title: "Изменить информацию обо мне"
         error: "При изменении значения произошла ошибка."
@@ -951,6 +990,8 @@ ru:
     first_post: Первое сообщение
     mute: Отключить
     unmute: Включить
+    last_post: Дата
+    time_read: Прочитанные
     last_reply_lowercase: последний ответ
     replies_lowercase:
       one: ответ
@@ -1009,10 +1050,13 @@ ru:
       title: "Войти"
       username: "Пользователь"
       password: "Пароль"
+      second_factor_title: "Двухфакторная аутентификация"
+      second_factor_description: "Пожалуйста, введите код аутентификации из вашего приложения:"
       email_placeholder: "E-mail или псевдоним"
       caps_lock_warning: "Caps Lock включен"
       error: "Неизвестная ошибка"
       rate_limit: "Сделайте перерыв перед очередной попыткой войти."
+      blank_username: "Введите ваш e-mail  или псевдоним."
       blank_username_or_password: "Введите ваш e-mail (или псевдоним) и пароль."
       reset_password: 'Сброс пароля'
       logging_in: "Проверка..."
@@ -1099,6 +1143,8 @@ ru:
       objects: Objects
       celebration: Celebration
       recent: Недавно использованные
+    shared_drafts:
+      title: "Общие Черновики"
     composer:
       emoji: "Смайлики :)"
       more_emoji: "еще..."
@@ -1133,6 +1179,7 @@ ru:
         post_length: "Сообщение должно быть не короче {{min}} символов"
         try_like: 'Пробовали ли вы выразить симпатию с помощью кнопки <i class="fa fa-heart"></i> ?'
         category_missing: "Нужно выбрать раздел"
+        tags_missing: "Необходимо выбрать по крайней мере {{count}} тег"
       save_edit: "Сохранить"
       reply_original: "Ответ в первоначальной теме"
       reply_here: "Ответить в текущей теме"
@@ -1141,6 +1188,7 @@ ru:
       create_topic: "Создать тему"
       create_pm: "Отправить личное сообщение"
       create_whisper: "Внутреннее сообщение"
+      create_shared_draft: "Создать Общий Проект"
       title: "Или нажмите Ctrl+Enter"
       users_placeholder: "Добавить пользователя"
       title_placeholder: "Название: суть темы коротким предложением"
@@ -1197,6 +1245,8 @@ ru:
           label: Ответить на тему
         create_topic:
           label: "Новая тема"
+        shared_draft:
+          label: "Общий Проект"
     notifications:
       tooltip:
         regular:
@@ -1221,26 +1271,13 @@ ru:
         few: "{{count}} сообщений в вашей группе: {{group_name}} "
         many: "{{count}} сообщений в вашей группе: {{group_name}} "
         other: "{{count}} сообщений в вашей группе: {{group_name}} "
-      alt:
-        mentioned: "Упомянуто"
-        quoted: "Процитировано пользователем"
-        replied: "Ответил"
-        posted: "Опубликовано"
-        edited: "Изменил ваше сообщение"
-        liked: "Понравилось ваше сообщение"
-        private_message: "Личное сообщение от"
-        invited_to_topic: "Приглашение в тему от"
-        invitee_accepted: "Приглашение принято"
-        moved_post: "Ваша тема перенесена участником "
-        linked: "Ссылка на ваше сообщение"
-        granted_badge: "Награда получена от"
-        group_message_summary: "Входящие сообщения группы"
       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}}'
+        private_message: '{{username}} отправил вам личное сообщение в "{{topic}}" - {{site_title}}'
         linked: '{{username}} ссылается на ваш пост в теме: "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Add an image"
@@ -1303,6 +1340,7 @@ ru:
           unpinned: Не закреплены
           unseen: Отметить непрочитанным
           wiki: Являются вики
+          all_tags: Все вышеуказанные теги
         statuses:
           label: Характеристика темы
           open: Открыта
@@ -1396,6 +1434,8 @@ ru:
       move_to_inbox:
         title: 'Переместить во входящие'
         help: 'Переместить сообщение во входящие'
+      edit_message:
+        title: 'Редактировать сообщение'
       list: 'Темы'
       new: 'новая тема'
       unread: 'непрочитанно'
@@ -1454,10 +1494,15 @@ ru:
       jump_reply_down: перейти к более поздним ответам
       deleted: "Тема удалена"
       auto_update_input:
+        tomorrow: "Завтра"
         later_this_week: "Позже на этой неделе"
         this_weekend: "В эти выходные"
         next_week: "На следующей неделе"
+        two_weeks: "Две недели"
         next_month: "В следующем месяце"
+        three_months: "Три месяца"
+        six_months: "Шесть месяцев"
+        one_year: "Один год"
         forever: "Навсегда"
         pick_date_and_time: "Выбрать дату и время"
       temp_open:
@@ -1953,7 +1998,7 @@ ru:
       topic_template: "Шаблон темы"
       tags: "Тэги"
       tags_allowed_tags: "Разрешить использовать в этом разделе только следующие метки:"
-      tags_allowed_tag_groups: "Разрешить использовать в этом разделе только метки из этих групп:"
+      tags_allowed_tag_groups: "Разрешить использовать в этом разделе только теги из этих групп:"
       tags_placeholder: "(Необязательно) список доступных тегов"
       tag_groups_placeholder: "(Необязательно) список доступных групп тегов"
       topic_featured_link_allowed: "Разрешить популярные ссылки в этой категории"
@@ -2002,6 +2047,7 @@ ru:
       default_position: "Позиция по умолчанию"
       position_disabled: "Разделы будут показаны в порядке активности. Чтобы настроить порядок разделов,"
       position_disabled_click: 'включите настройку "fixed category positions".'
+      minimum_required_tags: 'Минимальное количество тегов, требуемых в теме:'
       parent: "Родительский раздел"
       notifications:
         watching:
@@ -2355,7 +2401,7 @@ ru:
       </p>
     tagging:
       all_tags: "Все теги"
-      other_tags: "Изменить тэги"
+      other_tags: "Изменить теги"
       selector_all_tags: "Все теги"
       selector_no_tags: "Нет тегов"
       changed: "Теги изменены:"
@@ -2405,6 +2451,7 @@ ru:
         save: "Сохранить"
         delete: "Удалить"
         confirm_delete: "Вы уверены, что хотите удалить эту группу тегов?"
+        visible_only_to_staff: "Теги видны только персоналу"
       topics:
         none:
           unread: "Нет непрочитанных тем."
@@ -2562,7 +2609,6 @@ ru:
         title: "Группы"
         edit: "Управление группами"
         refresh: "Обновить"
-        new: "Добавить новую"
         about: "Здесь можно редактировать группы и имена групп"
         group_members: "Участники группы"
         delete: "Удалить"
@@ -2570,22 +2616,11 @@ ru:
         delete_failed: "Невозможно удалить группу. Если группа была создана автоматически, то она не может быть удалена."
         delete_owner_confirm: "Отозвать права владельца у пользователя '%{username}'?"
         add: "Добавить"
-        add_members: "Добавить участников"
         custom: "Настраиваемые"
-        bulk_complete: "Пользователи успешно добавлены в группу."
-        bulk_complete_users_not_added: "Эти пользователи не были добавлены (убедитесь, что у них есть учётная запись):"
-        bulk: "Массовое добавление в группу"
-        bulk_paste: "Впишите список пользователей или адресов e-mail, по одному на строчку:"
-        bulk_select: "(выберите группу)"
         automatic: "Автоматические"
-        automatic_membership_email_domains: "Пользователи, которые регистрируются с доменом электронной почты из этого списка, будут автоматически добавлены в группу:"
-        automatic_membership_retroactive: "Добавить в группу уже сущетсвующих зарегестрированных пользователей по этому правилу домена электронной почты"
         default_title: "Заголовок по умолчанию для всех пользователей в группе"
-        primary_group: "Автоматически использовать в качестве основной группы"
         group_owners: Владельцы
         add_owners: Добавить владельцев
-        incoming_email: "Специальный входящий адрес e-mail"
-        incoming_email_placeholder: "введите e-mail"
         none_selected: "Чтобы начать, выберите группу!"
         no_custom_groups: "Создать новую кастомную группу"
       api:
@@ -2793,6 +2828,7 @@ ru:
           common: "Общее"
           desktop: "Настольный"
           mobile: "Мобильный"
+          settings: "Настройки"
           preview: "Предпросмотр"
           is_default: "Активировать по умолчанию"
           user_selectable: "Пользователи могут выбирать стиль"
@@ -2821,6 +2857,7 @@ ru:
           updating: "Обновляю..."
           up_to_date: "Стиль текущей версии, последняя проверка:"
           add: "Добавить"
+          theme_settings: "Настройки темы"
           commits_behind:
             one: "Тема находится на 1 коммит сзади!"
             few: "Тема находится на {{count}} коммитов сзади!"
@@ -3236,6 +3273,7 @@ ru:
         private_topics_count: Частные темы
         posts_read_count: Прочитано сообщений
         post_count: Создано сообщений
+        second_factor_enabled: Двухфакторная аутентификация включена
         topics_entered: Просмотрено тем
         flags_given_count: Отправлено жалоб
         flags_received_count: Получено жалоб
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index ca8b1e3fe9..b7a1bda91d 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -189,6 +189,7 @@ sk:
     not_implemented: "Ľutujeme, táto funkcia ešte nie je implementovaná."
     no_value: "Nie"
     yes_value: "Áno"
+    submit: "Odoslať"
     generic_error: "Ľutujeme, nastala chyba."
     generic_error_with_reason: "Nastala chyba: %{error}"
     sign_up: "Registrácia"
@@ -275,6 +276,7 @@ sk:
     pasting: "Vkladám..."
     enable: "Zapnúť"
     disable: "Vypnúť"
+    continue: "Pokračovať"
     undo: "Späť"
     revert: "Vrátiť zmeny"
     failed: "Nepodarilo sa"
@@ -355,20 +357,23 @@ sk:
         make_user_group_owner: "Nastaviť ako vlastníka"
         remove_user_as_group_owner: "Odobrať vlastníka"
     groups:
-      logs:
-        title: "Záznamy"
-        when: "Kedy"
-        action: "Akcia"
-        target_user: "Cieľový používateľ"
-        subject: "Predmet"
-        details: "Detaily"
-        from: "Od"
-        to: "Komu"
-      edit:
-        title: 'Upraviť skupinu'
+      manage:
+        title: 'Spravovať'
+        name: 'Názov'
         full_name: 'Celé meno'
         add_members: "Pridať používateľov"
-      name_placeholder: "Meno skupiny, bez medzier, také isté pravidlá ako pre používateľské meno"
+        delete_member_confirm: "Odstrániť '%{username}' zo skupiny '%{group}'?"
+        profile:
+          title: Profil
+        logs:
+          title: "Záznamy"
+          when: "Kedy"
+          action: "Akcia"
+          target_user: "Cieľový používateľ"
+          subject: "Predmet"
+          details: "Detaily"
+          from: "Od"
+          to: "Komu"
       public_admission: "Povoliť používateľom slobodne sa stať člen skupiny (kupina musí byť verejne viditeľná)"
       public_exit: "Povoliť používateľom slobodne opustiť skupinu."
       empty:
@@ -379,12 +384,10 @@ sk:
         topics: "Členovia tejto skupiny nezaložili žiadne témy."
         logs: "Pre túto skupinu neexistujú žiadne logy."
       add: "Pridať"
-      join: "Pridať sa do skupiny"
-      leave: "Opustiť skupinu"
-      request: "Požiadať o pridanie do skupiny"
+      join: "Pridať sa"
+      leave: "Opustiť"
+      request: "Požiadavka"
       message: "Správa"
-      automatic_group: Automatická skúpina
-      is_group_user: "Si členom tejto skupiny"
       allow_membership_requests: "Používatelia môžu posielať žiadosti o členstvo vlastníkom skupiny"
       membership_request:
         submit: "Odošli požiadavku"
@@ -392,25 +395,50 @@ sk:
         reason: "Dajte vedieť vlastníkom skupiny prečo do tejto skupiny patríte"
       membership: "Členstvo"
       name: "Meno"
+      group_name: "Názov skupiny"
+      user_count: "Používatelia"
       bio: "O skupine"
+      selector_placeholder: "zadať používateľské meno"
       owner: "vlastník"
       index:
         title: "Skupiny"
+        all: "Všetky skupiny"
         empty: "Nenašli sa viditeľné skupiny."
+        all_groups: "Všetky skupiny"
+        owner_groups: "Skupiny, ktorých som vlastníkom"
+        close_groups: "Uzavreté skupina"
+        automatic_groups: "Automatické skupiny"
+        automatic: "Automaticky"
+        closed: "Zatvorené"
+        public: "Verejné"
+        private: "Súkromné"
+        public_groups: "Verejné skupiny"
+        automatic_group: Automatická skúpina
+        close_group: Uzavrieť skupinu
+        my_groups: "Moje skupiny"
+        group_type: "Typ skupiny"
+        is_group_user: "Člen"
+        is_group_owner: "Vlastník"
       title:
         one: "Skupina"
         few: "Skupiny"
         other: "Skupiny"
       activity: "Aktivita"
+      members:
+        title: "Členovia"
+        filter_placeholder_admin: "používateľské meno alebo email"
+        filter_placeholder: "používateľské meno"
+        remove_member: "Odstrániť člena"
+        remove_member_description: "Odstrániť <b>%{username}</b> z tejto skupiny"
+        make_owner: "Nastaviť ako vlastníka"
+        make_owner_description: "Nastaviť <b>%{username}</b> ako vlastníka tejto skupiny"
+        remove_owner: "Odobrať ako vlastníka"
+        remove_owner_description: "Odobrať <b>%{username}</b> ako vlastníka tejto skupiny"
+        owner: "Vlastník"
       topics: "Témy"
       posts: "Príspevky"
       mentions: "Zmienky"
       messages: "Správy"
-      visibility_levels:
-        title: "Kto môže vidieť túto skupinu?"
-        public: "Každý"
-        members: "Vlastníci skupiny, členovia a jej administrátori"
-        owners: "Vlastníci skupiny a jej administrátori"
       alias_levels:
         messageable: "Kto môže poslať správu tejto skupine?"
         nobody: "Nikto"
@@ -418,9 +446,6 @@ sk:
         mods_and_admins: "Iba moderátori a administrátori"
         members_mods_and_admins: "Iba členovia skupiny, moderátori a administrátori"
         everyone: "Každý"
-      trust_levels:
-        title: "Stupeň dôvery automaticky udelený členom po ich pridaní:"
-        none: "Žiadny"
       notifications:
         watching:
           title: "Sledovať"
@@ -541,7 +566,9 @@ sk:
       admin: "{{user}} je administrátor"
       moderator_tooltip: "Tento používateľ je moderátor"
       admin_tooltip: "Tento používateľ je administrátor"
+      silenced_tooltip: "Tento používateľ je umlčaný"
       suspended_notice: "Tento  používateľ je suspendovaný do {{date}}"
+      suspended_permanently: "Tento používateľ je suspendovaný"
       suspended_reason: "Dôvod:"
       github_profile: "Github"
       email_activity_summary: "Zhrnutie aktivít"
@@ -589,6 +616,7 @@ sk:
       undo_revoke_access: "Zrušiť odvolanie prístupu"
       api_approved: "Schválený:"
       theme: "Téma"
+      staged: "Dočasný"
       staff_counters:
         flags_given: "nápomocné značky"
         flagged_posts: "označkované príspevky"
@@ -606,12 +634,14 @@ sk:
         move_to_archive: "Archív"
         failed_to_move: "Zlyhalo presunutie označených správ (možno je chyba vo vašom pripojení)"
         select_all: "Označ všetky"
+        tags: "Štítky"
       preferences_nav:
         account: "Účet"
         profile: "Profil"
         emails: "Emaily"
         notifications: "Upozornenia"
         categories: "Kategórie"
+        tags: "Štítky"
         interface: "Rozhranie"
         apps: "Aplikácie"
       change_password:
@@ -624,6 +654,9 @@ sk:
         choose: "Vyberte si heslo"
       second_factor:
         title: "Dvojfaktorová autentifikácia"
+        disable: "Vypnúť dvojfaktorovú autentifikáciu"
+        label: "Kód"
+        show_key_description: "Vložiť ručne"
       change_about:
         title: "Upraviť O mne"
         error: "Nastala chyba pri zmene tejto hodnoty."
@@ -686,6 +719,7 @@ sk:
         title: "Jazyk rozhrania"
         instructions: "Jazyk úžívateľského rozhrania. Zmení sa po obnovení stránky."
         default: "(predvolené)"
+        any: "hocijaký"
       password_confirmation:
         title: "Heslo znova"
       last_posted: "Posledný príspevok"
@@ -886,6 +920,7 @@ sk:
     first_post: Prvý príspevok
     mute: Ignorovať
     unmute: Prestať ignorovať
+    last_post: Odoslané
     last_reply_lowercase: posledná odpoveď
     replies_lowercase:
       one: odpoveď
@@ -940,6 +975,7 @@ sk:
       title: "Prihlásenie"
       username: "Používateľ"
       password: "Heslo"
+      second_factor_title: "Dvojfaktorová autentifikácia"
       email_placeholder: "e-mail alebo používateľské meno"
       caps_lock_warning: "Caps Lock je zapnutý"
       error: "Neznáma chyba"
@@ -1098,20 +1134,6 @@ sk:
       empty: "Žiadne upozornenia sa nenašli."
       more: "zobraziť staršie upozornenia"
       total_flagged: "označených príspevkov celkom"
-      alt:
-        mentioned: "Zmienený od"
-        quoted: "Citovaný používateľom"
-        replied: "Odpovedané"
-        posted: "Príspevok od"
-        edited: "Upravte Váš príspevok do"
-        liked: "Váš príspevok sa páčil"
-        private_message: "Privátna správa od"
-        invited_to_topic: "Pozvaný k téme od"
-        invitee_accepted: "Pozvánka akceptovaná "
-        moved_post: "Váš príspevok bol presunutý "
-        linked: "Odkaz na váš príspevok"
-        granted_badge: "Udelený odznak"
-        group_message_summary: "Správy v skupinovej schránke"
       popup:
         mentioned: '{{username}} Vás zmienil v "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} Vás zmienil v "{{topic}}" - {{site_title}}'
@@ -2207,7 +2229,6 @@ sk:
         title: "Skupiny"
         edit: "Upraviť skupiny"
         refresh: "Obnoviť"
-        new: "Nový"
         about: "Tu upravíte Vaše členstvo v skupinách a mená"
         group_members: "Členovia skupiny"
         delete: "Odstrániť"
@@ -2215,21 +2236,11 @@ sk:
         delete_failed: "Nepodarilo sa zmazať skupinu. Pokiaľ je skupina automatická, nemôže byť zrušená."
         delete_owner_confirm: "Odobrať vlastnícke práva %{username}'?"
         add: "Pridať"
-        add_members: "Pridať členov"
         custom: "Vlastné"
-        bulk_complete: "Užívatelia boli pridaní do skupiny."
-        bulk: "Hromadné pridanie do skupiny"
-        bulk_paste: "Vlož zoznam používateľov alebo emailov, jeden na riadok:"
-        bulk_select: "(vyberte skupinu)"
         automatic: "Automaticky"
-        automatic_membership_email_domains: "Užívatelia, ktorí sa zaregistrovali s emailovou doménou uvedenou v zozname budú automaticky pridaní do tejto skupiny. "
-        automatic_membership_retroactive: "Použi pravidlo rovnakej emailovej domény pre pridanie registrovaných používateľov"
         default_title: "Štandardné označenie pre všetkých používateľov v tejto skupine"
-        primary_group: "Automaticky nastav ako hlavnú skupinu"
         group_owners: Vlastníci
         add_owners: Pridať vlastníkov
-        incoming_email: "Vlastná e-mailová adresa pre príchodziu poštu"
-        incoming_email_placeholder: "zadajte emailovú adresu"
       api:
         generate_master: "Vygenerovať Master API kľúč"
         none: "V súčasnosti neexistujú žiadne aktívne API kľúče."
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index bee45566f5..927cddab60 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -138,7 +138,7 @@ sl:
       post: 'objava #%{postNumber}'
       close: 'zapri'
       twitter: 'deli povezavo na Twitterju'
-      facebook: 'deli povezao na acebooku'
+      facebook: 'deli povezao na Facebooku'
       google+: 'deli povezavo na Google+'
       email: 'pošlji povezavo preko e-pošte'
     action_codes:
@@ -195,7 +195,7 @@ sl:
     edit: 'uredi naslov in kategorijo te teme'
     not_implemented: "Oprosti, ta funkcija še ni bila implementirana!"
     no_value: "Ne"
-    yes_value: "Ja"
+    yes_value: "Da"
     generic_error: "Ups, prišlo je do napake."
     generic_error_with_reason: "Napaka: %{error}"
     sign_up: "Prijava"
@@ -241,7 +241,7 @@ sl:
       other: "{{count}} znakov"
     suggested_topics:
       title: "Predlagane Teme"
-      pm_title: "Predlagana Sporočil"
+      pm_title: "Predlagana Sporočila"
     about:
       simple_title: "O"
       title: "O %{title}"
@@ -367,22 +367,6 @@ sl:
         make_user_group_owner: "Spremeni v lastnika"
         remove_user_as_group_owner: "Odstrani lastništvo"
     groups:
-      logs:
-        title: "Dnevnik"
-        when: "Kdaj"
-        action: "Aktivnost"
-        acting_user: "Nastopajoči uporabnik"
-        target_user: "Ciljni uporabnik"
-        subject: "Zadeva"
-        details: "Podrobnosti"
-        from: "Od"
-        to: "Za"
-      edit:
-        title: 'Uredi skupino'
-        full_name: 'Ime skupine'
-        add_members: "Dodaj člane"
-        delete_member_confirm: "Odstrani '%{username}' iz skupine '%{group}'?"
-      name_placeholder: "Ime skupine, brez presledkov, enako kot pravilo pri uporabniškem imenu"
       public_admission: "Dovoli uporabnikom, da se sami pridružijo skupini (skupina mora biti javna)"
       public_exit: "Dovoli uporabnikom da sami zapustijo skupino"
       empty:
@@ -393,12 +377,7 @@ sl:
         topics: "Člani te skupine nimajo nobene teme."
         logs: "Dnevnik za to skupino je prazen."
       add: "Dodaj"
-      join: "Pridruži se skupini"
-      leave: "Zapusti skupino"
-      request: "Zaprosi za članstvo v skupini"
       message: "Sporočilo"
-      automatic_group: Avtomatska skupina
-      is_group_user: "Si član te skupine"
       allow_membership_requests: "Dovoli uporabnikom, da zaprosijo za članstvo pri lastnikih skupine"
       membership_request_template: "Predloga za prikaz uporabnikom, ko zaprosijo za članstvo"
       membership_request:
@@ -424,12 +403,6 @@ sl:
       mentions: "Omembe"
       messages: "Sporočila"
       notification_level: "Privzeti nivo obvestil za sporočila skupini"
-      visibility_levels:
-        title: "Kdo lahko vidi skupino?"
-        public: "Vsi"
-        members: "Lastniki skupne, člani in admini"
-        staff: "Lastniki skupine in skrbniki"
-        owners: "Lastniki skupine in admini"
       alias_levels:
         mentionable: "Kdo lahko @omeni skupino?"
         messageable: "Kdo lahko pošlje sporočilo skupini?"
@@ -438,9 +411,6 @@ sl:
         mods_and_admins: "Le moderatorji in administratorji"
         members_mods_and_admins: "Le člani skupine, moderatorji in admnistratorji"
         everyone: "Vsi"
-      trust_levels:
-        title: "Nivo zaupanja samodejno podeljeno članom ko so dodani:"
-        none: "Brez"
       notifications:
         watching:
           title: "Spremlja"
@@ -898,12 +868,6 @@ sl:
       invitee_accepted: "<span>{{username}}</span> je sprejel tvoje vabilo"
       linked: "<span>{{username}}</span> {{description}}"
       topic_reminder: "<span>{{username}}</span> {{description}}"
-      alt:
-        posted: "Objavil"
-        edited: "Urejeno s strani "
-        liked: "Všečkal tvojo objavo"
-        moved_post: "Tvojo objavo je premaknil "
-        linked: "Povezava do tvoje objave"
     search:
       sort_by: "Uredi po"
       relevance: "Relevanci"
@@ -914,11 +878,6 @@ sl:
       select_all: "Izberi vse"
       clear_all: "Počisti vse"
       too_short: "Niz za iskanje je prekratek"
-      result_count:
-        one: "1 zadetek za <span class='term'>{{term}}</span>"
-        two: "{{count}}{{plus}} zadetka za <span class='term'>{{term}}</span>"
-        few: "{{count}}{{plus}} zadetkov za <span class='term'>{{term}}</span>"
-        other: "{{count}}{{plus}} zadetkov za <span class='term'>{{term}}</span>"
       title: "išči po temah, objavah, uporabnikih ali kategorijah"
       no_results: "Iskanje nima zadetkov."
       no_more_results: "Ni več zadetkov iskanja."
@@ -1464,16 +1423,11 @@ sl:
         delete: "Izbriši"
         delete_confirm: "Izbriši skupino?"
         add: "Dodaj"
-        add_members: "Dodaj člane"
         custom: "Po meri"
-        bulk_complete: "Uporabnice/ki, ki so bili dodani v skupino"
-        bulk_select: "(izberi skupino)"
         automatic: "Avtomatsko"
         default_title: "Privzet naziv za vse uporabnice/ke v tej skupini"
-        primary_group: "Avtomatsko nastavi kot primarno skupino"
         group_owners: Lastniki
         add_owners: Dodaj lastnike
-        incoming_email_placeholder: "vnesite email naslov"
       api:
         user: "Uporabnik"
         title: "API"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index fd24e12e3f..c86014126a 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -320,33 +320,12 @@ sq:
         make_user_group_owner: "Bëje autor"
         remove_user_as_group_owner: "Hiq autorin"
     groups:
-      logs:
-        title: "Ditari"
-        when: "Kur"
-        action: "Veprimi"
-        acting_user: "Anëtari veprues"
-        target_user: "Anëtari i prekur"
-        subject: "Subjekti"
-        details: "Detaje"
-        from: "Nga"
-        to: "Për"
-      edit:
-        title: 'Redakto Grupin'
-        full_name: 'Emri i plotë'
-        add_members: "Shto anëtarë"
-        delete_member_confirm: "Do të heqësh '%{username}' nga grupi '%{group}'?"
-      name_placeholder: "Emri i grupit, pa hapësira, si username-t"
       public_admission: "Lejo që përdoruesit të bashkohen lirisht ne grupin (Kërkon grupin e dukshëm publik)"
       public_exit: "Lejo përdoruesit të largohen nga grupi lirshëm"
       empty:
         posts: "Nuk ka postime nga anëtarët e këtij grupi."
         members: "Nuk ka anëtarë në këtë grup."
       add: "Shto"
-      join: "Bashkoju grupit"
-      leave: "Ik nga grupi"
-      request: "Kërko t'i bashkohesh grupit"
-      automatic_group: Grup automatik
-      is_group_user: "Jeni anëtar i këtij grupi"
       name: "Emri"
       bio: "Mbi grupin"
       owner: "autori"
@@ -363,9 +342,6 @@ sq:
         mods_and_admins: "Vetëm moderatorët dhe adminët"
         members_mods_and_admins: "Vetëm anëtarët e grupit, moderatorët dhe adminët"
         everyone: "Të gjithë"
-      trust_levels:
-        title: "Niveli i besimit që ju akordohet automatikisht anëtarëve të grupit:"
-        none: "Asnjë"
       notifications:
         watching:
           title: "Në vëzhgim"
@@ -1024,19 +1000,6 @@ sq:
       empty: "Nuk u gjet asnjë njoftim. "
       more: "shiko njoftimet e kaluara"
       total_flagged: "totali i postimeve të sinjalizuar"
-      alt:
-        mentioned: "Përmendur nga"
-        quoted: "Cituar nga"
-        replied: "Përgjigjur"
-        posted: "Postim nga"
-        edited: "Redakto postimin tuaj"
-        liked: "Pëlqeu postimin tuaj"
-        invited_to_topic: "I/e ftuar në temë nga"
-        invitee_accepted: "Ftesa u pranua nga"
-        moved_post: "Postimi juaj u transferua nga"
-        linked: "Lidhja drejt postimit tuaj"
-        granted_badge: "Stema u atribua"
-        group_message_summary: "Mesazhet në inboxin e grupit"
       popup:
         mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
@@ -2042,7 +2005,6 @@ sq:
         title: "Grupet"
         edit: "Redakto Grup"
         refresh: "Rifresko"
-        new: "I Ri"
         about: "Modifiko anëtarët e grupit dhe emrin këtu"
         group_members: "Përdorues grupi"
         delete: "Fshij"
@@ -2050,12 +2012,7 @@ sq:
         delete_failed: "Nuk e fshimë dot grupin. Nëse ky është një grup automatik, nuk fshihet dot. "
         delete_owner_confirm: "Hiqe privilegjin e pronarit për '%{username}'?"
         add: "Shto"
-        add_members: "Shto Anëtar"
         custom: "Grupet e krijuara"
-        bulk_complete: "Përdoruesit iu shtuan grupit."
-        bulk: "Shto në masë tek grupi"
-        bulk_paste: "Ngjit një listë përdoruesisht ose adresash email, 1 për çdo rresht:"
-        bulk_select: "(zgjidhni një grup)"
         automatic: "Automatik"
         group_owners: Pronarët
         add_owners: Shto pronarë
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 742fd3eb4f..7eceda1ec7 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -346,10 +346,6 @@ sr:
         few: "%{count} korisnika"
         other: "%{count} korisnika"
     groups:
-      logs:
-        action: "Akcije"
-      edit:
-        full_name: 'Ime'
       owner: "vlasnik"
       index:
         title: "Grupe"
@@ -363,8 +359,6 @@ sr:
         mods_and_admins: "Samo moderatori i Administratori"
         members_mods_and_admins: "Samo članovi grupe, moderatori i administratori"
         everyone: "Svi"
-      trust_levels:
-        none: "Ništa"
       flair_bg_color_placeholder: "(Opciono) Hex vrednost boje"
     user_action_groups:
       '1': "Data sviđanja"
@@ -855,8 +849,6 @@ sr:
       empty: "Nisu pronađene notifikacije"
       more: "pogledaj starije notifikacije"
       total_flagged: "sve ukupno označenih poruka"
-      alt:
-        replied: "Odgovoreno"
     upload_selector:
       title: "Dodaj sliku"
       title_with_attachments: "Dodaj sliku ili datoteku"
@@ -1516,16 +1508,12 @@ sr:
         title: "Grupe"
         edit: "Izmeni Grupe"
         refresh: "Osveži"
-        new: "Novo"
         about: "Ovde izmenite svoje članstvo u grupama i imenima grupa"
         group_members: "Članovi grupe"
         delete: "Obriši"
         delete_confirm: "Obriši ovu grupu?"
         delete_failed: "Nemoguće obrisati grupu. Ako je ovo automatska grupa, ne možete je obrisati."
         add: "Dodaj"
-        add_members: "Dodaj članove"
-        automatic_membership_email_domains: "Korisnici koji se registruju sa email domenom koja tačno odgovora jednoj na ovoj listi biće automatski dodani u ovu grupu:"
-        automatic_membership_retroactive: "Primeni isto pravilo o email domeni za dodavanje postojećih registrovanih korisnika"
       api:
         generate_master: "Generiši glavni API ključ"
         none: "Nema aktivnih API ključeva"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 197ded6863..b79c775938 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -237,6 +237,9 @@ sv:
       last_read: "detta är det senaste inlägg som du läst, klicka för att bokmärka"
       remove: "Ta bort bokmärke"
       confirm_clear: "Är du säker på att du vill radera alla bokmärken från ämnet?"
+    topic_count_latest:
+      one: "Visa {{count}} nytt eller uppdaterat ämne"
+      other: "Visa {{count}} nya eller uppdaterade ämnen"
     preview: "förhandsgranska"
     cancel: "avbryt"
     save: "Spara ändringar"
@@ -326,22 +329,6 @@ sv:
         make_user_group_owner: "Gör till ägare"
         remove_user_as_group_owner: "Återkalla ägare"
     groups:
-      logs:
-        title: "Loggar"
-        when: "När"
-        action: "Handling"
-        acting_user: "Agerar användare"
-        target_user: "Specifik användare"
-        subject: "Ämne"
-        details: "Detaljer"
-        from: "Från"
-        to: "Till"
-      edit:
-        title: 'Redigera grupp'
-        full_name: 'Fullständigt namn'
-        add_members: "Lägg till medlemmar"
-        delete_member_confirm: "Ta bort '%{username}' från gruppen '%{group}'?"
-      name_placeholder: "Gruppnamn, inga mellanslag, samma regler som för användarnamn"
       empty:
         posts: "Det är inga kommentarer från medlemmar i denna grupp"
         members: "Det finns inga medlemmar i denna grupp"
@@ -350,11 +337,6 @@ sv:
         topics: "Det finns inga trådar från medlemmar av denna grupp"
         logs: "Det finns inga loggar för denna grupp"
       add: "Lägg till"
-      join: "Gå med i grupp"
-      leave: "Lämna grupp"
-      request: "Förfrågan om att gå med i grupp"
-      automatic_group: Automatisk grupp
-      is_group_user: "Du är en medlem av denna grupp"
       allow_membership_requests: "Tillåt användare att skicka medlemskapsförfrågan till gruppägare"
       membership: "Medlemskap"
       name: "Namn"
@@ -374,9 +356,6 @@ sv:
         mods_and_admins: "Bara moderatorer och administratörer"
         members_mods_and_admins: "Bara gruppmedlemmar, moderatorer och administratörer"
         everyone: "Alla"
-      trust_levels:
-        title: "Förtroendenivå som automatiskt beviljas användare när de läggs till:"
-        none: "Inga"
       notifications:
         watching:
           title: "Bevakar"
@@ -1044,19 +1023,7 @@ sv:
       empty: "Inga notifieringar hittades."
       more: "visa äldre notifikationer"
       total_flagged: "totalt antal flaggade inlägg"
-      alt:
-        mentioned: "Omnämnd av"
-        quoted: "Citerad av"
-        replied: "Svarade"
-        posted: "Skrivet av"
-        edited: "Redigera ditt inlägg genom"
-        liked: "Gillade ditt inlägg"
-        invited_to_topic: "Inbjudan till ett ämne från"
-        invitee_accepted: "Inbjudan accepterades av"
-        moved_post: "Ditt inlägg blev flyttad av"
-        linked: "Länk till ditt inlägg"
-        granted_badge: "Utmärkelse beviljad"
-        group_message_summary: "Meddelanden i din grupps inkorg"
+      granted_badge: "Förtjänade '{{description}}'"
       popup:
         mentioned: '{{username}} nämnde dig i "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nämnde dig i "{{topic}}" - {{site_title}}'
@@ -1349,7 +1316,7 @@ sv:
         make_banner: "Gör ämne till banderoll"
         remove_banner: "Ta bort banderollämne"
       reply:
-        title: 'svara'
+        title: 'Svara'
         help: 'Börja komponera ett svar på detta ämne'
       clear_pin:
         title: "Ta bort nål"
@@ -2180,7 +2147,6 @@ sv:
         title: "Grupper"
         edit: "Redigera Grupper"
         refresh: "Uppdatera"
-        new: "Ny"
         about: "Redigera dina gruppmedlemskap och -namn här."
         group_members: "Gruppmedlemmar"
         delete: "Radera"
@@ -2188,21 +2154,11 @@ sv:
         delete_failed: "Oförmögen att ta bort grupp. Om det här är en automatisk grupp så kan den inte raderas."
         delete_owner_confirm: "Ta bort användarprivilegier för '\"{username}'?"
         add: "Lägg till"
-        add_members: "Lägg till medlemmar"
         custom: "Anpassad"
-        bulk_complete: "Användarna har lagts till i gruppen."
-        bulk: "Masstilläggning till grupp"
-        bulk_paste: "Klistra in en lista av användarnamn eller e-postadresser, en per rad:"
-        bulk_select: "(välj en grupp)"
         automatic: "Automatisk"
-        automatic_membership_email_domains: "Användare som registrerar sig med en e-post vars domän exakt matchar en domän i den här listan kommer automatiskt att bli tillagd i den här gruppen:"
-        automatic_membership_retroactive: "Använd samma regel för e-postdomän för att lägga till nya användare"
         default_title: "Standardtitel för alla användare i denna grupp"
-        primary_group: "Automatiskt inställd som primär grupp"
         group_owners: Ägare
         add_owners: Lägg till ägare
-        incoming_email: "Egenvald inkommande e-postadress"
-        incoming_email_placeholder: "Ange e-postadress"
         none_selected: "Välj en grupp för att komma igång"
         no_custom_groups: "Skapa en egen grupp"
       api:
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index bc795982ac..ca2bda8c4e 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -1136,16 +1136,12 @@ te:
         title: "గుంపులు"
         edit: "గుంపులు సవరించు"
         refresh: "తాజా పరుచు"
-        new: "కొత్త"
         about: "మీ గుంపు మెంబర్షిప్పు మరియు పేర్లు ఇక్కడ సవరించండి"
         group_members: "గుంపు సభ్యులు"
         delete: "తొలగించు"
         delete_confirm: "ఈ గుంపును తొలగించాలనుకుంటున్నారా? "
         delete_failed: "గుంపును తొలగించలేకున్నాము. ఇది స్వీయ గుంపు అయితే దీన్ని నాశనం చేయలేరు."
         add: "కలుపు"
-        add_members: "సభ్యులను కలుపు"
-        automatic_membership_email_domains: "వినియోగదారుడు ఏ ఈ-మెయిల్ డొమైన్ తో నమోదు చేసుకున్నాడో అది ఖచ్చితంగా  ఈ జాబితాలో ఒక దానిని పోలి స్వయంసిధ్ధంగా గ్రూప్ కి కలుస్తాయి:"
-        automatic_membership_retroactive: "ఇప్పటికే నమోదిత వినియోగదారులను జోడించడానికి అదే ఇమెయిల్ డొమైన్ రూల్ వర్తిస్తుంది"
       api:
         generate_master: "మాస్టరు ఏపీఐ కీ ఉత్తపత్తించు"
         none: "ప్రస్తుతం చేతన ఏపీఐ కీలు లేవు."
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index c1d8722fa8..74766faf63 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -94,6 +94,7 @@ th:
       email: 'ส่งลิงก์นี้ทางอีเมล'
     action_codes:
       public_topic: "ทำให้กระทู้นี้เป็นสาธารณะ %{when} "
+      private_topic: "ทำให้กระทู้นี้เป็นข้อความส่วนตัว"
       split_topic: "แบ่งกระทู้นี้เมื่อ %{when}"
       invited_user: "ได้เชิญ %{who} %{when}"
       invited_group: "ได้เชิญ %{who} %{when}"
@@ -117,6 +118,9 @@ th:
       visible:
         enabled: 'ถูกแสดงเมื่อ %{when}'
         disabled: 'ถูกซ่อนเมื่อ %{when}'
+      banner:
+        enabled: 'ทำให้เป็นแบนเนอร์%{when} มันจะปรากฎที่ด้านบนสุดของทุกหน้าจนกว่าจะผู้ใช้งานจะกดลบ'
+        disabled: 'ลบแบนเนอร์นี้%{when} มันจะไม่ปรากฎที่ด้านบนของหน้าใดๆ'
     topic_admin_menu: "จัดการกระทู้ "
     emails_are_disabled: "อีเมลขาออกทั้งหมดจะถูกปิดโดยผู้ดูแลระบบ ไม่มีอีเมลแจ้งเตือนใดๆจะถูกส่งออกไป"
     themes:
@@ -211,6 +215,8 @@ th:
       last_read: "นี่เป็นโพสสุดท้ายที่คุณอ่าน คลิกเพื่อทำบุ๊คม๊าค"
       remove: "ลบบุ๊คม๊าค"
       confirm_clear: "คุณแน่ใจไหม ที่จะลบบุ๊คมาร์กในกระทู้นี้ทั้งหมด"
+    topic_count_latest:
+      other: "เห็น {{count}} กระทู้ใหม่ หรือที่ถูกอัพเดต"
     preview: "แสดงตัวอย่าง"
     cancel: "ยกเลิก"
     save: "บันทึกการเปลี่ยนแปลง"
@@ -294,27 +300,9 @@ th:
         add_user_to_group: "เพิ่มผู้ใช้"
         remove_user_from_group: "ลบผู้ใช้"
     groups:
-      logs:
-        acting_user: "ผู้ใช้ชั่วคราว"
-        target_user: "ผู้ใช้เป้าหมาย"
-        subject: "หัวข้อ"
-        details: "รายละเอียด"
-        from: "จาก"
-        to: "ถึง"
-      edit:
-        title: 'แก้ไขกลุ่ม'
-        full_name: 'ชื่อ-นามสกุล'
-        add_members: "เพิ่มสมาชิก"
-        delete_member_confirm: "ลบ '%{username}' ออกจาก '%{group}' กลุ่ม?"
       public_exit: "อนุญาตให้ผู้ใช้ออกจากกลุ่มอย่างอิสระ"
       add: "เพิ่ม"
-      join: "เข้าร่วมกลุ่ม"
-      leave: "ออกจากกลุ่ม"
-      request: "ส่งคำขอเข้าร่วมกลุ่ม"
       message: "ข้อความ<br><div><br data-mce-bogus=\"1\"></div>"
-      automatic_group: กลุ่มอัตโนมัติ
-      close_group: กลุ่มปิด
-      is_group_user: "คุณเป็นสมาชิกของกลุ่มนี้"
       membership: "การเป็นสมาชิก"
       name: "ชื่อ"
       bio: "เกี่ยวกับกลุ่ม"
@@ -329,12 +317,6 @@ th:
       posts: "โพสต์"
       mentions: "พูดถึง"
       messages: "ข้อความ"
-      visibility_levels:
-        title: "ใครสามารถเห็นกลุ่มนี้?"
-        public: "ทุกคน"
-        members: "เจ้าของกลุ่ม, สมาชิก และ ผู้ดูแลระบบ"
-        staff: "เจ้าของกลุ่ม และผู้ดูแล"
-        owners: "เจ้าของกลุ่ม และผู้ดูแลระบบ"
       alias_levels:
         mentionable: "ใครสามารถ @กล่าวถึง กลุ่มนี้"
         messageable: "ใครสามารถส่งข้อความในกลุ่มนี้?"
@@ -343,9 +325,6 @@ th:
         mods_and_admins: "ผู้ดูแลระบบและผู้ตรวจสอบ"
         members_mods_and_admins: "สมาชิกกลุ่ม ผู้ดูแลกระทู้ และผู้ดูแลเว็บ"
         everyone: "ทุกคน"
-      trust_levels:
-        title: "ระดับความไว้ใจจะถูกให้ไปยังผู้ใช้โดยอัตโนมัติเมื่อพวกเขาเพิ่ม:"
-        none: "ไม่มี"
       notifications:
         watching:
           title: "กำลังดู"
@@ -917,19 +896,6 @@ th:
       none: "ไม่สามารถโหลดการแจ้งเตือนในขณะนี้"
       more: "ดูการแจ้งเตือนก่อนหน้านี้"
       total_flagged: "โพสที่ปักธงทั้งหมด"
-      alt:
-        mentioned: "ถูกพูดถึงโดย"
-        quoted: "ถูกอ้างอิงโดย"
-        replied: "ตอบแล้ว"
-        posted: "โพสโดย"
-        edited: "แก้ไขโพสของคุณโดย"
-        liked: "ได้ถูกใจโพสของคุณ"
-        invited_to_topic: "เชิญไปยังกระทู้จาก"
-        invitee_accepted: "การเชิญได้ตอบรับโดย"
-        moved_post: "โพสของคุณได้ถูกย้ายโดย"
-        linked: "ลิงค์ไปยังโพสของคุณ"
-        granted_badge: "ได้รับป้าย"
-        group_message_summary: "ข้อความในกล่องข้อความกลุ่ม"
       popup:
         mentioned: '{{username}} พูดถึงคุณใน "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} พูดถึงคุณใน "{{topic}}" - {{site_title}}'
@@ -1008,6 +974,8 @@ th:
         new: "ไม่มีกระทู้ใหม่"
         bookmarks: "ไม่มีบุ๊คมาร์คในหัวข้อใดอีกแล้ว"
     topic:
+      filter_to:
+        other: " {{count}} โพสในกระทู้"
       create: 'กระทู้ใหม่'
       create_long: 'สร้างกระทู้ใหม่'
       private_message: 'สร้างข้อความใหม่'
@@ -1047,6 +1015,8 @@ th:
       auto_close_title: 'ปิดการตั้งค่าอัตโนมัติ'
       timeline:
         back: "กลับ"
+      progress:
+        go_top: "บน"
       notifications:
         reasons:
           '3_2': 'คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้'
@@ -1394,7 +1364,6 @@ th:
         title: "กลุ่ม"
         edit: "แก้กลุ่ม"
         refresh: "รีโหลด"
-        new: "ใหม่"
         about: "แก้ไขสมาชิกและชื่อกลุ่มของคุณได้ที่นี่"
         group_members: "ชื่อสมาชิก"
         delete: "ลบ"
@@ -1402,11 +1371,8 @@ th:
         delete_failed: "ไม่สามารถลงกลุ่มได้ ถ้ากลุ่มนี้เป็นกลุ่มอัตโนมัติมันจะไม่สามารถถูกทำลายได้"
         delete_owner_confirm: "ลบสิทธิ์การเป็นเจ้าของ ของ '%{username}'?"
         add: "เพิ่ม"
-        add_members: "เพิ่มสมาชิก"
         group_owners: เจ้าของ
         add_owners: เพิ่มเจ้าของ
-        incoming_email: "ตั้งที่อยู่สำหรับอีเมลขาเข้า"
-        incoming_email_placeholder: "ใส่อีเมล"
       api:
         user: "ผู้ใช้"
         title: "API"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 9e42409f93..033819d270 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -331,22 +331,6 @@ tr_TR:
         make_user_group_owner: "Sahip yap"
         remove_user_as_group_owner: "Sahipliğini İptal Et"
     groups:
-      logs:
-        title: "Kayıtlar"
-        when: "Ne zaman"
-        action: "Eylem"
-        acting_user: "Temsili Kullanıcılar"
-        target_user: "Hedef Kullanıcı"
-        subject: "Konu"
-        details: "Ayrıntılar"
-        from: "Gönderen"
-        to: "Kime"
-      edit:
-        title: 'Grubu düzenle'
-        full_name: 'Tam İsim'
-        add_members: "Üyeleri ekle"
-        delete_member_confirm: "'%{username}' adlı kullanıcıyı '%{group}' grubundan çıkart?"
-      name_placeholder: "Grup adı, kullanıcı adındaki gibi boşluksuz olmalı"
       public_admission: "Kullanıcıların gruba özgürce katılmalarına izin ver (grubun Herkese açık olması gerekir)"
       public_exit: "Kullanıcıların grubu özgürce terk etmesine izin ver"
       empty:
@@ -357,12 +341,7 @@ tr_TR:
         topics: "Bu grubun üyeleri tarafından oluşturulmuştur başlık yoktur."
         logs: "Bu grup için log kaydı bulunmamaktadır."
       add: "Ekle"
-      join: "Gruba katıl"
-      leave: "Gruptan ayrıl"
-      request: "Gruba katılmak için istek yolla"
       message: "ileti"
-      automatic_group: Otomatik Grup
-      is_group_user: "Bu grubun bir üyesisiniz."
       allow_membership_requests: "Kullanıcılar'ın grup sahiplerine üyelik talepleri göndermesine izin ver"
       membership_request:
         submit: "İstek Gönderin"
@@ -384,12 +363,6 @@ tr_TR:
       mentions: "Bahsetmeler"
       messages: "İletiler"
       notification_level: "Grup mesajları için varsayılan bildirim düzeyi"
-      visibility_levels:
-        title: "Bu grubu kim görebilir?"
-        public: "Herkes"
-        members: "Grup sahipleri, üyeler ve yöneticiler"
-        staff: "Grup sahipleri ve yetkili"
-        owners: "Grup sahipleri ve yöneticileri"
       alias_levels:
         mentionable: "Bu gruptan kimler @bahsedebilir?"
         messageable: "Bu gruba kimler ileti gönderebilir?"
@@ -398,9 +371,6 @@ tr_TR:
         mods_and_admins: "Sadece Moderatörler ve Yöneticiler"
         members_mods_and_admins: "Sadece Grup Üyeleri, Moderatörler ve Yöneticiler"
         everyone: "Herkes"
-      trust_levels:
-        title: "Eklendiklerinde üyelere otomatik olarak güven seviyesi verilir:"
-        none: "Hiç"
       notifications:
         watching:
           title: "Gözleniyor"
@@ -425,7 +395,6 @@ tr_TR:
       flair_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
       flair_preview_icon: "İkonu önizle"
       flair_preview_image: "Resimi önizle"
-      flair_note: "Not: Kabiliyet sadece bir kullanıcının birincil grubu için gösterecek."
     user_action_groups:
       '1': "Verilen Beğeniler"
       '2': "Alınan Beğeniler"
@@ -1034,7 +1003,6 @@ tr_TR:
       default_header_text: Seç...
       no_content: Hiçbir sonuç bulunamadı
       filter_placeholder: Ara...
-      max_content_reached: "<b>{{count}}</b> konu seçtiniz."
     emoji_picker:
       filter_placeholder: Emoji ara
       people: İnsanlar
@@ -1177,20 +1145,6 @@ tr_TR:
       granted_badge: "'{{description}}' kazandı"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Yeni Konu</span> {{description}}"
-      alt:
-        mentioned: "Bahsedildi, şu kişi tarafından"
-        quoted: "Alıntılandı, şu kişi tarafından"
-        replied: "Cevaplandı"
-        posted: "Gönderildi, şu kişi tarafından"
-        edited: "Gönderiniz düzenlendi, şu kişi tarafından"
-        liked: "Gönderiniz beğenildi"
-        invited_to_topic: "Bir konuya davet edildiniz, şu kişi tarafından"
-        invitee_accepted: "Davet kabul edildi, şu kişi tarafından"
-        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 iletiler"
-        topic_reminder: "Bir hatırlatıcı"
       popup:
         mentioned: '{{username}}, "{{topic}}" başlıklı konuda sizden bahsetti - {{site_title}}'
         group_mentioned: '{{username}} sizden bahsetti "{{topic}}" - {{site_title}}'
@@ -1223,9 +1177,6 @@ tr_TR:
       select_all: "Tümünü Seç"
       clear_all: "Tümünü Temizle"
       too_short: "Aradığın terim çok kısa."
-      result_count:
-        one: "<span class='term'>{{term}}</span> için {{count}}{{plus}} sonuç"
-        other: "<span class='term'>{{term}}</span> için {{count}}{{plus}} sonuç"
       title: "konu, gönderi, kullanıcı veya kategori ara"
       no_results: "Hiç bir sonuç bulunamadı."
       no_more_results: "Başka sonuç yok."
@@ -1398,7 +1349,7 @@ tr_TR:
       toggle_information: "konu ayrıntılarını aç/kapa"
       read_more_in_category: "Daha fazlası için {{catLink}} kategorisine göz atabilir ya da  {{latestLink}}yebilirsiniz."
       read_more: "Daha fazla okumak mı istiyorsunuz? {{catLink}} ya da {{latestLink}}."
-      read_more_MF: "Kalan { UNREAD, plural, =0 {} one { <a href='/unread'>1 okunmamış</a> } other { <a href='/unread'># okunmamış</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ve} false {} other{}} <a href='/new'>1 yeni</a> konu} other { {BOTH, select, true{and } false {} other{}} <a href='/new'># yeni</a> konu} } var, veya {CATEGORY, select, true { {catLink}} false {{latestLink}} kategorilerindeki diğer {} konulara göz atabilirsiniz }"
+      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>1 okunmamış mesaj</a> } other { <a href='/unread'># okunmamış mesaj</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ve} false {} other{}} <a href='/new'>1 yeni</a> konu} other { {BOTH, select, true{ve } false {} other{}} <a href='/new'># yeni</a> konu} } var. {CATEGORY, select, true {{catLink} kategorisine} false {{latestLink}} other {}} göz atabilirsiniz."
       browse_all_categories: Bütün kategorilere göz at
       view_latest_topics: en son konuları görüntüle
       suggest_create_topic: Konu oluşturmaya ne dersiniz?
@@ -2364,7 +2315,6 @@ tr_TR:
         title: "Grup"
         edit: "Grupları Düzenle"
         refresh: "Yenile"
-        new: "Yeni"
         about: "Grup üyeliğinizi ve isimleri burada düzenleyin"
         group_members: "Grup üyeleri"
         delete: "Sil"
@@ -2372,21 +2322,11 @@ tr_TR:
         delete_failed: "Grup silinemedi. Bu otomatik oluşturulmuş bir grup ise, yok edilemez."
         delete_owner_confirm: "'%{username}' için sahiplik izni kaldırılsın mı?"
         add: "Ekle"
-        add_members: "Üye ekle"
         custom: "Özel"
-        bulk_complete: "Kullanıcılar gruba eklendi."
-        bulk: "Topluca Gruba Ekle"
-        bulk_paste: "Kullanıcı adı ya da e-posta listesini yapıştırın, her satıra bir tane gelecek şekilde:"
-        bulk_select: "(bir grup seçin)"
         automatic: "Otomatik"
-        automatic_membership_email_domains: "Bu listedeki bir e-posta alan adıyla kaydolan kullanıcılar otomatik olarak bu gruba eklenecekler:"
-        automatic_membership_retroactive: "Varolan kayıtlı kullanıcıları eklemek için aynı e-posta alan adı kuralını uygula"
         default_title: "Bu gruptaki tüm kullanıcılar için öntanımlı başlık"
-        primary_group: "Otomatik olarak ana grup yap"
         group_owners: Sahipler
         add_owners: Sahiplik ekle
-        incoming_email: "Özel gelen e-posta adresi"
-        incoming_email_placeholder: "e-posta adresi girin"
       api:
         generate_master: "Ana API Anahtarı Üret"
         none: "Şu an etkin API anahtarı bulunmuyor."
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 53f0cf5f3a..8ceffa6e28 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -225,16 +225,6 @@ uk:
         add_user_to_group: "Добавити користувача"
         remove_user_from_group: "Видалити користувача"
     groups:
-      logs:
-        subject: "Тема"
-        details: "Деталі"
-        from: "Від"
-        to: "До"
-      edit:
-        title: 'Редагувати Групу'
-        full_name: 'Повне Ім''я'
-        add_members: "Добавити учасників"
-        delete_member_confirm: "Видалити '%{username}' з групи '%{group}'?"
       add: "Додати"
       topics: "Теми"
       posts: "Дописи"
@@ -658,8 +648,6 @@ uk:
     notifications:
       more: "переглянути старіші сповіщення"
       total_flagged: "всього дописів, на які поскаржилися"
-      alt:
-        posted: "Опубліковано"
     upload_selector:
       title: "Додати зображення"
       title_with_attachments: "Додати зображення або файл"
@@ -1149,15 +1137,12 @@ uk:
         title: "Групи"
         edit: "Редагувати групи"
         refresh: "Оновити"
-        new: "Новий"
         about: "Edit your group membership and names here"
         group_members: "Учасники групи"
         delete: "Видалити"
         delete_confirm: "Видалити цю групу?"
         delete_failed: "Не вдалося видалити групу. Якщо це - автоматична група, її неможливо знищити."
         add: "Додати"
-        add_members: "Додати учасників"
-        bulk_select: "(обрати групу)"
       api:
         generate_master: "Згенерувати Головний ключ API"
         none: "Наразі немає жодного активного ключа API."
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 0e7c1899e3..ee2b53db0a 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -9,7 +9,7 @@ ur:
   js:
     number:
       format:
-        separator: "کوئی نہیں"
+        separator: "."
         delimiter: "،"
       human:
         storage_units:
@@ -22,6 +22,9 @@ ur:
             kb: کے بی
             mb: ایم بی
             tb: ٹی بی
+      short:
+        thousands: "{{number}}k"
+        millions: "{{number}}M"
     dates:
       time: "h:mm a"
       timeline_date: "MMM YYYY"
@@ -30,32 +33,47 @@ ur:
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
-      wrap_ago: "٪{date} پہلے"
+      full_with_year_no_time: "MMMM Do, YYYY"
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "%{date} قبل"
       tiny:
+        half_a_minute: "< 1منٹ"
         less_than_x_seconds:
           one: "< 1 سیکنڈ"
-          other: "< ٪{count} سیکنڈ"
+          other: "< %{count} سیکنڈ"
         x_seconds:
           one: "1 سیکنڈ"
-          other: "٪{count} سیکنڈ"
+          other: "%{count} سیکنڈ"
+        less_than_x_minutes:
+          one: "< 1منٹ"
+          other: "< %{count}منٹ "
         x_minutes:
           one: "1 منٹ"
-          other: "٪{count} منٹس"
+          other: "%{count} منٹس"
         about_x_hours:
           one: "1 گھنٹا"
-          other: "٪{count} گھنٹے"
+          other: "%{count} گھنٹے"
         x_days:
           one: "1 دن"
-          other: "٪{count} دن"
+          other: "%{count} دن"
+        x_months:
+          one: "1ماہ"
+          other: "%{count}مہینے"
         about_x_years:
           one: "1 سال"
-          other: "٪{count} سال"
+          other: "%{count} سال"
         over_x_years:
           one: "> 1 سال"
-          other: "> ٪{count} سال"
+          other: "> %{count} سال"
         almost_x_years:
           one: "1 سال"
-          other: "٪{count} سال"
+          other: "%{count} سال"
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
       medium:
         x_minutes:
           one: "1 منٹ"
@@ -66,6 +84,7 @@ ur:
         x_days:
           one: "1 دن"
           other: "%{count} دن"
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
           one: "1 منٹ قبل"
@@ -88,6 +107,7 @@ ur:
           other: "%{count} سال بعد"
       previous_month: 'پچھلے ماہ'
       next_month: 'اگلے ماہ'
+      placeholder: تاریخ
     share:
       topic: 'اس ٹاپک کا لنک شیئرکریں'
       post: 'پوسٹ #%{postNumber}'
@@ -95,41 +115,44 @@ ur:
       twitter: 'ٹوئٹر پر اس لنک کو شیئرکریں'
       facebook: 'فیس بک پر اس لنک کو شیئرکریں'
       google+: 'گُوگَل+ پر اس لنک کو شیئرکریں'
-      email: 'اس لنک کو ایک ای میل میں بھیجیں'
+      email: 'اس لنک کو  ای میل میں بھیجیں'
     action_codes:
-      public_topic: "اس ٹاپک کو پبلک بنایا گیا ٪{کب}"
-      private_topic: "اس ٹاپک کو پرائیویٹ بنایا گیا ٪{کب}"
-      split_topic: "اس ٹاپک کو تقسیم کیا گیا ٪{کب}"
-      invited_user: "دعوت دی ٪{کسے} ٪{کب}"
-      invited_group: "دعوت دی ٪{کسے} ٪{کب}"
-      removed_user: "ہٹایا ٪{کسے} ٪{کب}"
-      removed_group: "ہٹایا ٪{کسے} ٪{کب}"
+      public_topic: "اس ٹاپک کو پبلک بنایا گیا %{when}"
+      private_topic: "اس ٹاپک کو ذاتی پیغام بنایا گیا %{when}"
+      split_topic: "اس ٹاپک کو تقسیم کیا گیا %{when}"
+      invited_user: "دعوت دی %{who} %{when}"
+      invited_group: "دعوت دی %{who} %{when}"
+      user_left: "%{who}نے خود کواِس پیغام سے ہٹا دیا %{when} "
+      removed_user: "ہٹایا %{who} %{when}"
+      removed_group: "ہٹایا %{who} %{when}"
       autoclosed:
-        enabled: 'بند کیا ٪{کب}'
-        disabled: 'کھولا ٪{کب}'
+        enabled: 'بند کیا %{when}'
+        disabled: 'کھولا %{when}'
       closed:
-        enabled: 'بند کیا ٪{کب}'
-        disabled: 'کھولا ٪{کب}'
+        enabled: 'بند کیا %{when}'
+        disabled: 'کھولا %{when}'
       archived:
-        enabled: 'آرکائیو کیا ٪{کب}'
-        disabled: 'آرکائیو سے نکال دیا ٪{کب}'
+        enabled: 'آرکائیو کیا %{when}'
+        disabled: 'آرکائیو سے ہٹا دیا %{when}'
       pinned:
-        enabled: 'پن کر دیا ٪{کب}'
-        disabled: 'پن ہٹا دیا ٪{کب}'
+        enabled: 'پن کر دیا %{when}'
+        disabled: 'پن ہٹا دیا %{when}'
       pinned_globally:
-        enabled: 'عالمی سطح پر پن کر دیا ٪{کب}'
-        disabled: 'پن ہٹا دیا ٪{کب}'
+        enabled: 'عالمی سطح پر پن کر دیا %{when}'
+        disabled: 'پن ہٹا دیا %{when}'
       visible:
-        enabled: 'مندرج ٪{کب}'
-        disabled: 'غیر مندرج ٪{کب}'
+        enabled: 'مندرج %{when}'
+        disabled: 'غیر مندرج %{when}'
       banner:
-        enabled: 'اِس کو بینر بنا لیا ٪{when}۔ یہ ہر صفحے کے سب سے اوپر دکھایا جائے گا جب تک صارف اِسے برخاست نہیں کر دیتا۔'
-        disabled: 'اِس بینر کو ہٹا دیا ٪{when}۔  یہ اب ہر صفحے کے سب سے اوپر دکھایا نہیں جائے گا۔'
+        enabled: 'اِس کو بینر بنا لیا %{when}۔ یہ ہر صفحے کے سب سے اوپر دکھایا جائے گا جب تک صارف اِسے برخاست نہیں کر دیتا۔'
+        disabled: 'اِس بینر کو ہٹا دیا %{when}۔  یہ اب ہر صفحے کے سب سے اوپر دکھایا نہیں جائے گا۔'
     topic_admin_menu: "ٹاپک کے ایڈمن کی کارروائیاں"
     wizard_required: "اپنے نئے ڈِسکورس پر خوش آمدید! <a href='%{url}' data-auto-route='true'>سیٹ اَپ وزرڈ</a> سے آغاز کرتے ہیں۔✨"
-    emails_are_disabled: "تمام سبکدوش ہونے والے ای میل کو عالمی سطح پر ایک منتظم کی طرف سے غیر فعال کر دیا گیا ہے. کسی بھی قسم کی ای میل اطلاعات نہیں بھیجی جائیں گی۔"
-    bootstrap_mode_enabled: "آپ کی نئی ویب سائٹ شروع کرنے کو آسان بنانے کے لئے، آپ بوٹسٹریپ کے موڈ میں ہیں۔ تمام نئے صارفین کے ٹرسٹ لَیول 1 دیا گیا ہے اور روزانہ کی ای میل اپ ڈیٹس فعال کیے جا چکے ہیں۔ یہ خود کار طریقے سے غیر فعال کر دیا جائے گا جب کل صارف شمار %{min_users} سے تجاوز کر جائے گا۔"
-    bootstrap_mode_disabled: "بوٹسٹریپ کا موڈ اگلے 24 گھنٹوں میں غیر فعال کر دیا جائے گا۔"
+    emails_are_disabled: " ای میل کو منتظم کی طرف سے غیر فعال کر دیا گیا ہے. کسی بھی قسم کی ای میل  نہیں بھیجی جائیں گی۔"
+    bootstrap_mode_enabled: "آپ کی نئی ویب سائٹ شروع کرنے کو آسان بنانے کے لئے، آپ بُوٹسٹرَیپ مَوڈ میں ہیں۔ تمام نئے صارفین کے ٹرسٹ لَیول 1 دیا گیا ہے اور روزانہ کی ای میل اپ ڈیٹس فعال کیے جا چکے ہیں۔ یہ خود کار طریقے سے غیر فعال کر دیا جائے گا جب %{min_users} صارفین شمولیت اختیار کر لیں گے۔"
+    bootstrap_mode_disabled: "بُوٹسٹرَیپ مَوڈ 24 گھنٹوں کے اندر غیر فعال کر دیا جائے گا۔"
+    themes:
+      default_description: "ڈِیفالٹ"
     s3:
       regions:
         ap_northeast_1: "ایشیا پیسفک (ٹوکیو)"
@@ -140,8 +163,10 @@ ur:
         cn_north_1: "چین (بیجنگ)"
         eu_central_1: "یورپی یونین (فرینکفرٹ)"
         eu_west_1: "یورپی یونین (آئر لینڈ)"
+        eu_west_2: "یورپی یونین (لندن)"
         sa_east_1: "ایشیا پیسفک (ساؤ پالو)"
         us_east_1: "امریکی مشرق (شمالی ورجینیا)"
+        us_east_2: "امریکی مشرق (اَوہائیو)"
         us_gov_west_1: "اے ڈبلیو ایس گَو کلاوڈ (امریکہ)"
         us_west_1: "امریکی مغرب (شمالی کیلی فورنیا)"
         us_west_2: "امریکی مغرب (اوریگن)"
@@ -149,6 +174,7 @@ ur:
     not_implemented: "یہ خصوصیت ابھی تک لاگو نہیں کی گئی، معضرت!"
     no_value: "نہیں "
     yes_value: "ہاں "
+    submit: "شائع"
     generic_error: "معذرت، ایک تکنیکی خرابی کا سامنا کرنا پڑا ہے۔"
     generic_error_with_reason: "ایک تکنیکی خرابی پیش آئی: %{error}"
     sign_up: "سائن اپ"
@@ -193,7 +219,7 @@ ur:
       pm_title: "تجویز کیے گئے پیغامات"
     about:
       simple_title: "بارے میں"
-      title: "٪{title} کے بارے میں"
+      title: "%{title} کے بارے میں"
       stats: "سائٹ کے اعدادوشمار"
       our_admins: "ہمارے ایڈمن"
       our_moderators: "ہمارے ماڈریٹرز"
@@ -207,7 +233,7 @@ ur:
       user_count: "صارفین"
       active_user_count: "متحرک صارفین"
       contact: "ہم سے رابطہ کریں"
-      contact_info: "اس سائٹ کے بارے میں کسی اہم مسئلہ یا فوری معاملہ کی صورت میں، براہ مہربانی ٪{contact_info} پر رابطہ کریں۔"
+      contact_info: "اس سائٹ کے بارے میں کسی اہم مسئلہ یا فوری معاملہ کی صورت میں، براہ مہربانی %{contact_info} پر رابطہ کریں۔"
     bookmarked:
       title: "بُک مارک"
       clear_bookmarks: "بک مارکس ختم کریں"
@@ -222,15 +248,14 @@ ur:
       remove: "بُک مارک ہٹائیں"
       confirm_clear: "کیا آپ کو یقین ہے کہ آپ اِس ٹاپک سے تمام بُک مارکس ہٹانا چاہتے ہیں؟"
     topic_count_latest:
-      one: "{{count}} نئے اور اپ ڈیٹ کیے گئے ٹاپک۔"
-      other: "{{count}} نئے اور اپ ڈیٹ کیے گئے ٹاپک۔"
+      one: "{{count}} نیا یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔"
+      other: "{{count}} نئے یا اَپ ڈیٹ کردہ ٹاپک دیکھیں۔"
     topic_count_unread:
-      one: "{{count}} نہ پڑھے گئے ٹاپک۔"
-      other: "{{count}} نہ پڑھے گئے ٹاپک۔"
+      one: "{{count}} غیر پڑھا ٹاپک دیکھیں۔"
+      other: "{{count}} غیر پڑھے ٹاپک دیکھیں۔"
     topic_count_new:
-      one: "{{count}} نئے ٹاپک۔"
-      other: "{{count}} نئے ٹاپک۔"
-    click_to_show: "ظاہر کرنے کے لئے کلک کریں۔"
+      one: "{{count}} نیا ٹاپک دیکھیں۔"
+      other: "{{count}} نئے ٹاپک دیکھیں۔"
     preview: "پیشگی دیکھنا"
     cancel: "منسوخ"
     save: "تبدیلیاں محفوظ کریں"
@@ -238,10 +263,12 @@ ur:
     saved: "محفوظ کر لیا گیا ہے!"
     upload: "اَپ لوڈ"
     uploading: "اَپ لوڈ کیا جا رہا ہے..."
-    uploading_filename: "{{فائل کا نام}} اَپ لوڈ کیا جا رہا ہے..."
+    uploading_filename: "{{filename}} اَپ لوڈ کیا جا رہا ہے..."
     uploaded: "اَپ لوڈ کیا جا چکا ہے!"
+    pasting: "پیسٹ کیا جا رہا ہے..."
     enable: "فعال کریں"
     disable: "غیر فعال کریں"
+    continue: "جاری رکھی"
     undo: "کالعدم کریں"
     revert: "رِیوَرٹ"
     failed: "عمل ناکام رہا"
@@ -319,22 +346,26 @@ ur:
         make_user_group_owner: "مالک بنائیں"
         remove_user_as_group_owner: "مالک منسوخ کریں"
     groups:
-      logs:
-        title: "لاگز"
-        when: "کب"
-        action: "عمل"
-        acting_user: "عمل کرنے والا صارف"
-        target_user: "ہدف صارف"
-        subject: "موضوع"
-        details: "تفصیلات"
-        from: "سے"
-        to: "کے لئے"
-      edit:
-        title: 'گروپ میں ترمیم کریں'
+      manage:
+        title: 'مَینَیج'
+        name: 'نام'
         full_name: 'پورا نام'
-        add_members: "اراکین شامل کریں"
-        delete_member_confirm: "'٪ {username}' گروپ سے '٪ {group}' ہٹائیں؟"
-      name_placeholder: "گروپ کا نام، کوئی خالی جگہ نہیں، نامِ صارفین کے اصولوں کے مطابق"
+        add_members: "ممبران شامل کریں"
+        delete_member_confirm: "'%{username}' کو '%{group}' گروپ سے ہٹائیں؟"
+        profile:
+          title: پروفائل
+        logs:
+          title: "لاگز"
+          when: "کب"
+          action: "عمل"
+          acting_user: "عمل کرنے والا صارف"
+          target_user: "ہدف صارف"
+          subject: "موضوع"
+          details: "تفصیلات"
+          from: "سے"
+          to: "کیلئے"
+      public_admission: "صارفین کو آزادی سے گروپ میں شمولیت اختیار کرنے کی اجازت دیں (گروپ کا عوامی طور پر ظاہر ہونا لاذمی ہو)"
+      public_exit: "صارفین کو آزادانہ طور پر گروپ چھوڑنے کی اجازت دیں"
       empty:
         posts: "اس گروپ کے ارکان کی طرف سے کوئی پوسٹس نہیں ہیں۔"
         members: "اس گروپ میں کوئی ارکان ہیں۔"
@@ -343,36 +374,71 @@ ur:
         topics: "اِس گروپ کے ارکان کی طرف سے کوئی ٹاپک نہیں ہیں۔"
         logs: "اس گروپ کے لئے کوئی لاگز موجود نہیں ہیں۔"
       add: "شامل کریں"
-      join: "گروپ میں شامل ہوں"
-      leave: "گروپ چھوڑ دیں"
-      request: "گروپ میں شمولیت کیلئے درخواست کریں"
-      automatic_group: خودکار گروپ
-      closed_group: بند گروپ
-      is_group_user: "آپ اس گروپ کے رکن ہیں"
+      join: "شمولیت اختیار کریں"
+      leave: "چھوڑ دیں"
+      request: "درخواست"
+      message: "پیغام"
+      allow_membership_requests: "صارفین کو گروپ کے مالکان کو رکنیت کی درخواستیں بھیجنے کی اجازت دیں"
+      membership_request_template: "رکنیت کی درخواست بھیجنے کے دوران صارفین کیلئے ظاہر کیے جانے والی پہلے سے تیار کردہ مثال"
+      membership_request:
+        submit: "درخواست بھیجیں"
+        title: "@%{group_name} میں شمولیت کی درخواست"
+        reason: "گروپ مالکان کو بتائیے کہ آپ اس گروپ میں شامل ہونے کے کیوں مستحق ہیں"
       membership: "ممبرشپ "
       name: "نام"
-      user_count: "ممبران کی تعداد"
+      group_name: "گروپ نام"
+      user_count: "صارفین"
       bio: "گروپ کے بارے میں"
-      selector_placeholder: "ممبران شامل کریں"
+      selector_placeholder: "صارف نام درج کریں"
       owner: "مالِک"
       index:
         title: "گروپس"
+        all: "تمام گروپس"
         empty: "کوئی نظر آنے والے گروپ موجود نہیں ہیں۔"
+        filter: "گروپ قِسم کے حساب سے فِلٹر کریں"
+        all_groups: "تمام گروپس"
+        owner_groups: "گروپس جن کا میں مالک ہوں"
+        close_groups: "بند گروپس"
+        automatic_groups: "خودکار گروپس"
+        automatic: "خود کار طریقے سے"
+        closed: "بند"
+        public: "عوامی"
+        private: "ذاتی"
+        public_groups: "عوامی گروپس"
+        automatic_group: خودکار گروپ
+        close_group: گروپ بند کریں
+        my_groups: "میرے گروپس"
+        group_type: "گروپ قِسم"
+        is_group_user: "ممبر"
+        is_group_owner: "مالِک"
+      title:
+        one: "گروپ"
+        other: "گروپس"
       activity: "سرگرمی"
-      members: "ممبران"
+      members:
+        title: "ممبران"
+        filter_placeholder_admin: "صارف نام یا ای میل"
+        filter_placeholder: "صارف نام"
+        remove_member: "ممبر ہٹائیں"
+        remove_member_description: "اِس گروپ سے <b>%{username}</b> کو ہٹایں"
+        make_owner: "مالک بنائیں"
+        make_owner_description: "اِس گروپ پر <b>%{username}</b> کو مالک بنائیں"
+        remove_owner: "مالک کے طور پر ہٹائیں"
+        remove_owner_description: "اِس گروپ پر سے <b>%{username}</b> کو مالک کے طور پر ہٹائیں"
+        owner: "مالِک"
       topics: "ٹاپک"
       posts: "پوسٹ"
       mentions: "ذکر"
       messages: "پیغامات"
+      notification_level: "گروپ پیغامات کیلئے اطلاعات کا پہلے سے طے شدہ لَیوَل"
       alias_levels:
+        mentionable: "کون اِس گروپ کو @زکر کرسکتا ہے؟"
+        messageable: "کون اِس گروپ کو پیغام بھیج سکتا ہے؟"
         nobody: "کوئی بھی نہیں"
         only_admins: "صرف منتظمین"
         mods_and_admins: "صرف ثالث اور منتظمین"
         members_mods_and_admins: "صرف گروپ کے اراکین، ثالث اور منتظمین"
         everyone: "ہر کوئی"
-      trust_levels:
-        title: "ممبران کو شامل کرتے وقت خود کار طریقے سے دیا جانے والا ٹرسٹ لَیول:"
-        none: "کوئی نہیں"
       notifications:
         watching:
           title: "نظر رکھی ہوئی ہے"
@@ -397,7 +463,6 @@ ur:
       flair_color_placeholder: "(اختیاری) ہیکس رنگ نمبر"
       flair_preview_icon: "آئکن کا مشاہدہ کریں"
       flair_preview_image: "تصویر کا مشاہدہ کریں"
-      flair_note: "نوٹ: فلیر صرف ایک صارف کے بنیادی گروپ کے لئے دکھایا جائے گا۔"
     user_action_groups:
       '1': "لائیکس دیے گئے"
       '2': "لائیکس موصول ہوے"
@@ -413,7 +478,7 @@ ur:
       '14': "زیرِاِلتوَاء"
     categories:
       all: "تمام زُمرَہ جات"
-      all_subcategories: "تمام"
+      all_subcategories: "%{categoryName}میں تمام "
       no_subcategory: "کوئی نہیں"
       category: "زمرہ"
       category_list: "زمرہ جات کی فہرست ظاہر کریں"
@@ -452,6 +517,7 @@ ur:
       topics_entered: " داخل ہوئے ٹاپک"
       post_count: "# پوسٹ"
       confirm_delete_other_accounts: "کیا آپ واقعی یہ اکاؤنٹس حذف کرنا چاہتے ہیں؟"
+      powered_by: "<a href='https://ipinfo.io'>ipinfo.io</a> کے مرہونِ مِنَّت"
     user_fields:
       none: "(ایک آپشن منتخب کریں)"
     user:
@@ -460,6 +526,7 @@ ur:
       mute: "خاموش کردیں"
       edit: "ترجیحات میں ترمیم کردیں"
       download_archive:
+        button_text: "تمام ڈاؤن لوڈ کریں"
         confirm: "کیا آپ واقعی اپنی پوسٹس ڈاؤن لوڈ کرنا چاہتے ہیں؟"
         success: "ڈاؤن لوڈ کا آغاز کر دیا گیا ہے، عمل مکمل ہونے پر آپ کو پیغام کے ذریعے مطلع کر دیا جائے گا۔"
         rate_limit_error: "پوسٹس فی دن ایک بار ہی ڈاؤن لوڈ کی جا سکتی ہیں،  براہ مہربانی کل دوبارہ کوشش کریں۔"
@@ -469,6 +536,7 @@ ur:
       activity_stream: "سرگرمی"
       preferences: "ترجیحات"
       expand_profile: "مزید کھولیں"
+      collapse_profile: "بند کریں"
       bookmarks: "بُکمارکس"
       bio: "سائٹ کے بارے میں"
       invited_by: "کی طرف سے مدعو کیا گیا:"
@@ -484,11 +552,14 @@ ur:
         disable: "اطلاعات غیر فعال کریں"
         enable: "اطلاعات فعال کریں"
         each_browser_note: "نوٹ: آپ کو ہر براؤزر پر اس سیٹنگ کو تبدیل کرنا ہوگا."
+      dismiss: 'بر خاست کریں'
       dismiss_notifications: "سب بر خاست کریں"
       dismiss_notifications_tooltip: "تمام بغیر پڑھی اطلاعات کو پڑھی جا چکی اطلاعات کے طور پر مارک کریں"
       first_notification: "آپ کی پہلی نوٹیفکیشن! شروع کرنے کے لئے اسے منتخب کریں۔"
       disable_jump_reply: "میرے جواب دینے کے بعد میری پوسٹ پر نہ جائیں"
       dynamic_favicon: "براؤزر آئکن پر نئے / اَپ ڈیٹ ہوئے ٹاپکس کی گنتی دکھائیں"
+      theme_default_on_all_devices: "میری تمام ڈیوائسز پر اِس کو میری ڈیفالٹ تھیم بنائیں"
+      allow_private_messages: "دوسرے صارفین کو مجھے ذاتی پیغامات بھیجنے کی اجازت دیں"
       external_links_in_new_tab: "تمام بیرونی ویب سائٹ کے لنکس ایک نئے ٹیب میں کھولیں"
       enable_quoting: "روشنی ڈالے گئے ٹَیکسٹ کے لئے اقتباسی جواب فعال کریں"
       change: "بدلیں"
@@ -496,7 +567,9 @@ ur:
       admin: "{{user}} ایک ایڈمِن ہے"
       moderator_tooltip: "یہ صارف ایک ماڈریٹر ہے"
       admin_tooltip: "یہ صارف ایک ایڈمِن ہے"
-      suspended_notice: "ہ صارف {{date}} تک معطل ہے۔"
+      silenced_tooltip: "یہ صارف خاموش کیا ہوا ہے"
+      suspended_notice: "یہ صارف {{date}} تک معطل ہے۔"
+      suspended_permanently: "یہ صارف معطل ہے۔"
       suspended_reason: "وجہ:"
       github_profile: "گِٹ حَب"
       email_activity_summary: "سرگرمی کا خلاصہ"
@@ -508,7 +581,7 @@ ur:
           خاموش کردہ ٹاپک اور زمرہ جات اِن اِیمیلز میں شامل نہیں ہیں۔
         individual: "ہر نئی پوسٹ پر ایک ای میل بھیجیں"
         individual_no_echo: "میری اپنی کے سوا، ہر نئی پوسٹ پر ایک ای میل بھیجیں"
-        many_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریبا {{یومیہ ای میل تخمینہ}} فی دن)"
+        many_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریباً {{dailyEmailEstimate}} فی دن)"
         few_per_day: "ہر نئی پوسٹ پر ایک ای میل بھیجیں (تقریبا 2 فی دن)"
       tag_settings: "ٹیگز"
       watched_tags: "دیکھا گیا"
@@ -527,6 +600,7 @@ ur:
       watched_first_post_tags_instructions: "آپ کو اِن ٹیگ والے ہر نئے ٹاپک کی پہلی پوسٹ کے بارے میں مطلع کیا جائے گا۔"
       muted_categories: "خاموش کِیا ہوا"
       muted_categories_instructions: "آپ کو اِن زمرہ جات میں موجود نئے ٹاپکس کی کسی بھی چیز کے بارے میں مطلع نہیں کیا جائے گا، اور یہ تازہ ترین میں بھی نظر نہیں آئیں گے۔"
+      no_category_access: "ایک ماڈریٹر کے طور پر آپ کو زمرہ پر محدود رسائی حاصل ہے، محفوظ کرنا غیر فعال ہے۔"
       delete_account: "میرا اکاؤنٹ حذف کریں"
       delete_account_confirm: "کیا آپ واقعی مستقل طور پر اپنا اکاؤنٹ حذف کرنا چاہتے ہیں؟ اس عمل کو کالعدم نہیں کیا جا سکتا!"
       deleted_yourself: "آپ کے اکاؤنٹ کو کامیابی سے حزف کر دیا گیا ہے۔"
@@ -538,11 +612,15 @@ ur:
       muted_users_instructions: "اِن صارفین کی طرف سے تمام اطلاعات کو روکیں۔"
       muted_topics_link: "خاموش کردیے گئے ٹاپکس دکھائیں"
       watched_topics_link: "دیکھے گئے ٹاپک ظاہر کریں"
+      tracked_topics_link: "ٹرَیک کیے گئے ٹاپک دکھائیں"
       automatically_unpin_topics: "جب میں سب سے نیچے تک پہنچوں تو خود کار طریقے سے ٹاپک سے پن ہٹایں۔"
       apps: "ایپس"
       revoke_access: "رسائی کالعدم کریں"
       undo_revoke_access: "رسائی کالعدم کو منسوخ کریں"
       api_approved: "منظورشدہ"
+      theme: "تھیم"
+      home: "ڈیفالٹ ہوم پیج"
+      staged: "سٹَیجڈ"
       staff_counters:
         flags_given: "مدد گار فلَیگ"
         flagged_posts: "فلَیگ کی گئی پوسٹس"
@@ -560,6 +638,16 @@ ur:
         move_to_archive: "آر کائیو"
         failed_to_move: "منتخب شدہ پیغامات کو منتقل کرنے میں ناکامی (شاید آپ کے نیٹ ورک بند ہے)"
         select_all: "تمام منتخب کریں"
+        tags: "ٹیگز"
+      preferences_nav:
+        account: "اکاؤنٹ"
+        profile: "پروفائل"
+        emails: "اِی مَیل"
+        notifications: "اطلاعات"
+        categories: "زُمرَہ جات"
+        tags: "ٹیگز"
+        interface: "انٹرفیس"
+        apps: "اَیپس"
       change_password:
         success: "(اِی میل بھیج دی گئ)"
         in_progress: "(اِی میل بھیجی جا رہی ہے)"
@@ -568,6 +656,19 @@ ur:
         set_password: "پاس ورڈ رکھیں"
         choose_new: "نیا پاس ورڈ منتخب کریں"
         choose: "پاس ورڈ منتخب کریں"
+      second_factor:
+        title: "دو فیکٹر توثیق"
+        disable: "دو فیکٹر توثیق غیر فعال کریں"
+        enable: "بہتر اکاؤنٹ سیکورٹی کیلئے"
+        confirm_password_description: "جاری رکھنے کیلئے براہ کرم اپنے پاسوَرڈ کی تصدیق کریں"
+        label: "کَوڈ"
+        enable_description: |
+          اِس QR کَوڈ کو کسی قابل اَیپ (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">اینڈرائڈ</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a>– <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>وِنڈَوز فون</a>) میں اسکَین کریں اور اپنا توثیقی کَوڈ جمع کریں۔
+        disable_description: "براہ مہربانی اپنی اَیپ میں سے توثیقی کَوڈ درج کریں"
+        show_key_description: "دستی طور پر درج کریں"
+        extended_description: |
+          دو فیکٹر توثیق پاسوَرڈ کے ساتھ ساتھ ایک دفعہ کے ٹَوکن کو مانگ کر آپ کے اکاؤنٹ کیلئے اضافی سیکورٹی شامل کرتا ہے۔ ٹَوکن <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>اینڈرائڈ</a>، <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>، اور <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>وِنڈَوز فون</a> ڈیوائسوں پر تخلیق کیے جا سکتے ہیں۔
+        oauth_enabled_warning: "براہ مہربانی نوٹ کریں کہ ایک بار جب آپ کے اکاؤنٹ پر دو فیکٹر توثیق فعال ہو جائے تو سَوشَل لاگ اِن غیر فعال ہوجائیں گے۔"
       change_about:
         title: "\"میرے بارے میں\" تبدیل کریں"
         error: "اِس چیز کو تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
@@ -581,10 +682,12 @@ ur:
         taken: "معذرت، یہ اِی میل دستیاب نہیں ہے۔"
         error: "آپ کا اِی میل تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ شاید یہ ایڈریس پہلے سے استعمال میں ہے؟"
         success: "ہم نے اِس ایڈریس پر ایک اِی میل بھیج دی ہے۔ براہ کرم، تصدیق کی ہدایات پر عمل کریں۔"
+        success_staff: "ہم نے آپ کے موجودہ ایڈریس پر ایک اِی میل بھیج دی ہے۔ براہ کرم، تصدیق کی ہدایات پر عمل کریں۔"
       change_avatar:
         title: "اپنے پروفائل کی تصویر تبدیل کریں"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>گَرِیوَّٹار</a>، کی بنیاد پر"
         gravatar_title: "گَرِیوَّٹار کی ویب سائٹ پر اپنے اوتار کو تبدیل کریں"
+        gravatar_failed: "گَرَیوَٹار درآمد نہیں کرایا جاسکا۔ کیا اس ای میل ایڈریس کے ساتھ ایک منسلک ہے؟ "
         refresh_gravatar_title: "اپنے گَرِیوَّٹار کو رِیفریش کریں"
         letter_based: "سسٹم تفویض کردہ پروفائل تصویر"
         uploaded_avatar: "اپنی مرضی کی تصویر"
@@ -604,7 +707,7 @@ ur:
         instructions: "کبھی بھی عوام کو نہیں دکھایا گیا"
         ok: "ہم تصدیق کے لئے آپ کو اِی میل کریں گے"
         invalid: "براہ کرم، ایک قابلِ قبول ایِ میل ایڈریس درج کریں"
-        authenticated: "آپ کے اِی میل کی توثیق کر دی گئی ہے {{فراہم کنندہ}}"
+        authenticated: "آپ کے اِی میل کی توثیق کر دی گئی ہے {{provider}}"
         frequency_immediately: "جس بارے میں ہم آپ کو اِی میل کر رہے ہیں، اگر آپ نے نہیں پڑھی ہوئی تو ہم فوری طور پر آپ کو اِی میل کریں گے۔"
         frequency:
           one: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ ایک منٹ میں نہ دیکھا ہو۔"
@@ -694,7 +797,7 @@ ur:
         title: "دعوتیں"
         user: "مدعو کیا گیا صارف"
         sent: "بھیج دیا گیا"
-        none: "ظاہر کرنے کے لئے کوئی زیرِاِلتوَاء دعوتیں نہیں ہیں۔"
+        none: "ظاہر کرنے کے لئے کوئی دعوتیں نہیں ہیں۔"
         truncated:
           one: "پہلی دعوت دکھائی جا رہی ہیں۔"
           other: "پہلی {{count}} دعوتیں دکھائی جا رہی ہیں۔"
@@ -710,8 +813,12 @@ ur:
         expired: "اِس دعوت کی میعاد ختم ہو چکی ہے۔"
         rescind: "خارج کریں"
         rescinded: "دعوت خارج کر دی گئی"
+        rescind_all: "تمام دعوتیں منسوخ کر دیں"
+        rescinded_all: "تمام دعوتیں منسوخ کر دی گئیں!"
+        rescind_all_confirm: "کیا آپ واقعی تمام دعوتیں منسوخ کر دینا چاہتے ہیں؟"
         reinvite: "دعوت دوبارہ بھیجیں"
         reinvite_all: "تمام دعوتیں دوبارہ بھیجیں"
+        reinvite_all_confirm: "کیا آپ واقعی تمام دعوتیں دوبارہ بھیجنا چاہتے ہیں؟"
         reinvited: "دعوت دوبارہ بھیج دی گئی"
         reinvited_all: "تمام دعوتیں دوبارہ بھیج دی گئیں!"
         time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت"
@@ -720,7 +827,7 @@ ur:
         create: "ایک دعوت بھیجیں"
         generate_link: "دعوت لنک کاپی کریں"
         link_generated: "دعوت لنک کامیابی سے بن گیا!"
-        valid_for: "دعوت لنک صرف اِس اِی میل اِیڈریس کے لئے درست ہے:٪{اِیمیل}"
+        valid_for: "دعوت لنک صرف اِس اِی میل اِیڈریس کے لئے درست ہے:%{email}"
         bulk_invite:
           none: "آپ نے یہاں ابھی تک کسی کو بھی مدعو نہیں کیا۔ انفرادی طار پر دعوت نامے ارسال کریں، یا <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>ایک CSV فائل اَپ لوڈ کرکے</a> ایک وقت میں ہی بہت سے لوگوں کو دعوت دیں۔"
           text: "فائل کی مدد سے ایک وقت میں بہت سے لوگوں کو دعوت دیں"
@@ -738,15 +845,25 @@ ur:
         title: "خلاصہ"
         stats: "اعدادوشمار"
         time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت"
+        recent_time_read: "پڑھنے کیلئے اِستعمال ہونے والا حالیہ وقت"
         topic_count:
           one: "بنایا گیا ٹاپک"
           other: "بنائے گئے ٹاپک"
         post_count:
           one: "بنائی گئی پوسٹ"
           other: "بنائی گئیں پوسٹ"
+        likes_given:
+          one: "دیا گیا"
+          other: "دیا گیا"
+        likes_received:
+          one: "موصول ہوا"
+          other: "موصول ہوا"
         days_visited:
           one: "دن جس میں دورہ کیا گیا"
           other: "دن جن میں دورہ کیا گیا"
+        topics_entered:
+          one: "دیکھ لیا گیا ٹاپک"
+          other: "دیکھ لیے گئے ٹاپک"
         posts_read:
           one: "پڑھی گئی پوسٹ"
           other: "پڑھی گئیں پوسٹس"
@@ -778,6 +895,7 @@ ur:
         header_title: "پروفائل، پیغامات، بک مارکس اور ترجیحات"
       title:
         title: "عنوان"
+        none: "(کوئی نہیں)"
       filters:
         all: "تمام"
       stream:
@@ -813,15 +931,15 @@ ur:
       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>٪{موجودہ ٹاپک}/٪{درکار ٹاپک}<strong/> ٹاپک اور <strong>٪{موجودہ پوسٹ}/٪{درکار پوسٹ}<strong/> پوسٹ ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
-    too_few_topics_notice: "چلیں <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> اِس وقت اَبھی <strong>٪{موجودہ ٹاپک}/٪{درکار ٹاپک}<strong/> ٹاپک ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
-    too_few_posts_notice: "چلیں <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>اِس بحث کو شروع کریں!</a> اِس وقت اَبھی <strong>٪{موجودہ پوسٹ}/٪{درکار پوسٹ}<strong/> پوسٹ ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔"
+    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_notice:
-      reached: "<b>٪{relativeAge}</b> – <a href='%{url}' target='_blank'>٪{rate}</a> ٪{siteSettingRate} کی سائٹ سیٹِنگ لِمٹ تک پہنچ گئی۔"
-      exceeded: "<b>٪{relativeAge}</b> – <a href='%{url}' target='_blank'>٪{rate}</a> ٪{siteSettingRate} کی سائٹ سیٹِنگ لِمٹ سے تجاوز کر گئی۔"
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> سائٹ سیٹِنگ لِمٹ %{siteSettingRate} تک پہنچ گئی۔"
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> سائٹ سیٹِنگ لِمٹ %{siteSettingRate} سے تجاوز کر گئی۔"
       rate:
-        one: "1 خرابی/٪{مدت}"
-        other: "٪{count} خرابیاں/٪{duration}"
+        one: "1 خرابی/%{duration}"
+        other: "%{count} خرابیاں/%{duration}"
     learn_more: "اورجانیے..."
     all_time: 'کُل'
     all_time_desc: 'کُل ٹاپک بنائے گئے'
@@ -835,6 +953,11 @@ ur:
     first_post: پہلی پوسٹ
     mute: خاموش کریں
     unmute: آواز چالو کریں
+    last_post: پوسٹ کیا
+    time_read: پڑھا
+    time_read_recently: 'حال ہی میں %{time_read}'
+    time_read_tooltip: 'کُل وقت پڑھا %{time_read}'
+    time_read_recently_tooltip: 'کُل وقت پڑھنے میں لگا %{time_read}(%{recent_time_read} گزشتہ 60 دنوں میں) '
     last_reply_lowercase: آخری جواب
     replies_lowercase:
       one: جواب
@@ -860,6 +983,7 @@ ur:
     private_message_info:
       title: "پیغام"
       invite: "دوسروں کو مدعو کریں..."
+      leave_message: "کیا آپ واقعی یہ پیغام بھیجنا چاہتے ہیں؟"
       remove_allowed_user: "کیا آپ واقعی اِس پیغام سے {{name}} ہٹانا چاہتے ہیں؟"
       remove_allowed_group: "کیا آپ واقعی اِس پیغام سے {{name}} ہٹانا چاہتے ہیں؟"
     email: 'اِی میل'
@@ -870,7 +994,7 @@ ur:
     trust_level: 'ٹرسٹ لَیول'
     search_hint: 'صارف نام، ای میل یا IP ایڈریس'
     create_account:
-      disclaimer: "رجسٹر کرنے پر آپ <{{a href='{{privacy link>زاتی معلومات کی حفاظتی پالیسی</a> اور <a href='{{tos_link}}'>سروس کی شرائط</a>۔"
+      disclaimer: "رجسٹر کرنے پر آپ <a href='{{privacy_link}}'>پرائیوِیسی پالیسی</a> اور <a href='{{tos_link}}'>سروس کی شرائط</a>سے اتفاق کرتے ہیں۔"
       title: "نیا اکاؤنٹ بنائیں"
       failed: "کچھ غلط ہو گیا، شاید یہ ای میل پہلے ہی سے رجسٹرڈ ہے، پاسورڈ بھول جانے والا لنک اِستعمال کر کے دیکھیں"
     forgot_password:
@@ -878,20 +1002,35 @@ ur:
       action: "میں اپنا پاسورڈ بھول گیا"
       invite: "اپنا صارف نام یا اِی میل ایڈریس درج کریں، اور ہم آپ کو ایک پاسورڈ رِی سَیٹ ایمیل بھیج دیں گے۔"
       reset: "پاسورڈ رِی سَیٹ کریں"
-      complete_username: "اگر کوئی اکاؤنٹ username <b>٪{username}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_email: "اگر کوئی اکاؤنٹ <b>٪{اِیمیل}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_username_found: "ہمیں ایک اکاؤنٹ ملا ہے جو username <b>٪{username}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_email_found: "ہمیں ایک اکاؤنٹ ملا ہے جو <b>٪{اِیمیل}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_username_not_found: "کوئی اکاؤنٹ username <b>٪{username}</b> سے میچ نہیں کرتا"
-      complete_email_not_found: "کوئی اکاؤنٹ <b>٪{اِیمیل}</b> سے میچ نہیں کرتا"
+      complete_username: "اگر کوئی اکاؤنٹ <b>%{username}</b> سے میچ کرتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_email: "اگر کوئی اکاؤنٹ <b>%{email}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_username_found: "ہمیں ایک اکاؤنٹ ملا ہے جو <b>%{username}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_email_found: "ہمیں ایک اکاؤنٹ ملا ہے جو <b>%{email}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_username_not_found: "کوئی اکاؤنٹ <b>%{username}</b> سے میچ نہیں کرتا"
+      complete_email_not_found: "کوئی اکاؤنٹ <b>%{email}</b> سے میچ نہیں کرتا"
+      help: "ای میل نہیں موصول ہر رہی؟ اپنے سپَیم فولڈر کو پہلے چیک کرلیجیے گا۔<p>آپ کو شک ہے کہ کونیسا ای میل ایڈریس آپ نے استعمال کیا ہے؟ ایک ای میل ایڈریس درج کریں اور ہم آپ کو بتائیں گے اگر یہ ہمارے پاس موجود ہے۔</p> <p>اگر آپ کو اپنے اکاؤنٹ پر ای میل ایڈریس تک اب رسائی حاصل نہیں ہے، تو براہ کرم <a href='/about'>ہمارے مددگار اسٹاف</a> سے رابطہ کریں۔</p>"
+      button_ok: "ٹھیک ہے"
+      button_help: "مدد"
+    email_login:
+      link_label: "مجھے ایک لاگ اِن لِنک ای میل کریں"
+      button_label: "ای میل کے ساتھ"
+      complete_username: "اگر ایک اکاؤنٹ صارف نام <b>%{username}</b> سے میچ کرتا ہے، تو آپ کو جلد ہی لاگ اِن لِنک کے ساتھ ایک ای میل موصول ہو جانی چاہئے۔"
+      complete_email: "اگر ایک اکاؤنٹ <b>%{email}</b> سے میچ کرتا ہے، تو آپ کو جلد ہی لاگ اِن لِنک کے ساتھ ایک ای میل موصول ہو جانی چاہئے۔"
+      complete_username_found: "ہمیں ایک ایسا اکاؤنٹ مل گیا جو صارف نام <b>%{username}</b> سے میچ کرتا ہے، آپ کو جلد ہی لاگ اِن لِنک کے ساتھ ایک ای میل موصول ہو جانی چاہئے۔"
+      complete_email_found: "ہمیں ایک ایسا اکاؤنٹ مل گیا جو <b>%{email}</b> سے میچ کرتا ہے، آپ کو جلد ہی لاگ اِن لِنک کے ساتھ ایک ای میل موصول ہو جانی چاہئے۔"
+      complete_username_not_found: "کوئی اکاؤنٹ صارف نام <b>%{username}</b> سے میچ نہیں کرتا"
+      complete_email_not_found: "کوئی اکاؤنٹ <b>%{email}</b> سے میچ نہیں کرتا"
     login:
       title: "لاگ اِن"
       username: "صارف"
       password: "پاسورڈ"
+      second_factor_title: "دو فیکٹر توثیق"
+      second_factor_description: "براہ مہربانی اپنی اَیپ میں سے توثیقی کَوڈ درج کریں:"
       email_placeholder: "اِی میل یا صارف نام"
       caps_lock_warning: "کیپس لاک آن ہے"
       error: "نامعلوم خرابی"
       rate_limit: "دوبارہ لاگ اِن کرنے کی کوشش کرنے سے پہلے براہ کرم تھوڑا انتظار کریں۔"
+      blank_username: "براہ مہربانی اپنا اِیمیل یا صارف نام درج کریں۔"
       blank_username_or_password: "براہ مہربانی اپنا اِیمیل یا صارف نام، اور پاسورڈ درج کریں۔"
       reset_password: 'پاسورڈ رِی سَیٹ کریں'
       logging_in: "لاگ اِن ہو رہا ہے..."
@@ -904,6 +1043,11 @@ ur:
       not_allowed_from_ip_address: "آپ اِس آئی پی ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
       admin_not_allowed_from_ip_address: "آپ ایڈمن کے طور پر اِس آئی پی ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
       resend_activation_email: "دوبارہ ایکٹیویشن ای میل بھیجنے کے لئے یہاں کلک کریں۔"
+      omniauth_disallow_totp: "آپ کے اکاؤنٹ پر دو فیکٹر توثیق فعال ہے۔ براہ مہربانی اپنے پاسوَرڈ کے ساتھ لاگ اِن کریں۔"
+      resend_title: "ایکٹیویشن اِیمیل دوبارہ بھیجییں"
+      change_email: "اِیمیل ایڈریس تبدیل کریں"
+      provide_new_email: "ایک نیا ایڈریس فراہم کریں اور ہم آپ کی تصدیقی ای میل دوبارہ بھیجیں گے۔"
+      submit_new_email: "اِیمیل ایڈریس اَپ ڈَیٹ کریں"
       sent_activation_email_again: "ہم نے آپ کو <b>{{currentEmail}}</b> پر ایک اور ایکٹیویشن اِی میل بھیجی ہے۔ اسے پہنچنے میں چند منٹ لگ سکتے ہیں؛ اپنے سپیم فولڈر کو چیک کرنا نہ بھولیے گا۔"
       to_continue: "برائے مہربانی لاگ اِن کریں"
       preferences: "آپ کا اپنی صارف ترجیحات کو تبدیل کرنے کے لیے لاگ اِن ہونا ضروری ہے۔"
@@ -932,34 +1076,70 @@ ur:
         message: "گِٹ ہَب کے زریعے تصدیق کی جا رہی ہے (یقینی بنائیں کہ پاپ اَپ بلاکرز فعال نہیں ہیں)"
     invites:
       accept_title: "دعوت نامہ"
-      welcome_to: "{SITE_NAME}٪ پر خوش آمدید!"
+      welcome_to: "%{site_name} پر خوش آمدید!"
       invited_by: "آپ کو جن کی طرف سے مدعو کیا گیا تھا:"
       social_login_available: "آپ اِس اِیمیل کا استعمال کرتے ہوئے کسی بھی سوشل لاگ اِن کے ساتھ سائن اِن بھی کرسکیں گے۔"
-      your_email: "آپ کے اکاؤنٹ کا اِیمیل ایڈریس <b>٪{اِیمیل}</b> ہے۔"
+      your_email: "آپ کے اکاؤنٹ کا اِیمیل ایڈریس <b>%{email}</b> ہے۔"
       accept_invite: "دعوت قبول کریں"
       success: "آپ کا اکاؤنٹ بنا دیا گیا ہے اور اب آپ لاگ اِن کر سکتے ہیں۔"
+      name_label: "نام"
+      password_label: "پاس ورڈ رکھیں"
+      optional_description: "(اختیاری)"
     password_reset:
-      continue: "{SITE_NAME}٪ پر جاری رکھیں"
+      continue: "%{site_name} پر جاری رکھیں"
     emoji_set:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "گُوگَل کلاسِک"
+      facebook_messenger: "فَیس بُک مَیسنجر"
     category_page_style:
       categories_only: "صرف زمرہ جات"
       categories_with_featured_topics: "نمایاں ٹاپکس کے ساتھ زمرہ جات"
-      categories_and_latest_topics: "تازہ ترین ٹاپکس کے ساتھ زمرہ جات"
+      categories_and_latest_topics: "زُمرہ جات اور تازہ ترین ٹاپکس"
+      categories_and_top_topics: "زمرہ جات اور ٹاپ ٹاپکس"
     shortcut_modifier_key:
       shift: 'شفٹ'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: منتخب کریں...
+      no_content: کوئی میل نہیں ملے
+      filter_placeholder: تلاش کریں...
+      create: "'{{content}}' بنائیں"
+    emoji_picker:
+      filter_placeholder: اِیمَوجی تلاش کریں
+      people: لوگ
+      nature: نَیچر
+      food: کھانا
+      activity: سرگرمی
+      travel: سفر
+      objects: اشیاء
+      celebration: جشن
+      custom: اپنی مرضی کے اِیمَوجی
+      recent: حال ہی میں استعمال کیے گئے
+      default_tone: کوئی جِلد رنگ نہیں
+      light_tone: ہلکا جِلد رنگ
+      medium_light_tone: درمیانا ہلکا جِلد رنگ
+      medium_tone: درمیانا جِلد رنگ
+      medium_dark_tone: درمیانا سیاہ جِلد رنگ
+      dark_tone: سیاہ جِلد رنگ
+    shared_drafts:
+      title: "مشترکہ ڈرافٹس"
+      notice: "یہ ٹاپک صرف اُن لوگوں کیلئے نظر آتا ہے جو <b>{{category}}</b> زُمرَہ کو دیکھ سکتے ہیں۔"
+      destination_category: "مطلوبہ زُمرَہ"
+      publish: "مشترکہ ڈرافٹس شائع کریں"
+      confirm_publish: "کیا آپ واقعی اِس ڈرافٹ کو شائع کرنا چاہتے ہیں؟"
+      publishing: "ٹاپک شائع کیا جا رہا ہے..."
     composer:
       emoji: "اِیمَوجی :)"
       more_emoji: "مزید..."
       options: "اختیارات"
       whisper: "سرگوشی"
       unlist: "غیر مندرج"
+      blockquote_text: "بلاک متن"
       add_warning: "یہ ایک آفیشل انتباہ ہے۔"
       toggle_whisper: "سرگوشی ٹَوگل کریں"
       toggle_unlisted: "غیر مندرج ٹَوگل کریں"
@@ -969,12 +1149,14 @@ ur:
       saved_local_draft_tip: "مقامی طور پر محفوظ کر لیا گیا"
       similar_topics: "آپ کا ٹاپک ملتا ہے..."
       drafts_offline: "ڈرافٹس آف لائن"
+      group_mentioned_limit: "<b>انتباہ!</b> آپ نے <a href='{{group_link}}'>{{group}}</a> کا ذکر کیا ہے، تاہم اس گروپ کے ممبران کی تعداد، منتظم کی طرف سے مقرر کردہ {{max}} صارفین کے ذکر کی حد سے زیادہ ہے ۔ کسی کو بھی اطلاع نہیں دی جائے گی۔"
       group_mentioned:
         one: "{{group}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>1 شخص</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
         other: "{{group}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>{{count}} لوگوں</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
       cannot_see_mention:
         category: "آپ نے {{username}} کا زکر کیا ہے لیکن چونکہ اُن کو اِس زمرے تک رسائی حاصل نہیں، اُن کو مطلع نہیں کیا جائے گا۔ آپ کو انہیں ایک ایسے گروپ میں شامل کرنے کی ضرورت ہے جسے اِس زمرے تک رسائی حاصل ہے۔"
         private: "آپ نے {{username}} کا زکر کیا ہے لیکن چونکہ وہ یہ ذاتی پیغام نہیں دیکھ سکتے اُن کو مطلع نہیں کیا جائے گا۔ آپ کو اُنہیں اِس ذاتی پیغام میں مدعو کرنے کی ضرورت ہے۔"
+      duplicate_link: "لگتا ہے کہ آپ کا <b>{{domain}}</b> لنک <b>@{{username}}</b> نے <a href='{{post_url}}'>{{ago}} کو ٹاپک میں پہلے سے ہی ایک جواب</a> میں پوسٹ کر دیا تھا - کیا آپ واقعی یہ دوبارہ پوسٹ کرنا چاہتے ہیں؟"
       error:
         title_missing: "عنوان درکار ہے"
         title_too_short: "عنوان میں کم از کم {{min}} حروف ہونا ضروری ہے"
@@ -990,6 +1172,9 @@ ur:
       cancel: "منسوخ"
       create_topic: "ٹاپک بنائیں"
       create_pm: "پیغام"
+      create_whisper: "سرگوشی"
+      create_shared_draft: "مشترکہ ڈرافٹ بنائیں"
+      edit_shared_draft: "مشترکہ ڈرافٹ ترمیم کریں"
       title: "یا Ctrl+Enter دبائیں"
       users_placeholder: "ایک صارف شامل کریں"
       title_placeholder: "ایک مختصر جملہ میں بتائیے کہ یہ بحث کس چیز کے بارے میں ہے؟"
@@ -997,7 +1182,9 @@ ur:
       edit_reason_placeholder: "آپ ترمیم کیوں کر رہے ہیں؟"
       show_edit_reason: "(ترمیم کی وجہ شامل کریں)"
       topic_featured_link_placeholder: "عنوان کے ساتھ دکھایا گیا لنک درج کریں۔"
+      remove_featured_link: "ٹاپک سے لنک ہٹا ئیں۔"
       reply_placeholder: "یہاں ٹائپ کریں۔ فارمیٹ کیلئے مارکڈائون، BBCode، یا HTML اِستعمال کریں۔ تصاویر ڈریگ یا پیسٹ کریں۔"
+      reply_placeholder_no_images: "یہاں ٹائپ کریں۔ فارمیٹ کیلئے مارکڈائون، BBCode، یا HTML اِستعمال کریں۔"
       view_new_post: "اپنے نئی پوسٹ دیکھئیے۔"
       saving: "محفوظ کیا جا رہا ہے"
       saved: "محفوظ کر لیا گیا!"
@@ -1007,8 +1194,10 @@ ur:
       hide_preview: '&laquo; پیش نظارہ چھپائیں'
       quote_post_title: "پوری پوسٹ کا اقتباس کریں"
       bold_label: "B"
+      bold_title: "گہرا"
       bold_text: "گہرا ٹَیکسٹ"
       italic_label: "I"
+      italic_title: "آئیٹیلک"
       italic_text: "زور دیا گیا ٹَیکسٹ"
       link_title: "ہائپرلِنک"
       link_description: "یہاں لِنک کی تفصیل درج کریں"
@@ -1025,35 +1214,74 @@ ur:
       olist_title: "نمبروار فہرست"
       ulist_title: "بلٹ والی لسٹ"
       list_item: "فہرست آئٹم"
+      toggle_direction: "سمت ٹَوگل کریں"
       help: "مارکڈائون ترمیم میں مدد"
+      collapse: "کمپوزر پینل کو مینِمائز کریں"
+      abandon: "کمپوزر بند اور ڈرافٹ ختم کردیں"
       modal_ok: "ٹھیک"
       modal_cancel: "منسوخ"
-      cant_send_pm: "معذرت، آپ ٪{username} کو پیغام نہیں بھیج سکتے۔"
+      cant_send_pm: "معذرت، آپ %{username} کو پیغام نہیں بھیج سکتے۔"
       yourself_confirm:
         title: "کیا آپ وصول کنندگان کو شامل کرنا بھول گئے؟"
         body: "اِس وقت یہ پیغام صرف اپنے آپ کو بھیجا جا رہا ہے!"
       admin_options_title: "اس ٹاپک کیلئے عملے کی اختیاری سیٹِنگ"
+      composer_actions:
+        reply_to_post:
+          label: '%{postUsername} کی طرف سے پوسٹ %{postNumber} کا جواب دیں'
+          desc: ایک مخصوص پوسٹ پر جواب دیں
+        reply_as_new_topic:
+          label: مُنسلِک ٹاپک کے طور پر جواب دیں
+          desc: اِس ٹاپک سے منسلک ایک نیا ٹاپک بنائیں
+        reply_as_private_message:
+          label: نیا پیغام
+          desc: نیا ذاتی پیغام بنائیں
+        reply_to_topic:
+          label: ٹاپک پر جواب دیں
+          desc: ٹاپک کا جواب دیں، نہ کہ کسی مخصوص پوسٹ کا
+        toggle_whisper:
+          label: سرگوشی ٹَوگل کریں
+          desc: سرگوشیاں صرف سٹاف اراکین کو نظر آتی ہیں
+        create_topic:
+          label: "نیا ٹاپک"
+        shared_draft:
+          label: "مشترکہ ڈرافٹ"
+          desc: "ایک ٹاپک ڈرافٹ کریں جو صرف سٹاف کو نظر آسکے"
     notifications:
+      tooltip:
+        regular:
+          one: "1 اندیکھی اطلاع"
+          other: "{{count}} اندیکھی اطلاعات"
+        message:
+          one: "1 غیر پڑھا پیغام"
+          other: "{{count}} غیر پڑھے پیغامات"
       title: "@نام کے ذکر، آپ کی پوسٹ اور ٹاپک پر جوابات، پیغامات، وغیرہ کی اطلاعات"
       none: "اِس وقت ویب سائٹ اطلاعات لوڈ کرنے سے قاصر ہے۔"
       empty: "کوئی اطلاعات نہیں ملیں۔"
       more: "پرانی اطلاعات دیکھیے"
       total_flagged: "کُل فلَیگ کی گئی پوسٹس"
-      alt:
-        mentioned: "کی طرف سے ذکر کیا گیا"
-        quoted: "کی طرف سے اقتباس کیا گیا"
-        replied: "جواب دیا"
-        posted: "کی طرف سے پوسٹ"
-        edited: "اِس وقت تک اپنی پوسٹ میں ترمیم کر لیں"
-        liked: "آپ کی پوسٹ کو لائیک کیا"
-        private_message: "کی طرف سے ذاتی پیغام"
-        invited_to_private_message: "کی طرف سے ذاتی پیغام کیلئے دعوت دی گئی"
-        invited_to_topic: "کی طرف سے ٹاپک کیلئے دعوت دی گئی"
-        invitee_accepted: "کی طرف سے دعوت قبول کر لی گئی"
-        moved_post: "کی طرف سے آپ کی پوسٹ منتقل کر دی گئی تھی"
-        linked: "آپ کی پوسٹ سے لنک کیا"
-        granted_badge: "بَیج عطا کیا"
-        group_message_summary: "گروپ اِن باکس میں پیغامات"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        one: "<span>{{username2}}، {{username}} اور 1 مزید</span> {{description}}"
+        other: "<span>{{username2}}، {{username}} اور {{count}} مزید</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span>نے آپ کی دعوت قبول کرلی "
+      moved_post: "<span>{{username}}</span>نے {{description}} منتقل کر دیا"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "'{{description}}' حاصل کیا"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>نیا ٹاپک</span> {{description}}"
+      group_message_summary:
+        one: "آپ کے {{group_name}} اِن باکس میں {{count}} پیغام"
+        other: "آپ کے {{group_name}} اِن باکس میں {{count}} پیغامات"
       popup:
         mentioned: '{{username}} نے آپ کا تذکرہ "{{topic}}" میں کیا - {{site_title}}'
         group_mentioned: '{{username}} نے آپ کا تذکرہ "{{topic}}" میں کیا - {{site_title}}'
@@ -1076,10 +1304,12 @@ ur:
       uploading: "اَپ لوڈ کیا جا رہا ہے"
       select_file: "فائل منتخب کریں"
       image_link: "لنک جس سے آپ کی تصویر منسلک ہو گی"
+      default_image_alt_text: تصویر
     search:
       sort_by: "ترتیب بہ"
       relevance: "مطابقت"
       latest_post: "تازہ ترین پوسٹ"
+      latest_topic: "تازہ ترین ٹاپک"
       most_viewed: "سب سے زیادہ دیکھا گیا"
       most_liked: "سب سے زیادہ لائک کیا گیا"
       select_all: "تمام منتخب کریں"
@@ -1090,29 +1320,47 @@ ur:
       no_more_results: "کوئی اور نتائج نہیں پائے گئے۔"
       searching: "تلاش کیا جا رہا ہے ..."
       post_format: "{{username}} کی طرف سے #{{post_number}}"
+      results_page: "'{{term}}' کیلئے سرچ کے نتائج"
+      more_results: "مزید نتائج موجود ہیں۔ برائے مہربانی اپنے سرچ کے معیار کو محدود کریں۔"
+      cant_find: "آپ جو ڈھونڈ رہے تھے وہ نہیں مل سکا؟"
+      start_new_topic: "شاید ایک نیا ٹاپک شروع کریں؟"
+      or_search_google: "یا اس کے بجائے گُوگَل کے ساتھ تلاش کرنے کی کوشش کریں:"
+      search_google: "اس کے بجائے گُوگَل کے ساتھ تلاش کرنے کی کوشش کریں:"
+      search_google_button: "گُوگَل"
+      search_google_title: "اِس سائٹ میں تلاش کریں"
       context:
         user: "@{{username}} کے حساب سے پوسٹس تلاش کریں"
-        category: "#{{category}} category میں تلاش کریں"
+        category: "#{{category}} زُمرَہ میں تلاش کریں"
         topic: "اِس ٹاپک میں تلاش کریں"
         private_messages: "پیغامات میں تلاش کریں"
       advanced:
         title: اعلی درجے کی تلاشی
         posted_by:
           label: کی طرف سے پوسٹ کیا گیا
+        in_category:
+          label: زمرہ میں ڈالا گیا
         in_group:
           label: گروپ میں
         with_badge:
           label: بَیج کے ساتھ
+        with_tags:
+          label: ٹیگ ہواوا
         filters:
+          label: صرف وہ ٹاپک/پوسٹس دکھائیں جو...
           likes: جو میں نے لائیک کیے
           posted: جن میں میں نے پوسٹ کیا
           watching: جو میں دیکھ رہا ہوں
           tracking: جو میں ٹریک کر رہا ہوں
+          private: میرے پیغامات میں ہوں
+          bookmarks: میں نے بُک مارک کیے ہوے ہوں
           first: جو سب سے پہلی پوسٹ ہو
           pinned: جو پِن ہوا ہو
           unpinned: جو پِن نہ ہوا ہو
+          seen: جو میں نے پڑھ لیے ہوں
           unseen: جو میں نے نہ پڑھا ہو
           wiki: جو وِیکی ہو
+          images: تصاویر شامل کریں
+          all_tags: تمام درجِ بالا ٹیگز
         statuses:
           label: جہاں ٹاپک
           open: کھلے ہوں
@@ -1138,6 +1386,7 @@ ur:
         select_all: "تمام منتخب کریں"
         clear_all: "تمام کو صاف کریں"
         unlist_topics: "ٹاپکس کو فہرست سے ہٹائیں"
+        relist_topics: "ٹاپک دوبارہ فہرست کریں"
         reset_read: "\"پڑھ لیا گیا\" کو رِی سَیٹ کریں"
         delete: "ٹاپکس حذف کریں"
         dismiss: "بر خاست کریں"
@@ -1148,8 +1397,10 @@ ur:
         dismiss_new: "نیا برخاست کریں"
         toggle: "ٹاپکس کے بَلک انتخاب کو ٹَوگل کریں"
         actions: "بَلک عمل"
+        change_category: "زمرہ تبدیل کریں"
         close_topics: "ٹاپکس بند کریں"
         archive_topics: "ٹاپکس آر کائیو کریں"
+        notification_level: "اطلاعات"
         choose_new_category: "ٹاپکس کیلئے نئے زمرہ کا انتخاب کریں:"
         selected:
           one: "آپ نے <b>1</b> ٹاپک منتخب کیا ہے۔"
@@ -1200,6 +1451,9 @@ ur:
       move_to_inbox:
         title: 'اِنباکس میں منتقل کریں'
         help: 'پیغام واپس اِنباکس میں منتقل کریں'
+      edit_message:
+        help: 'پیغام کی پہلی اشاعت میں ترمیم کریں'
+        title: 'پیغام میں ترمیم کریں'
       list: 'ٹاپک'
       new: 'نیا ٹاپک'
       unread: 'بغیر پڑھے'
@@ -1238,19 +1492,69 @@ ur:
       toggle_information: "ٹاپک تفصیلات ٹَوگل کریں"
       read_more_in_category: "مزید پڑھنا چاہتے ہیں؟ {{catLink}} اور {{latestLink}} میں دوسرے ٹاپک دیکھیں۔"
       read_more: "مزید پڑھنا چاہتے ہیں؟ {{catLink}} یا {{latestLink}}۔"
+      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>1 غیر پڑھا</a> } other { <a href='/unread'># غیر پڑھے</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{اور } false {} other{}} <a href='/new'>1 نیا</a> ٹاپک} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># نئے</a> ٹاپکس} } باقی، یا {CATEGORY, select, true {میں دیگر ٹاپکس براؤز کریں {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: تمام زمرہ جات براؤز کریں
       view_latest_topics: تازہ ترین ٹاپک دیکھیے
       suggest_create_topic: کیوں نہ ایک ٹاپک بنائیں؟
       jump_reply_up: اِس سے پرانے جواب پر جائیں
       jump_reply_down: اِس سے نئے جواب پر جائیں
       deleted: "ٹاپک حذف کردیا گیا ہے"
+      topic_status_update:
+        title: "ٹاپک ٹائمر"
+        save: "ٹائمر مقرر کریں"
+        num_of_hours: "گھنٹوں کی تعداد:"
+        remove: "ٹائمر ہٹائیں"
+        publish_to: "شائع کریں:"
+        when: "کب:"
+        public_timer_types: ٹاپک ٹائمر
+        private_timer_types: صارف کے ٹاپک ٹائمر
+      auto_update_input:
+        none: "ایک ٹائم فریم منتخب کریں"
+        later_today: "آج بعد میں"
+        tomorrow: "کَل"
+        later_this_week: "اِس ہفتے بعد میں"
+        this_weekend: "اِس ہفتےکےآخر میں"
+        next_week: "اگلے ہفتے"
+        two_weeks: "دو ہفتے"
+        next_month: "اگلے ماہ"
+        three_months: "تین مہینے"
+        six_months: "چھ مہینے"
+        one_year: "ایک سال"
+        forever: "ہمیشہ کیلئے"
+        pick_date_and_time: "تاریخ اور وقت منتخب کریں"
+        set_based_on_last_post: "آخری پوسٹ کی بنیاد پر بند کریں"
+      publish_to_category:
+        title: "اشاعت شیڈول کریں"
+      temp_open:
+        title: "عارضی طور پر کھولیں"
+      auto_reopen:
+        title: "خود کار طریقے سے ٹاپک کھولیں"
+      temp_close:
+        title: "عارضی طور پر بند کریں"
+      auto_close:
+        title: "خود کار طریقے سے ٹاپک بند کریں"
+        label: "خود کار طریقے سے ٹاپک بند کرنے کے گھنٹے:"
+        error: "براہ کرم، ایک قابلِ قبول قدر درج کریں۔"
+        based_on_last_post: "بند نہ کریں جب تک ٹاپک کی آخری پوسٹ کم از کم اتنی پرانی نہ ہو۔"
+      auto_delete:
+        title: "خود کار طریقے سے ٹاپک حذف کریں"
+      reminder:
+        title: "مجھے یاد دہانی کرائیں"
+      status_update_notice:
+        auto_open: "یہ ٹاپک خود کار طریقے سے کھول دیا جائے گا %{timeLeft}۔"
+        auto_close: "یہ ٹاپک خود کار طریقے سے بند کر دیا جائے گا %{timeLeft}۔"
+        auto_publish_to_category: "یہ ٹاپک <a href=%{categoryUrl}>#%{categoryName}</a> میں شائع کر دیا جائے گا %{timeLeft}۔"
+        auto_close_based_on_last_post: "یہ ٹاپک آخری جواب کے %{duration} بعد بند ہو جائے گا۔"
+        auto_delete: "یہ ٹاپک خود کار طریقے سے حذف کر دیا جائے گا %{timeLeft}۔"
+        auto_reminder: "آپ کو اس ٹاپک کے بارے میں یاد دہانی کرائی جائے گا %{timeLeft}۔"
       auto_close_title: 'خود کار طریقے سے بند کر نے کی سیٹِنگ'
       auto_close_immediate:
         one: "ٹاپک کی آخری پوسٹ ابھی سے 1 گھنٹا پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
-        other: "ٹاپک کی آخری پوسٹ ابھی سے ٪{count} گھنٹے پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
+        other: "ٹاپک کی آخری پوسٹ ابھی سے %{count} گھنٹے پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
       timeline:
         back: "واپس"
         back_description: "آپنی آخری بغیر پڑھی پوسٹ پر واپس جائیں"
+        replies_short: "%{current}/ %{total} "
       progress:
         title: ٹاپک پیش رَفت
         go_top: "سب سے اوپر"
@@ -1258,9 +1562,9 @@ ur:
         go: "جائیں"
         jump_bottom: "آخری پوسٹ پر جائیں"
         jump_prompt: "پر جائیں..."
-        jump_prompt_of: "٪{count} پوسٹس کے"
+        jump_prompt_of: "%{count} پوسٹس کے"
         jump_prompt_long: "کس پوسٹ پر آپ جانا پسند کریں گے؟"
-        jump_bottom_with_number: "پوسٹ ٪{post_number} پر جائیں"
+        jump_bottom_with_number: "پوسٹ %{post_number} پر جائیں"
         total: کُل پوسٹس
         current: موجودہ پوسٹ
       notifications:
@@ -1273,6 +1577,10 @@ ur:
           '3_2': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ اِس ٹاپک کو دیکھ رہے ہیں۔'
           '3_1': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ نے یہ ٹاپک بنایا ہے۔'
           '3': 'آپ کو اطلاعات موصول ہوں گی کیونکہ آپ اِس ٹاپک کو دیکھ رہے ہیں۔'
+          '2_8': 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ اِس زمرہ کو ٹرَیک کر رہے ہیں۔'
+          '2_4': 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ نے اِس ٹاپک پر ایک جواب پوسٹ کیا۔'
+          '2_2': 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ اِس ٹاپک کو ٹرَیک کر رہے ہیں۔'
+          '2': 'آپ نئے جوابات کا شمار دیکھ سکیں گے کیونکہ آپ نے <a href="/u/{{username}}/preferences">یہ ٹاپک پڑھا ہے</a>۔'
           '1_2': 'اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔'
           '1': 'اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔'
           '0_7': 'آپ اِس زمرہ میں تمام اطلاعات کو نظر انداز کر رہے ہیں۔'
@@ -1308,6 +1616,7 @@ ur:
         open: "ٹاپک کھولیں"
         close: "ٹاپک بند کریں"
         multi_select: "پوسٹس منتخب کریں..."
+        timed_update: "ٹاپک ٹائمر مقرر کریں..."
         pin: "ٹاپک پِن کریں..."
         unpin: "ٹاپک سے پِن ہٹائیں..."
         unarchive: "ٹاپک آرکائیو سے ختم کریں"
@@ -1392,6 +1701,7 @@ ur:
         success_email: "ہم نے <b>{{emailOrUsername}}</b> کو ایک دعوت نامہ اِیمیل کیا ہے۔ جب دعوت  نامہ اِستعمال ہو گا تو ہم آپ کو مطلع کریں گے۔ اپنی دعوتوں کا ٹریک رکھنے کیلئے اپنے صارف صفحہ پر دعوت ناموں والی ٹیب چیک کریں۔"
         success_username: "ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کیا ہے۔"
         error: "معزرت، ہم اس شخص کو دعوت نہ دے سکے۔ شاید وہ پہلے ہی مدعو کیے جا چکے ہیں؟ (دعوتیں شرح محدود ہیں)"
+        success_existing_email: "آیک صارف <b>{{emailOrUsername}}</b> والے ای میل کے ساتھ پہلے ہی موجود ہے۔ ہم نے اِس ٹاپک میں حصہ لینے کے لئے اُس صارف کو مدعو کر دیا ہے۔"
       login_reply: 'جواب دینے کیلئے لاگ اِن کریں'
       filters:
         n_posts:
@@ -1428,22 +1738,36 @@ ur:
           other: "براہ مہربانی، <b>{{old_user}}</b> کی {{count}} پوسٹس کے نئے مالک کو منتخب کریں۔"
         instructions_warn: "یاد رکھیں کہ اِس پوسٹ کے بارے میں کوئی بھی اطلاعات مؤثر بہ ماضی طور پر نئے صارف کو منتقل نہیں کی جائیں گی۔ <br>انتباہ: فی الحال، کوئی پوسٹ انحصار ڈیٹا نئے صارف کو منتقل نہیں کیا جاتا ہے۔ احتیاط سے استعمال کریں۔"
       change_timestamp:
+        title: "ٹائمسٹیمپ تبدیل کریں..."
         action: "ٹائمسٹیمپ تبدیل کریں"
         invalid_timestamp: "ٹائمسٹیمپ مستقبل میں نہیں ہو سکتا۔"
         error: "ٹاپک کا ٹائمسٹیمپ تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions: "براہ مہربانی ٹاپک کیلیئے نیا ٹائمسٹیمپ منتخب کریں۔ وقت کا فرق برابر رکھنے کیلیے ٹاپک میں پوسٹس کو اَپ ڈیٹ کر دیا جائے گا۔"
       multi_select:
         select: 'منتخب'
-        selected: 'منتخب کیے گئے ({{count}})'
+        selected: 'منتخب کردہ ({{count}})'
+        select_post:
+          label: 'منتخب'
+          title: 'انتخاب کیے ہوے میں پوسٹ شامل کریں'
+        selected_post:
+          label: 'منتخب کیا ہوا'
+          title: 'منتخب کیے ہوے سے پوسٹ کو ہٹانے کیلئے کلک کریں'
+        select_replies:
+          label: 'منتخب +جوابات'
+          title: 'منتخب کیے ہوے میں پوسٹ اور اِس کے تمام جوابات شامل کریں'
+        select_below:
+          label: 'منتخب+ذیل میں'
+          title: 'منتخب کیے ہوے میں پوسٹ اور اِس کے بعد تمام شامل کریں'
         delete: منتخب کیے ہوں کو حذف کریں
         cancel: انتخاب کرنا منسوخ کریں
         select_all: تمام منتخب کریں
         deselect_all: تمام غیر منتخب کریں
         description:
-          one: آپ نے <b>1</b> پوسٹ منتخب کی ہے۔
-          other: آپ نے <b>{{count}}</b> پوسٹس منتخب کی ہیں۔
+          one: "آپ نے <b>1</b> پوسٹ منتخب کی ہے۔"
+          other: "آپ نے <b>{{count}}</b> پوسٹس منتخب کی ہیں۔"
     post:
       quote_reply: "اقتباس کریں"
+      edit: "<i class='fa fa-pencil'></i>{{link}} {{replyAvatar}} {{username}} "
       edit_reason: "وجہ:"
       post_number: "پوسٹ {{number}}"
       wiki_last_edited_on: "وِکی کو آخری بار ترمیم کیا گیا"
@@ -1455,9 +1779,11 @@ ur:
       show_full: "مکمل پوسٹ دکھائیں"
       show_hidden: 'چھپایا ہوا متن دکھایں۔'
       deleted_by_author:
-        one: "(مصنف نے پوسٹ واپس لے لی، ٪{count} گھنٹے میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
-        other: "(مصنف نے پوسٹ واپس لے لی، ٪{count} گھنٹوں میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
+        one: "(مصنف نے پوسٹ واپس لے لی، %{count} گھنٹے میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
+        other: "(مصنف نے پوسٹ واپس لے لی، %{count} گھنٹوں میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
+      collapse: "بند کریں"
       expand_collapse: "کھولیں/بند کریں"
+      locked: "ایک اسٹاف کے رکن نے اِس پوسٹ کو ترمیم ہونے سے روک دیا ہے"
       gap:
         one: "1 چھپایا ہوا جواب دیکھیں"
         other: "{{count}} چھپائے ہوے جوابات دیکھیں"
@@ -1504,12 +1830,22 @@ ur:
         has_liked: " آپ اِس پوسٹ کو لائیک کر چکے ہیں"
         undo_like: "لائیک کالعدم کریں"
         edit: " اِس پوسٹ کو ترمیم کریں"
+        edit_action: "ترمیم"
         edit_anonymous: "معذرت، اِس پوسٹ کو ترمیم کرنے کیلیے آپ کا لاگ اِن ہونا ضروری ہے۔"
         flag: "اس پوسٹ پر توجہ کے لئے اِسے نجی طور پر فلَیگ کریں یا اس کے بارے میں ایک نجی نوٹیفکیشن بھیجیں"
         delete: "اِس پوسٹ کو حذف کریں"
         undelete: " اِس پوسٹ کو واپس لائیں"
         share: "اس پوسٹ کا لنک شیئرکریں"
         more: "مزید "
+        delete_replies:
+          confirm: "کیا آپ اِس پوسٹ پر جوابات بھی حذف کرنا چاہتے ہیں؟"
+          direct_replies:
+            one: "جی ہاں، اور براہ راست 1 جواب"
+            other: "جی ہاں، اور براہ راست {{count}} جوابات"
+          all_replies:
+            one: "جی ہاں، اور 1 جواب"
+            other: "جی ہاں، اور تمام {{count}} جوابات"
+          just_the_post: "نہیں، صرف یہ پوسٹ"
         admin: "پوسٹ ایڈمن کے ایکشن"
         wiki: "وِیکی بنائیں"
         unwiki: "وِیکی ختم کریں"
@@ -1518,8 +1854,16 @@ ur:
         rebake: "HTML دوبارہ بِلڈ کریں"
         unhide: "چھپانا ختم کریں"
         change_owner: "پوسٹس کے مالک کو تبدیل کریں"
+        grant_badge: "بَیج دیں"
+        lock_post: "پوسٹ لاک کریں"
+        lock_post_description: "شائع کرنے والے کو اِس پوسٹ میں ترمیم کرنے سے روک دیں"
+        unlock_post: "پوسٹ کھول دیں"
+        unlock_post_description: "شائع کرنے والے کو اِس پوسٹ میں ترمیم کرنے کی اجازت دیں"
       actions:
         flag: 'فلَیگ'
+        defer_flags:
+          one: "فلَیگ نظر انداز کریں"
+          other: "فلَیگز نظر انداز کریں"
         undo:
           off_topic: "فلَیگ کالعدم کریں"
           spam: "فلَیگ کالعدم کریں"
@@ -1535,6 +1879,9 @@ ur:
           notify_user: "ایک پیغام بھیجا"
           bookmark: "اِس کو بُک مارک"
           like: "اِس کو لائیک کیا"
+          like_capped:
+            one: "اور {{count}} دوسرے شخص نے اِس کو لائیک کیا"
+            other: "اور {{count}} دوسرے لوگوں نے اِس کو لائیک کیا"
           vote: "اِس کے لیے ووٹ دیا"
         by_you:
           off_topic: "آپ نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
@@ -1595,6 +1942,14 @@ ur:
           vote:
             one: "1 شخص نے اِس پوسٹ کے لیے ووٹ کیا"
             other: "{{count}} لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
+      delete:
+        confirm:
+          one: "کیا آپ واقعی اُس پوسٹ کو حذف کرنا چاہتے ہیں؟"
+          other: "کیا آپ واقعی ان {{count}} پوسٹس کو حذف کرنا چاہتے ہیں؟"
+      merge:
+        confirm:
+          one: "کیا آپ واقعی ان پوسٹس کو ضم کرنا چاہتے ہیں؟"
+          other: "کیا آپ واقعی ان {{count}} پوسٹس کو ضم کرنا چاہتے ہیں؟"
       revisions:
         controls:
           first: "پہلی رَوِیژن"
@@ -1629,6 +1984,7 @@ ur:
             title: "ای میل کے متن کا html حصہ دکھائیں"
             button: 'HTML'
     category:
+      can: 'کر سکتا ہے&hellip; '
       none: '(کوئی زمرہ نہیں)'
       all: 'تمام زُمرَہ جات'
       choose: 'ایک زمرہ منتخب کریں&hellip;'
@@ -1639,6 +1995,8 @@ ur:
       settings: 'سیٹِنگ'
       topic_template: "ٹاپک ٹَیمپلیٹ"
       tags: "ٹیگز"
+      tags_allowed_tags: "اس زُمرہ میں صرف اِن ٹیگز کے استعمال کی اجازت دیں:"
+      tags_allowed_tag_groups: "اس زُمرہ میں صرف اِن گروپس سے ٹیگز کے استعمال کی اجازت دیں:"
       tags_placeholder: "(اختیاری) اجازت والے ٹیگز کی فہرست"
       tag_groups_placeholder: "(اختیاری) اجازت والے ٹیگ گروپس کی فہرست"
       topic_featured_link_allowed: "اس زمرہ میں نمایاں لنکس کو اجازت دیں"
@@ -1673,7 +2031,8 @@ ur:
       email_in_allow_strangers: "اکاؤنٹس نہ رکھنے والے گمنام صارفین کی طرف سے اِیمیلز کو قبول کریں"
       email_in_disabled: "ویب سائٹ کی سیٹِنگ میں اِیمیل کے ذریعے نئے ٹاپک پوسٹ کرنا غیر فعال کیا ہوا ہے۔ اِیمیل کے ذریعے نئے ٹاپک شائع کرنے کو چالو کرنے کے لئے،"
       email_in_disabled_click: 'سیٹِنگ میں "اِیمیل اِن" فعال کریں۔'
-      suppress_from_homepage: "ہَوم پیج سے اِس زمرہ کو دبائیں۔"
+      mailinglist_mirror: "زُمرہ میلنگ فہرست کا عکس ہے"
+      suppress_from_latest: "تازہ ترین ٹاپکس سے زُمرہ کو دبائیں۔"
       show_subcategory_list: "اس زمرہ میں ذیلی زمرہ جات کی فہرست ٹاپکس سے مندرجہ بالا دکھائیں۔"
       num_featured_topics: "زمرہ کے صفحے پر دکھائے گئے ٹاپکس کی تعداد:"
       subcategory_num_featured_topics: "بالائی زمرہ کے صفحے پر دکھائے گئے نمایاں ٹاپکس کی تعداد:"
@@ -1731,7 +2090,7 @@ ur:
       notify_action: 'پیغام'
       official_warning: 'آفیشل انتباہ'
       delete_spammer: "سپیم کرنے والے کو حذف کریں"
-      delete_confirm_MF: "آپ اِس صارف سے {POSTS، جمع، ایک {<b>1</b> پوسٹ} دیگر {<b>#</b> پوسٹس}} اور {TOPICS، جمع، ایک {<b>1</b> ٹاپک} دیگر {<b>#</b> ٹاپکس}}  حذف کرنے، اُن کا اکائونٹ ختم کرنے، ان کے آئی پی ایڈریس <b>{ip_address}</b> سے سائن اَپ بلاک کرنے، اور اُن کے اِیمیل ایڈریس کو <b>{اِیمیل}</b> مستقل بلاک کی فہرست میں ڈالنے لگے ہیں۔ کیا آپ کو یقین ہے کہ یہ صارف واقعی ایک سپیمر ہے؟"
+      delete_confirm_MF: "آپ اِس صارف سے {POSTS, plural, one {<b>1</b> پوسٹ} other {<b>#</b> پوسٹس}} اور {TOPICS, plural, one {<b>1</b> ٹاپک} other {<b>#</b> ٹاپکس}} حذف کرنے، اُن کا اکائونٹ ختم کرنے، ان کے آئی پی ایڈریس <b>{ip_address}</b> سے سائن اَپ بلاک کرنے، اور اُن کے اِیمیل ایڈریس کو <b>{email}</b> مستقل بلاک کی فہرست میں ڈالنے لگے ہیں۔ کیا آپ کو یقین ہے کہ یہ صارف واقعی ایک سپیمر ہے؟"
       yes_delete_spammer: "جی ہاں، سپیم کرنے والے کو حذف کریں"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(مخفی)"
@@ -1770,8 +2129,8 @@ ur:
     post_links:
       about: "اِس پوسٹ کے لئے مزید لنکس دکھائیں"
       title:
-        one: "1 اور"
-        other: "٪{count} اور"
+        one: "1 مزید"
+        other: "%{count}مزید "
     topic_statuses:
       warning:
         help: "یہ ایک آفیشل انتباہ ہے۔"
@@ -1797,11 +2156,11 @@ ur:
     posts: "پوسٹس"
     posts_long: "اِس ٹاپک میں {{number}} پوسٹس ہیں"
     posts_likes_MF: |
-      یہاِس ٹاپک کی کیا ہے {شمار، جمع، ایک {1 جواب} دیگر {# جوابات}} {تناسب، منتخب،
-      کم {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ}
-      درمیانہ {لائیک پر پوسٹ کے بہت اونچے تناسب کے ساتھ}
-      اعلی {لائیک پر پوسٹ کے انتہائی اونچے تناسب کے ساتھ}
-      دیگر {}}
+      اِس ٹاپک {count, plural, one {کا 1 جواب} other {کے # جوابات ہیں}} {ratio, select,
+      low {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ}
+      med {لائیک پر پوسٹ کے بہت اونچے تناسب کے ساتھ}
+      high {لائیک پر پوسٹ کے انتہائی اونچے تناسب کے ساتھ}
+      other {}}
     original_post: "اصل پوسٹ"
     views: "وِیوز"
     views_lowercase:
@@ -1829,8 +2188,8 @@ ur:
       not_available: "دستیاب نہیں ہے!"
     categories_list: "زمرہ جات فہرست"
     filters:
-      with_topics: "٪{فلٹر} ٹاپک"
-      with_category: "٪{فلٹر} ٪{category} ٹاپک"
+      with_topics: "%{filter} ٹاپک"
+      with_category: "%{filter} %{category} ٹاپک"
       latest:
         title: "تازہ ترین"
         title_with_count:
@@ -1853,7 +2212,7 @@ ur:
       unread:
         title: "بغیر پڑھے"
         title_with_count:
-          one: "بغیر پڑھے (1)"
+          one: "بغیر پڑھا (1)"
           other: "بغیر پڑھے ({{count}})"
         help: " ٹاپک جن پر فی الحال آپ نے نظر رکھی ہوئی ہے یا بغیر پڑھی پوسٹس کے ساتھ ٹریک کر رہے ہیں"
         lower_title_with_count:
@@ -1866,7 +2225,7 @@ ur:
         lower_title: "نئے"
         title: "نیا"
         title_with_count:
-          one: "نئے (1)"
+          one: "نیا (1)"
           other: "نئے ({{count}})"
         help: "پچھلے چند دنوں میں بنائے گئے ٹاپک"
       posted:
@@ -1937,10 +2296,14 @@ ur:
         hamburger_menu: '<b>=</b> ہیمبرگر مینو کھولیں'
         user_profile_menu: '<b>p</b> صارف مینو کھولیں'
         show_incoming_updated_topics: 'اَپ ڈیٹ ہوے ٹاپک دکھائیں'
+        search: '<b>/</b>یا <b>ctrl</b>+<b>alt</b>+<b>f</b>سرچ  '
         help: '<b>?</b> کیبورڈ مدد کھولیں'
         dismiss_new_posts: '<b>x</b>، <b>r</b> برخاست کریں نئے/پوسٹس'
         dismiss_topics: '<b>x</b>، <b>t</b> ٹاپک برخاست کریں'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> لاگ آوٹ'
+      composing:
+        title: 'کمپوز کرنا'
+        return: '<b>shift</b>+<b>c</b> کمپوزر پر واپس جائیں'
       actions:
         title: 'عمل'
         bookmark_topic: '<b>f</b> بُک مارک ٹاپک ٹوگل کریں'
@@ -1964,21 +2327,24 @@ ur:
     badges:
       earned_n_times:
         one: "یہ بَیج 1 دفعہ حاصل کیا"
-        other: "یہ بَیج ٪{count} دفعہ حاصل کیا"
-      granted_on: "عطا کیا گیا ٪{date}"
-      others_count: "دوسرے جن کے پاس یہ بَیج ہے (٪{count})"
+        other: "یہ بَیج %{count} مرتبہ حاصل کیا"
+      granted_on: "عطا کیا گیا %{date}"
+      others_count: "دوسرے جن کے پاس یہ بَیج ہے (%{count})"
       title: بَیج
+      allow_title: "آپ اِس بَیج کو عنوان کے طور پر استعمال کر سکتے ہیں"
+      multiple_grant: "آپ اِس کو ایک سے زیادہ مرتبہ حاصل کر سکتے ہیں"
       badge_count:
         one: "1 بَیج"
         other: "%{count} بَیج"
       more_badges:
-        one: "+1 اور"
-        other: "+٪{count} اور"
+        one: "+1 مزید"
+        other: "+%{count} مزید"
       granted:
         one: "1 عطا کیا گیا"
         other: "%{count} عطا کیے گئے"
       select_badge_for_title: اپنے عنوان کے طور پر استعمال کرنے کے لئے ایک بیج منتخب کریں
-      none: "(none)"
+      none: "(کوئی نہیں)"
+      successfully_granted: "%{username}کو کامیابی سے %{badge} عطا کیا"
       badge_grouping:
         getting_started:
           name: شروعات
@@ -2001,11 +2367,17 @@ ur:
       </p>
     tagging:
       all_tags: "تمام ٹیگز"
+      other_tags: "دیگر ٹیگز"
       selector_all_tags: "تمام ٹیگز"
       selector_no_tags: "کوئی ٹیگ نہیں"
       changed: "تبدیل کیے گئے ٹیگ:"
       tags: "ٹیگز"
+      choose_for_topic: "اختیاری ٹیگز"
       delete_tag: "ٹیگ حذف کریں"
+      delete_confirm:
+        one: "کیا آپ واقعی اس ٹیگ کو حذف اور 1 ٹاپک، جس کو یہ آسائین ہواوا ہے، سے ہٹا دینا چاہتے ہیں؟"
+        other: "کیا آپ واقعی اس ٹیگ کو حذف اور {{count}} ٹاپکس، جن کو یہ آسائین ہواوا ہے، سے ہٹا دینا چاہتے ہیں؟"
+      delete_confirm_no_topics: "کیا آپ واقعی اِس ٹَیگ کو حذف کرنا چاہتے ہیں؟"
       rename_tag: "ٹیگ کا نام تبدیل کریں"
       rename_instructions: "ٹیگ کے لیے نئے نام کا انتخاب کریں:"
       sort_by: "ترتیب بہ:"
@@ -2014,26 +2386,26 @@ ur:
       manage_groups: "ٹیگ گروپس کا انتظام کریں"
       manage_groups_description: "ٹیگز منظم کرنے کے گروپوں کی وضاحت کریں"
       filters:
-        without_category: "٪{فلٹر} ٪{ٹیگ} ٹاپکس"
-        with_category: "٪{فلٹر} ٪{ٹیگ} ٹاپکس ٪{category} میں"
-        untagged_without_category: "٪{فلٹر} غیر ٹیگ شدہ ٹاپک"
-        untagged_with_category: "٪{فلٹر} غیر ٹیگ شدہ ٹاپک ٪{category} میں"
+        without_category: "%{filter} %{tag} ٹاپکس"
+        with_category: "%{filter} %{tag} ٹاپکس %{category} میں"
+        untagged_without_category: "%{filter} غیر ٹیگ شدہ ٹاپک"
+        untagged_with_category: "%{filter} غیر ٹیگ شدہ ٹاپک %{category} میں"
       notifications:
         watching:
           title: "نظر رکھی ہوئی ہے"
-          description: "آپ خود کار طریقے سے اِس ٹیگ میں موجود تمام ٹاپکس پر نظر رکھیں گے۔ تمام نئی پوسٹ اور ٹاپکس کے بارے میں مطلع کیا جائے گا، اور نئی پوسٹس کی گنتی بھی ٹاپک کے ساتھ دکھائی جائے گی۔"
+          description: "آپ خود کار طریقے سے اِس ٹیگ والے تمام ٹاپکس پر نظر رکھیں گے۔ تمام نئی پوسٹ اور ٹاپکس کے بارے میں مطلع کیا جائے گا، اور نئی پوسٹس کی گنتی بھی ٹاپک کے ساتھ دکھائی جائے گی۔"
         watching_first_post:
           title: "پہلی پوسٹ پر نظر رکھی ہوئی ہے"
-          description: "آپ کو اِس ٹیگ میں ہر نئے ٹاپک کی صرف پہلی پوسٹ کے بارے میں مطلع کیا جائے گا۔"
+          description: "آپ کو اِس ٹیگ والے ہر نئے ٹاپک کی صرف پہلی پوسٹ کے بارے میں مطلع کیا جائے گا۔"
         tracking:
           title: "ٹریک کیا جا رہا"
-          description: "آپ خود کار طریقے سے اِس ٹیگ میں موجود تمام ٹاپکس کو ٹریک کریں گے۔ بغیر پڑھی اور نئی پوسٹس کی گنتی ٹاپک کے ساتھ دکھائی جائے گی۔"
+          description: "آپ خود کار طریقے سے اِس ٹیگ کے ساتھ موجود تمام ٹاپکس کو ٹریک کریں گے۔ بغیر پڑھی اور نئی پوسٹس کی گنتی ٹاپک کے ساتھ دکھائی جائے گی۔"
         regular:
           title: "معمولی"
           description: "اگر کوئی آپ کا @نام زکر کرتا ہے یا آپ کی پوسٹ پر جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا۔"
         muted:
           title: "خاموش کِیا ہوا"
-          description: "آپ کو اِس ٹیگ میں موجود نئے ٹاپکس کی کسی بھی چیز کے بارے میں مطلع نہیں کیا جائے گا، اور یہ تازہ ترین میں بھی نظر نہیں آئیں گے۔"
+          description: "آپ کو اِس ٹیگ کے ساتھ موجود نئے ٹاپکس کی کسی بھی چیز کے بارے میں مطلع نہیں کیا جائے گا، اور یہ تازہ ترین میں بھی نظر نہیں آئیں گے۔"
       groups:
         title: "ٹیگ گروپس"
         about: "زیادہ آسانی سے ٹیگز کو منظم کرنے کے لیے اُن کو گروپوں میں شامل کریں۔"
@@ -2047,6 +2419,7 @@ ur:
         save: "محفوظ کریں"
         delete: "حذف کریں"
         confirm_delete: "کیا آپ واقعی اِس ٹیگ گروپ کو حذف کرنا چاہتے ہیں؟"
+        visible_only_to_staff: "ٹیگز صرف سٹاف کو نظر آتے ہیں"
       topics:
         none:
           unread: "آپ کے پاس کوئی بغیر پڑھے ٹاپک موجود نہیں۔"
@@ -2100,11 +2473,12 @@ ur:
         no_problems: "کوئی مسائل نہیں پائے گئے۔"
         moderators: 'ماڈریٹرز:'
         admins: 'ایڈمن:'
+        silenced: 'خاموش کیو ہوئے: '
         suspended: 'معطل کردہ:'
         private_messages_short: "پغم"
         private_messages_title: "پیغامات"
         mobile_title: "موبائل"
-        space_free: "{{size}} فرِی"
+        space_free: "{{size}} فارغ"
         uploads: "اَپ لوڈز"
         backups: "بیک اَپس"
         traffic_short: "ٹریفک"
@@ -2132,12 +2506,29 @@ ur:
         by: "تک"
       flags:
         title: "فلَیگز"
+        active_posts: "فلَیگ کی گئی پوسٹس"
+        old_posts: "پرانی فلَیگ کی گئی پوسٹس"
+        topics: "فلَیگ کیے گئے ٹاپک"
+        moderation_history: "ماڈرَیشن ہِسٹری"
         agree: "اتفاق کریں"
         agree_title: "اِس فلَیگ کے درست اور صحیح ہونے کی تصدیق کریں"
-        defer_flag_title: "اس فلَیگ کو ہٹا دیں؛ اِسے اِس وقت کسی کارروائی کی ضرورت نہیں۔"
+        agree_flag_hide_post: "پوسٹ چھپائیں"
+        agree_flag_hide_post_title: "اِس پوسٹ کو چھپائیں اور خود کار طریقے سے صارف کو اِس میں ترمیم کرنے کیلئے زور ڈالنے کیلئے پیغام بھیجیں۔"
+        agree_flag_restore_post: "اتفاق کریں اور پوسٹ بحال کریں"
+        agree_flag_restore_post_title: "پوسٹ کو بحال کریں تاکہ تمام صارفین اِسے دیکھ سکیں۔"
+        agree_flag_suspend: "صارف معطل کریں"
+        agree_flag_suspend_title: "فلَیگ کے ساتھ اتفاق کریں اور صارف معطل کریں۔"
+        agree_flag_silence: "صارف خاموش کریں"
+        agree_flag_silence_title: "فلَیگ کے ساتھ اتفاق کریں اور صارف خاموش کریں۔"
+        agree_flag: "پوسٹ برقرار رکھیں"
+        agree_flag_title: "فلَیگ کے ساتھ اتفاق کریں اور پوسٹ کو ویسا ہی رہنے دیں۔"
+        ignore_flag: "نظر انداز کریں"
+        ignore_flag_title: "اس فلَیگ کو ہٹا دیں؛ اِسے اِس وقت کسی کارروائی کی ضرورت نہیں۔"
         delete: "حذف کریں"
         delete_title: "یہ فلَیگ جس پوسٹ سے متعلق ہے اُسے حذف کریں۔"
+        delete_post_defer_flag: "پوسٹ حذف اور فلَیگ نظر انداز کریں"
         delete_post_defer_flag_title: "پوسٹ حذف کریں؛ اگر پہلی پوسٹ، تو ٹاپک بھی ساتھ حذف کریں"
+        delete_post_agree_flag: "پوسٹ حذف اور فلَیگ کے ساتھ اتفاق کریں"
         delete_post_agree_flag_title: "پوسٹ حذف کریں؛ اگر پہلی پوسٹ، تو ٹاپک بھی ساتھ حذف کریں"
         delete_flag_modal_title: "حذف کریں اور..."
         delete_spammer: "سپیم کرنے والے کو حذف کریں"
@@ -2149,49 +2540,58 @@ ur:
         clear_topic_flags: "ہو گیا"
         clear_topic_flags_title: "اِس ٹاپک کی تفتیش ہو چکی ہے اور مسائل حل کر دیے گئے ہیں۔  فلَیگز کو ہٹانے کیلئے \"ہو گیا\" پر کلک کریں۔"
         more: "(مزید جوابات...)"
+        suspend_user: "صارف معطل کریں"
+        suspend_user_title: "اِس پوسٹ کی وجہ سے صارف معطل کریں"
+        replies:
+          one: "[1 جواب]"
+          other: "[%{count} جوابات]"
         dispositions:
           agreed: "اتفاق کیا"
           disagreed: "اختلاف کیا"
+          deferred: "نظر انداز کیا ہوا"
         flagged_by: "کی طرف سے فلَیگ کیا گیا"
         resolved_by: "کی طرف سے حل کیا گیا"
         took_action: "کارروائی کی"
         system: "سِسٹَم"
         error: "کچھ غلط ہو گیا"
         reply_message: "جواب"
+        no_results: "کوئی فلَیگ کی گئی پوسٹس موجود نہیں۔"
         topic_flagged: "اِس <strong>ٹاپک</strong> کو فلَیگ کر دیا گیا ہے۔"
+        show_full: "مکمل پوسٹ دکھائیں"
         visit_topic: "کارروائی کرنے کیلئے ٹاپک کو وزٹ کریں"
         was_edited: "پہلے فلَیگ کے بعد پوسٹ میں ترمیم ہوئی تھی"
         previous_flags_count: "اس پوسٹ کو پہلے ہی سے {{count}} دفعہ فلَیگ کیا جا چکا ہے۔"
+        show_details: "فلَیگ کی تفصیلات دکھائیں"
+        details: "تفصیلات"
+        flagged_topics:
+          topic: "ٹاپک"
+          type: "قِسم"
+          users: "صارفین"
+          last_flagged: "آخری دفعہ فلَیگ کیا گیا"
+        short_names:
+          off_topic: "موضوع سے ہٹ کر"
+          inappropriate: "نامناسب"
+          spam: "سپَیم"
+          notify_user: "اپنی مرضی کا"
+          notify_moderators: "اپنی مرضی کا"
       groups:
         primary: "پرائمری گروپ"
         no_primary: "(کوئی پرائمری گروپ نہیں)"
         title: "گروپس"
         edit: "گروپس میں ترمیم کریں"
         refresh: "رِیفریش"
-        new: "نیا"
-        selector_placeholder: "صارف نام درج کریں"
         about: "یہاں اپنے گروپ کی رکنیت کو اور ناموں میں ترمیم کریں"
         group_members: "گروپ کے اراکین"
         delete: "حذف کریں"
         delete_confirm: "اِس گروپ کو حذف کریں؟"
         delete_failed: "گروپ کو حذف کرنے میں ناکام۔ اگر یہ ایک خودکار گروپ ہے تو اسے ختم نہیں کیا جا سکتا۔"
-        delete_owner_confirm: "'٪{username}' کے لیے مالک کے استحقاق کو ہٹائیں؟"
+        delete_owner_confirm: "'%{username}' کے لیے مالک کے استحقاق کو ہٹائیں؟"
         add: "شامل کریں"
-        add_members: "اراکین شامل کریں"
         custom: "اپنی مرضی کا"
-        bulk_complete: "صارفین کو گروپ میں شامل کر لیا گیا ہے۔"
-        bulk: "گروپ میں کئی شامل کریں"
-        bulk_paste: "صارف ناموں اور یا اِیمیلز کی فہرست پَیسٹ کریں،  فی سطر ایک:"
-        bulk_select: "(ایک گروپ منتخب کریں)"
         automatic: "خود کار طریقے سے"
-        automatic_membership_email_domains: "جو صارفین ایک ایسے اِیمیل ڈومین کے ساتھ رجسٹر کرتے ہیں جو اِس فہرست میں سے کسی ایک سے پورا ملتا ہے، تو اُن کو خود کار طریقے سے اِس گروپ میں شامل کر دیا جائے گا:"
-        automatic_membership_retroactive: "موجودہ رجسٹرڈ صارفین کو شامل کرنے کے لئے وہی اِیمیل ڈومین اصول لاگو کریں"
         default_title: "اِس گروپ میں تمام صارفین کے لئے پہلے سے طے شدہ عنوان"
-        primary_group: "خود کار طریقے سے پرائمری گروپ کے طور پر مقرر کریں"
         group_owners: مالکان
         add_owners: مالکان شامل کریں
-        incoming_email: "اپنی مرضی کا اِنکَمِنگ اِیمیل ایڈریس"
-        incoming_email_placeholder: "اِیمیل ایڈریس درج کریں"
         none_selected: "شروع کرنے کے لئے ایک گروپ منتخب کریں"
         no_custom_groups: "ایک نیا \"اپنی مرضی کا\" گروپ بنائیں"
       api:
@@ -2229,6 +2629,7 @@ ur:
         event_type_missing: "آپ کو کم از کم ایک واقعہ کی قسم قائم کرنا ضروری ہے۔"
         content_type: "کونٹنٹ کی قسم"
         secret: "سیکرٹ"
+        event_chooser: "کونسے واقعات اِس وَیب ھُوک٘ کو متحرک کریں؟"
         wildcard_event: "مجھے سب کچھ بھیجیں۔"
         individual_event: "انفرادی واقعات کو منتخب کریں۔"
         verify_certificate: "پَیلوڈ یو.آر.ایل. کا TLS سرٹیفکیٹ چیک کریں"
@@ -2247,6 +2648,16 @@ ur:
           details: "جب ایک نیا جواب، ترمیم، حذف یا رِِیکور کیا جائے۔"
         user_event:
           name: "صارف واقعہ"
+          details: "جب ایک صارف لاگ اِن، لاگ آؤٹ، بنایا، منظور یا اَپ ڈیٹ کیا جاتا ہے۔"
+        group_event:
+          name: "گروپ واقعہ"
+          details: "جب ایک گروپ بنایا، اَپ ڈیٹ یا ختم کیا جاتا ہے۔"
+        category_event:
+          name: "زُمرَہ واقعہ"
+          details: "جب ایک زُمرَہ بنایا، اَپ ڈیٹ یا ختم کیا جاتا ہے۔"
+        tag_event:
+          name: "ٹَیگ واقعہ"
+          details: "جب ایک ٹَیگ بنایا، اَپ ڈیٹ یا ختم کیا جاتا ہے۔"
         delivery_status:
           title: "موصول ہونے کی آگاہی"
           inactive: "غیر فعال"
@@ -2311,7 +2722,7 @@ ur:
           label: "اَپ لوڈ"
           title: "اِس صورتحال کیلئے ایک بیک اَپ اَپ لوڈ کریں"
           uploading: "اَپ لوڈ کیا جا رہا ہے..."
-          success: "'{{filename}}' کو کامیابی سے اَپ لوڈ کر دیا گیا ہے۔"
+          success: "'{{filename}}' کامیابی سے اَپ لوڈ کردی گئی ہے۔ فائل پر اب کام جا ری ہے اور فہرست میں ظاہر ہونے کیلئے ایک منٹ تک لگ سکتا ہے۔"
           error: "اَپ لوڈ کرتے وقت ایک خرابی کا سامنا کرنا پڑا '{{filename}}': {{message}}"
         operations:
           is_running: "ایک کارروائی اِس وقت چل رہی ہے..."
@@ -2360,15 +2771,21 @@ ur:
         title: "مرضی کے مطابق بنائیں"
         long_title: "ویب سائٹ کو اپنی مرضی کے حساب سے بنانے کیلئے اختیارات"
         preview: "پیشگی دیکھیں"
+        explain_preview: "اِس تِھیم کے ساتھ سائٹ ملاحظہ کریں"
         save: "محفوظ کریں"
         new: "نیا"
         new_style: "نیا سٹائل"
         import: "اِمپورٹ"
         delete: "حذف کریں"
+        delete_confirm: "اس تِھیم کو حذف کریں؟"
         about: "سائٹ پر CSS سٹائل شیٹس اور HTML ہیڈرز میں ترمیم کریں۔ شروع کرنے کیلئے ایک اِصلاح شامل کریں۔"
         color: "رنگ"
         opacity: "دھندلاپن"
         copy: "کاپی"
+        copy_to_clipboard: "کلِپ بورڈ میں کاپی کریں"
+        copied_to_clipboard: "کلِپ بورڈ میں کاپی کر لیا گیا"
+        copy_to_clipboard_error: "کلِپ بورڈ میں ڈیٹا کاپی کرنے پر خرابی کا سامنا کر نا پرا"
+        theme_owner: "ناقابلِ ترمیم، ملکیت:"
         email_templates:
           title: "اِیمیل ٹَیمپلیٹ"
           subject: "موضوع"
@@ -2377,9 +2794,85 @@ ur:
           none_selected: "ترمیم شروع کرنے کیلئے ایک  اِیمیل ٹَیمپلیٹ منتخب کریں۔"
           revert: "تبدیلیاں لوٹائیں"
           revert_confirm: "کیا آپ واقعی تبدیلیاں لوٹانا چاہتے ہیں؟"
+        theme:
+          import_theme: "تِھیم درآمد کریں"
+          customize_desc: "مرضی کے مطابق بنائیں:"
+          title: "تِھیمز"
+          long_title: "اپنی سائٹ کے رنگ، سی ایس ایس اور ایچ ٹی ایم ایل میں ترمیم کریں"
+          edit: "ترمیم"
+          edit_confirm: "یہ ایک ریمَوٹ تِھیم ہے، اگر آپ سی ایس ایس / ایچ ٹی ایم ایل میں ترمیم کرتے ہیں تو اگلی دفعہ تِھیم اَپ ڈیٹ ہونے پر یہ تبدیلیاں مٹا دی جائیں گی۔"
+          common: "عام"
+          desktop: "ڈیسک ٹاپ"
+          mobile: "موبائل"
+          settings: "ترتیبات"
+          preview: "پیشگی دیکھیں"
+          is_default: "تِھیم ڈیفالٹ کے طور پر فعال ہے"
+          user_selectable: "صارفین تِھیم کو منتخب کرسکتے ہیں"
+          color_scheme: "رنگ سکیم"
+          color_scheme_select: "تِھیم میں استعمال ہونے والے رنگ منتخب کریں"
+          custom_sections: "اپنی مرضی کے حصے:"
+          theme_components: "تِھیم کے اجزاء"
+          uploads: "اَپ لوڈز"
+          no_uploads: "آپ اپنی تِھیم کے ساتھ منسلک اثاثے، جیسے کہ فونٹ اور تصاویر، اَپ لوڈ کر سکتے ہیں"
+          add_upload: "اَپ لوڈ شامل کریں"
+          upload_file_tip: "اَپ لوڈ کرنے کے لئے اثاثہ منتخب کریں (png، woff2، وغیرہ...)"
+          variable_name: "SCSS وار نام:"
+          variable_name_invalid: "غلط وَیری اَیبل نام۔ صرف حرف و نمبر کی اجازت ہے۔ ایک حرف کے ساتھ شروع ہونا لاذمی ہے۔ منفرد ہونا لاذمی ہے۔"
+          upload: "اَپ لوڈ"
+          child_themes_check: "تِھیم میں دوسری ماتحت تِھیمز شامل ہیں"
+          css_html: "اپنی مرضی کے مطابق CSS/HTML"
+          edit_css_html: "CSS/HTML ترمیم کریں"
+          edit_css_html_help: "آپ نے کوئی بھی CSS یا HTML ترمیم نہیں کیا ہے"
+          delete_upload_confirm: "اِس اَپ لوڈ کو حذف کریں؟ (تِھیم CSS کام کرنا بند کر سکتی ہے!)"
+          import_web_tip: "رِیپَوزِٹَری میں موجود تِھیم"
+          import_file_tip: ".dcstyle.json فائل میں موجود تِھیم"
+          is_private: "تھِیم ایک ذاتی گِٹ رِیپَوزِٹَری میں ہے"
+          public_key: "رِیپَوزِٹَری کو درج ذیل پبلک کلید ایکسَیس فراہم کریں:"
+          about_theme: "تِھیم کے بارے میں"
+          license: "لائسنس"
+          component_of: "تِھیم ایک جزو ہے:"
+          update_to_latest: "تازہ ترین ورژن تک اِپ ڈَیٹ کریں"
+          check_for_updates: "اپ ڈیٹ کے لیے چیک کریں"
+          updating: "اَپ ڈَیٹ کیا جا رہا ہے..."
+          up_to_date: "تِھیم اَپ ڈَیٹ ہے، آخری دفعہ چَیک کیا:"
+          add: "شامل کریں"
+          theme_settings: "تھیم کی ترتیبات"
+          no_settings: "اِس تھیم کی کوئی ترتیبات نہیں ہیں۔"
+          commits_behind:
+            one: "تِھیم 1 کَمِٹ پیچھے ہے!"
+            other: "تِھیم {{count}} کَمِٹس پیچھے ہے!"
+          scss:
+            text: "CSS"
+            title: "اپنی مرضی کے مطابق CSS درج کریں، ہم تمام درست CSS اور SCSS سٹائلز قبول کرتے ہیں"
+          header:
+            text: "ہَیڈر"
+            title: "سائٹ ہَیڈر کے اوپر ظاہر کرنے کے لئے HTML درج کریں"
+          after_header:
+            text: "ہَیڈر کے بعد"
+            title: "تمام صفحات پر ہَیڈر کے بعد ظاہر کرنے کے لئے HTML درج کریں"
+          footer:
+            text: "فوٹر"
+            title: "صفحہ کے فوٹر پر ظاہر کرنے کے لئے HTML درج کریں"
+          embedded_scss:
+            text: "اَیمبَیڈ کیا ہوا CSS"
+            title: "تبصرے کے اَیمبَیڈ شدہ ورژن کے ساتھ فراہم کیے جانے والا اپنی مرضی کا CSS درج کریں"
+          head_tag:
+            text: "</head>"
+            title: "HTML جو </head> ٹیگ سے پہلے داخل کی جائے گی"
+          body_tag:
+            text: "</body>"
+            title: "HTML جو </body> ٹیگ سے پہلے داخل کی جائے گی"
+          yaml:
+            text: "YAML"
+            title: "تھیم ترتیبات کی وضاحت YAML فارمَیٹ میں کریں"
         colors:
+          select_base:
+            title: "بَیس رنگ سکیم منتخب کریں"
+            description: "بَیس سکیم:"
           title: "رنگ"
+          edit: "رنگ سکیمیں ترمیم کریں"
           long_title: "رنگ سکیمیں"
+          about: "اپنی تِھیمز کے استعمال کردہ رنگوں میں ترمیم کریں۔ شروع کرنے کے لئے ایک نئی سکیم بنائیں۔"
           new_name: "نئی رنگ سکیم"
           copy_name_prefix: "نقل از"
           delete_confirm: "اِس رنگ سکیم کو حذف کریں؟"
@@ -2423,7 +2916,7 @@ ur:
         templates: "ٹَیمپلیٹ"
         preview_digest: "ڈائجسٹ کا مشاہدہ کریں"
         sending_test: "ٹیسٹ اِیمیل بھیجی جا رہی ہے..."
-        error: "</b>تکنیکی خرابی<b> - ٪{server_error}"
+        error: "<b>خرابی</b> - %{server_error}"
         test_error: "ٹیسٹ اِیمیل بھیجنے میں ایک مسئلہ پیش آیا۔ اپنی میل سیٹِنگ دوبارہ چیک کریں، تصدیق کر لیں کہ آپ کا ہَوسٹ میل کنکشنوں کو بلاک تو نہیں کر رہا، اور دوبارہ کوشش کریں۔"
         sent: "بھیج دی گئی"
         skipped: "چھوڑا گیا"
@@ -2480,6 +2973,15 @@ ur:
             type_placeholder: "ڈائجسٹ، سائن اَپ..."
             reply_key_placeholder: "جواب کِی"
             skipped_reason_placeholder: "وجہ"
+      moderation_history:
+        performed_by: "کی طرف سے عمل کیا کیا"
+        no_results: "کوئی ماڈرَیشَن ہسٹری موجود نہیں ہے۔"
+        actions:
+          delete_user: "صارف حذف کر دیا گیا"
+          suspend_user: "صارف معطل کر دیا گیا"
+          silence_user: "صارف خاموش کر دیا گیا"
+          delete_post: "پوسٹ حذف کر دی گئی"
+          delete_topic: "ٹاپک حذف کر دیا گیا"
       logs:
         title: "لاگز"
         action: "عمل"
@@ -2497,6 +2999,8 @@ ur:
           block: "بلاک کریں"
           do_nothing: "کچھ نہ کریں"
         staff_actions:
+          all: "تمام"
+          filter: "فِلٹر:"
           title: "سٹاف عوامل"
           clear_filters: "سب کچھ دکھائیں"
           staff_user: "سٹاف یوزر"
@@ -2517,6 +3021,8 @@ ur:
             change_trust_level: "ٹرسٹ لَیول تبدیل کریں"
             change_username: "صارف نام تبدیل کریں"
             change_site_setting: "ویب سائٹ کی سیٹِنگ تبدیل کریں"
+            change_theme: "تِھیم تبدیل کریں"
+            delete_theme: "تِھیم حذف کریں"
             change_site_text: "سائٹ ٹَیکسٹ تبدیل کریں"
             suspend_user: "صارف معطل کریں"
             unsuspend_user: "صارف کی معطلی ختم کریں"
@@ -2524,6 +3030,7 @@ ur:
             revoke_badge: "بَیج منسوخ کریں"
             check_email: "اِیمیل چیک کریں"
             delete_topic: "ٹاپک حذف کریں"
+            recover_topic: "ٹاپک غیر حذف کریں"
             delete_post: "پوسٹ حذف کریں"
             impersonate: "نقالی"
             anonymize_user: "صارف گمنام بنائیں"
@@ -2531,6 +3038,8 @@ ur:
             change_category_settings: "زمرہ جات کی سیٹِنگ تبدیل کریں"
             delete_category: "زمرہ حذف کریں"
             create_category: "زمرہ بنائیں"
+            silence_user: "صارف خاموش کریں"
+            unsilence_user: "صارف کی خاموشی ختم کریں"
             grant_admin: "اَیڈمِن عطا کریں"
             revoke_admin: "اَیڈمِن منسوخ کریں"
             grant_moderation: "ماڈرَیشَن عطا کریں"
@@ -2546,6 +3055,14 @@ ur:
             change_readonly_mode: "صرف پڑھنے کا مَوڈ تبدیل کریں"
             backup_download: "بیک اَپ ڈاؤن لوڈ کریں"
             backup_destroy: "بیک اَپ تباہ کریں"
+            reviewed_post: "پوسٹ کا جائزہ لیا"
+            custom_staff: "پلَگ اِن کیلئے اپنی مرضی کا عمل"
+            post_locked: "پوسٹ لاک کر دی گئی"
+            post_edit: "پوسٹ ترمیم"
+            post_unlocked: "پوسٹ کھول دی گئی"
+            check_personal_message: "ذاتی پیغام چیک کریں"
+            disabled_second_factor: "دو فیکٹر توثیق غیر فعال کریں"
+            topic_published: "ٹاپک شائع کر دیا گیا"
         screened_emails:
           title: "سکرین کی گئی اِیمیلز"
           description: "جب کوئی نیا اکاؤنٹ بنانے کی کوشش کرے گا، تو مندرجہ ذیل اِیمیل ایڈریسوں کو چیک کیا جائے گا اور رجسٹریشن بلاک، یا کوئی اور کارروائی کی جائے گی۔"
@@ -2560,9 +3077,9 @@ ur:
         screened_ips:
           title: "سکرین کیے گئے IP"
           description: 'IP ایڈریس جن پر نظر رکھی ہوئی ہے۔ IP ایڈریسوں کو وائٹ لِسٹ کرنے کیلئے "اجازت دیں" کو استعمال کریں۔'
-          delete_confirm: "کیا آپ واقعی ٪{IP_ADDRESS} کیلئے اصول کو ہٹانا چاہتے ہیں؟"
+          delete_confirm: "کیا آپ واقعی %{ip_address} کیلئے اصول کو ہٹانا چاہتے ہیں؟"
           roll_up_confirm: "کیا آپ واقعی عام سکرین کیے گئے IP ایڈریسوں کو subnets میں رول اَپ کرنا چاہتے ہیں؟"
-          rolled_up_some_subnets: "کامیابی کے ساتھ IP بین اندراجات کو اِن subnets میں رول اَپ کر دیا گیا: ٪{subnets}۔"
+          rolled_up_some_subnets: "کامیابی کے ساتھ IP بین اندراجات کو اِن subnets میں رول اَپ کر دیا گیا: %{subnets}۔"
           rolled_up_no_subnet: "رول اَپ کرنے کیلئے کچھ بھی نہیں تھا۔"
           actions:
             block: "بلاک کریں"
@@ -2576,8 +3093,47 @@ ur:
           roll_up:
             text: "رول اَپ"
             title: "نئے subnet بین اندراجات بناتا ہے اگر کم از کم 'min_ban_entries_for_roll_up' اندراجات موجود ہوں۔"
+        search_logs:
+          title: "لاگز سرچ کریں"
+          term: "اصطلاح"
+          searches: "سرچز"
+          click_through: "کلِک تھرُو"
+          unique: "منفرد"
+          unique_title: "سرچ کرنے والے منفرد صارفین"
+          types:
+            all_search_types: "تمام سرچ ٹاپکس"
+            header: "ہَیڈر"
+            full_page: "مکمل پیج"
+            click_through_only: "تمام (صرف کلِک تھرُو)"
+          header_search_results: "ہیڈر کے سرچ نتائج"
         logster:
           title: "خرابیوں کے لاگز"
+      watched_words:
+        title: "نظر رکھے ہوئے الفاظ"
+        search: "سرچ"
+        clear_filter: "صاف کریں"
+        show_words: "الفاظ دکھائیں"
+        word_count:
+          one: "1 لفظ"
+          other: "%{count}الفاظ "
+        actions:
+          block: 'بلاک کریں'
+          censor: 'سَینسَر'
+          require_approval: 'منظوری کی ضرورت ہے'
+          flag: 'فلَیگ'
+        action_descriptions:
+          block: 'اِن الفاظ پر مشتمل پوسٹس شائع ہونے سے روکیں۔ جب صارف اپنی پوسٹ شائع کرنے کی کوشش کرے گا تو اُسے ایک خرابی کا پیغام دکھایا جائے گا۔'
+          censor: 'اِن الفاظ پر مشتمل پوسٹس کوشائع ہونے دیں، لیکن سینسر کیے گئے الفاظ کو چھپانے والے حروف کے ساتھ تبدیل کریں۔'
+          require_approval: 'اِن الفاظ پر مشتمل پوسٹس کے نظر آنے سے پہلے اسٹاف کی طرف سے منظوری کی ضرورت ہوگی۔'
+          flag: 'اِن الفاظ پر مشتمل پوسٹس کوشائع ہونے دیں، لیکن ان کو غیر مناسب کے طور پر فلَیگ کریں تاکہ منتظمین ان کا جائزہ لے سکیں۔'
+        form:
+          label: 'نیا لفظ:'
+          placeholder: 'مکمل لفظ یا * وائلڈ کارڈ کے طور پر'
+          placeholder_regexp: "رَیگولر اَیکسپرَیشَن"
+          add: 'شامل کریں'
+          success: 'کامیابی'
+          upload: "اَپ لوڈ"
+          upload_successful: "اَپ لوڈ کامیاب ہوا۔ الفاظ شامل کردیے گئے ہیں۔"
       impersonate:
         title: "نقالی"
         help: "ڈِیبَگ مقاصد کیلئے اِس آلے کو استعمال کر کہ ایک صارف کے اکاؤنٹ کی نقالی کریں۔ کام ختم ہونے کے بعد آپ کے ایک دفعہ لاگ آؤٹ کرنا ہو گا۔"
@@ -2597,6 +3153,7 @@ ur:
           pending: "زیرِاِلتوَاء"
           staff: 'سٹاف'
           suspended: 'معطل کردہ'
+          silenced: 'خاموش کیو ہوئے'
           suspect: 'مشتبہ'
         approved: "منظورشدہ؟"
         approved_selected:
@@ -2617,14 +3174,15 @@ ur:
           staff: "سٹاف"
           admins: 'ایڈمِن صارفین'
           moderators: 'ماڈریٹرز'
+          silenced: 'خاموش کردہ صارفین'
           suspended: 'معطل کردہ صارفین'
           suspect: 'مشتبہ صارفین'
         reject_successful:
           one: "کامیابی کے ساتھ 1 صارف کو مسترد کیا۔"
-          other: "کامیابی کے ساتھ ٪{count} صارفین کو مسترد کیا۔"
+          other: "کامیابی کے ساتھ %{count} صارفین کو مسترد کیا۔"
         reject_failures:
           one: "1 صارف کو مسترد کرنے میں ناکامی۔"
-          other: "٪{count} صارفین کو مسترد کرنے میں ناکامی۔"
+          other: "%{count} صارفین کو مسترد کرنے میں ناکامی۔"
         not_verified: "غیر تصدیق شدہ"
         check_email:
           title: "اِس صارف کا اِیمیل ایڈریس ظاہر کریں"
@@ -2634,10 +3192,31 @@ ur:
         unsuspend_failed: "اِس صارف کی معطلی ختم کرتے ہوے کچھ غلط ہو گیا {{error}}"
         suspend_duration: "صارف کب تک معطل رہے گا؟"
         suspend_reason_label: "آپ معطل کیوں کر رہے ہیں؟ یہ ٹَیکسٹ اِس صارف کے پروفائل پیج پر <b>ہر کسی کے لیے ظاہر ہو گا</b>، اور جب صارف لاگ اِن کرنے کی کوشش کریں گے تو اُنہیں دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
+        suspend_reason_hidden_label: "آپ کیوں معطل کر رہے ہیں؟ صارف جب لاگ اِن کرنے کی کوشش کرے گا تو اُسے یہ ٹیکسٹ دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
         suspend_reason: "وجہ"
+        suspend_reason_placeholder: "وجہ معطلی"
+        suspend_message: "اِی مَیل پیغام"
+        suspend_message_placeholder: "اختیاریطور پر معطلی کے بارے میں مزید معلومات فراہم کریں اور یہ صارف کو ای میل کر دی جائیں گی۔"
         suspended_by: "کی طرف سے معطل کیا گیا"
+        silence_reason: "وجہ"
+        silenced_by: "جس نے خاموش کیا"
+        silence_modal_title: "صارف خاموش کریں"
+        silence_duration: "صارف کب تک خاموش رہے گا؟"
+        silence_reason_label: "آپ اِس صارف کو کیوں خاموش کر رہے ہیں؟"
+        silence_reason_placeholder: "خاموش کردینے کی وجہ"
+        silence_message: "اِی مَیل پیغام"
+        silence_message_placeholder: "(ڈیفالٹ پیغام بھیجنے کیلئے خالی چھوڑ دیں)"
+        suspended_until: "(%{until} تک)"
+        cant_suspend: "یہ صارف معطل نہیں کیا جا سکتا۔"
         delete_all_posts: "تمام پوسٹس حذف کریں"
-        delete_all_posts_confirm_MF: "آپ {POSTS، جمع، ایک {1 پوسٹ} دیگر {# posts}} اور {TOPICS، جمع، ایک {1 ٹاپک} دیگر {# topics}} حذف کرنے والے ہیں۔ کیا آپ کو یقین ہے؟"
+        penalty_post_actions: "آپ اِس مُنسلِک پوسٹ کے ساتھ کیا کرنا چاہیں گے؟"
+        penalty_post_delete: "پوسٹ حذف کریں"
+        penalty_post_edit: " پوسٹ ترمیم کریں"
+        penalty_post_none: "کچھ نہ کریں"
+        delete_all_posts_confirm_MF: "آپ {POSTS, plural, one {1 پوسٹ} other {# پوسٹس}} and {TOPICS, plural, one {1 ٹاپک} other {# ٹاپکس}} حذف کرنے والے ہیں۔ کیا آپ کو یقین ہے؟"
+        silence: "خاموش کریں"
+        unsilence: "خاموشی ختم کریں"
+        silenced: "خاموش کیا ہوا؟"
         moderator: "ماڈریٹر؟"
         admin: "ایڈمن؟"
         suspended: "معطل کردہ؟"
@@ -2653,10 +3232,14 @@ ur:
         logged_out: "صارف کو تمام ڈِیوائیسِز سے لاگ آؤٹ کر دیا گیا"
         revoke_admin: 'اَیڈمِن منسوخ کریں'
         grant_admin: 'اَیڈمِن عطا کریں'
+        grant_admin_confirm: "نئے ایڈمِنِسٹریٹر کی توثیق کیلئے ہم نے آپ کو ایک ای میل بھیجی ہے۔ براہ مہربانی اسے کھولیں اور ہدایات پر عمل کریں۔"
         revoke_moderation: 'ماڈرَیشَن منسوخ کریں'
         grant_moderation: 'ماڈرَیشَن عطا کریں'
         unsuspend: 'معطلی ختم کریں'
         suspend: 'معطل کریں'
+        show_flags_received: "ملے فلَیگز دکھائیں"
+        flags_received_by: "%{username} کو ملے فلَیگز "
+        flags_received_none: "اِس صارف کو کوئی فلَیگز نہیں ملے۔"
         reputation: ساکھ
         permissions: اجازتیں
         activity: سرگرمی
@@ -2665,6 +3248,7 @@ ur:
         private_topics_count: نِجی ٹاپک
         posts_read_count: پڑھی گئیں پوسٹس
         post_count: بنائی گئیں پوسٹس
+        second_factor_enabled: دو فیکٹر توثیق فعال کردی گئی
         topics_entered: دیکھ لیے گئے ٹاپک
         flags_given_count: فلَیگز دیے گئے
         flags_received_count: فلَیگز ملے
@@ -2683,14 +3267,14 @@ ur:
         delete_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز حذف نہیں کیے جا سکتے۔"
         delete_posts_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز کی تمام پوسٹس حذف نہیں کی جا سکتیں۔"
         delete_forbidden:
-          one: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
-          other: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
+          one: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (%{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
+          other: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (%{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
         cant_delete_all_posts:
-          one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
-          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
+          one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس %{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
+          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس %{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
         cant_delete_all_too_many_posts:
           one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی 1 سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)"
-          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی ٪{count} سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)"
+          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی %{count} سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)"
         delete_confirm: "کیا آپ واقعی اِس صارف کو حذف کرنا چاہتے ہیں؟ یہ مُستقِل عمل ہے!"
         delete_and_block: "اِس اِیمیل اور IP ایڈریس کو حذف اور <b>بلاک</b> کریں"
         delete_dont_block: "صرف حذف کریں"
@@ -2698,17 +3282,23 @@ ur:
         delete_failed: "اُس صارف کو حذف کرنے میں ایک مسئلہ پیش آیا۔ صارف کو حذف کرنے سے پہلے اس بات کا یقین کرلیں کہ تمام پوسٹس حذف کر دی گئی ہیں۔"
         send_activation_email: "ایکٹیویشن اِیمیل بھیجییں"
         activation_email_sent: "ایک ایکٹیویشن اِیمیل بھیج دی گئی ہے۔"
-        send_activation_email_failed: "ایک اور ایکٹیویشن اِیمیل بھیجنے میں ایک مسئلہ پیش آیا۔ ٪{error}"
+        send_activation_email_failed: "ایک اور ایکٹیویشن اِیمیل بھیجنے میں ایک مسئلہ پیش آیا۔ %{error}"
         activate: "اکاؤنٹ فعال کریں"
         activate_failed: "صارف فعال کرنے میں ایک مسئلہ پیش آیا۔"
         deactivate_account: "اکاؤنٹ غیر فعال کریں"
         deactivate_failed: "صارف کو غیر فعال کرنے میں ایک مسئلہ پیش آیا۔"
+        unsilence_failed: 'صارف کی خاموشی ختم کرنے میں ایک مسئلہ پیش آیا۔'
+        silence_failed: 'صارف کو خاموش کرنے میں ایک مسئلہ پیش آیا۔'
+        silence_confirm: 'کیا آپ واقعی اِس صارف کو خاموش کرنا چاہتے ہیں؟ وہ کوئی بھی نئے ٹاپک یا پوسٹ  نہیں بنا سکیں گے۔'
+        silence_accept: 'جی ہاں، اِس صارف کو خاموش کریں'
         bounce_score: "بائونس سکور"
         reset_bounce_score:
           label: "رِی سَیٹ"
           title: "بائونس سکور واپس 0 پر رِی سَیٹ کریں"
+        visit_profile: "اِس صارف کے پروفائل میں ترمیم کرنے کیلئے <a href='%{url}'>اِس کے ترجیحات پَیج</a> پر جائیں"
         deactivate_explanation: "ایک غیر فعال صارف کو اپنا اِیمیل دوبارہ تصدیق کرنا ضروری ہے۔"
         suspended_explanation: "کوئی معطل صارف لاگ اِن نہیں کر سکتا۔"
+        silence_explanation: "ایک خاموش کیا ہوا صارف پوسٹ شائع یا ٹاپک شروع نہیں کر سکتا۔"
         staged_explanation: "ایک سٹَیجڈ صارف صرف مخصوص ٹاپکس پر اِیمیل کے ذریعے پوسٹ کر سکتا ہے۔"
         bounce_score_explanation:
           none: "اس اِیمیل سے حال میں کوئی باؤنسِز موصول نہیں ہوئے۔"
@@ -2726,7 +3316,7 @@ ur:
           title: "ٹرسٹ لَیول 3 کے تقاضے"
           table_title:
             one: "پچھلے دن میں"
-            other: "پچھلے ٪{count} دنوں میں"
+            other: "پچھلے %{count}دنوں میں"
           value_heading: "وَیلِیو"
           requirement_heading: "ضروریات"
           visits: "زائرین کی تعداد"
@@ -2800,11 +3390,12 @@ ur:
         go_back: "واپس سَرچ پر"
         recommended: "اَپنی ضروریات کے مطابق کرنے کے لئے ہم مندرجہ ذیل ٹَیکسٹ کو اپنی مرضی کے حساب سے تبدیل کرنے کی تجویز دیں گے:"
         show_overriden: 'صرف اووَر رائیڈ ہوئے دکھائیں'
-      site_settings:
+      settings:
         show_overriden: 'صرف اووَر رائیڈ ہوئے دکھائیں'
-        title: 'سیٹِنگ'
         reset: 'رِی سَیٹ'
         none: 'کوئی نہیں'
+      site_settings:
+        title: 'سیٹِنگ'
         no_results: "کوئی نتائج نہیں پائے گئے۔"
         clear_filter: "صاف کریں"
         add_url: "URL شامل کریں"
@@ -2826,6 +3417,7 @@ ur:
           developer: 'ڈیولپر'
           embedding: "اَیمبَیڈ کرنا"
           legal: "قانونی"
+          api: 'API'
           user_api: 'یُوزَر API'
           uncategorized: 'دیگر'
           backups: "بیک اَپس"
@@ -2862,7 +3454,7 @@ ur:
         grant_badge: بَیج دیں
         granted_badges: دیے گئے بَیجز
         grant: عطا کریں
-        no_user_badges: "٪{name} کو کوئی بَیج عطا نہیں کیا گیا ہے۔"
+        no_user_badges: "%{name} کو کوئی بَیج عطا نہیں کیا گیا ہے۔"
         no_badges: عطا کیے جانے کیلئے کوئی بَیج موجود نہیں ہیں۔
         none_selected: "شروع کرنے کے لئے ایک بَیج منتخب کریں"
         allow_title: عنوان کے طور پر بَیج وں کے استعمال کی اجازت دیں
@@ -2875,6 +3467,7 @@ ur:
         query: بَیج قُوَیری (SQL)
         target_posts: ھدف پوسٹس کو قُوَیری کریں
         auto_revoke: روزانہ رَیوَوکَیشَن قُوَیری چلائیں
+        show_posts: بَیج صفحے پر بَیج دینے والی پوسٹ دکھائیں
         trigger: محرکات
         trigger_type:
           none: "روزانہ اَپ ڈَیٹ کریں"
@@ -2895,26 +3488,27 @@ ur:
           no_grant_count: "کوئی بَیج تفویض کرنے کیلئے موجود نہیں۔"
           grant_count:
             one: "تفویض  کرنے کیلئے <b>1</b> بَیج موجود ہے۔"
-            other: "تفویض  کرنے کیلئے <b>٪{count}</b> بَیج موجود ہیں۔"
+            other: "تفویض  کرنے کیلئے <b>%{count}</b> بَیج موجود ہیں۔"
           sample: "نمونہ:"
           grant:
-            with: <span class="username">٪{username}</span>
-            with_post: <span class="username">٪{username}</span> اِس ٪{لنک} میں پوسٹ کیلئے
-            with_post_time: <span class="username">٪{username}</span> <span class="time">٪{time}</span> پر اِس ٪{لنک} میں پوسٹ کیلئے
-            with_time: <span class="username">٪{username}</span> <span class="time">٪{time}</span> پر
+            with: <span class="username">%{username}</span>
+            with_post: <span class="username">%{username}</span> اِس %{link} میں پوسٹ کیلئے
+            with_post_time: <span class="username">%{username}</span> <span class="time">%{time}</span> پر اِس %{link} میں پوسٹ کیلئے
+            with_time: <span class="username">%{username}</span> <span class="time">%{time}</span> پر
       emoji:
         title: "اِیمَوجی"
         help: "نئی اِیمَوجی شامل کریں جو سب کے لئے دستیاب ہوگی۔ (پیشہ وَرَانہ ٹِپ: ایک بار میں ایک سے زیادہ فائلوں کو ڈرَیگ & ڈراپ کریں)"
         add: "نئی اِیمَوجی شامل کریں"
         name: "نام"
         image: "تصویر"
-        delete_confirm: "کیا آپ واقعی :٪{name}: اِیمَوجی کو حذف کرنا چاہتے ہیں؟"
+        delete_confirm: "کیا آپ واقعی :%{name}: اِیمَوجی حذف کرنا چاہتے ہیں؟"
       embedding:
         get_started: "اگر آپ ڈِسکورس کو ایک اور ویب سائٹ پر اَیمبَیڈ کرنا چاہتے ہیں، تو ہوسٹ شامل کر کے شروع کریں۔"
         confirm_delete: "کیا آپ واقعی اس ہَوسٹ کو حذف کرنا چاہتے ہیں؟"
         sample: "ڈِسکورس ٹاپک بنانے اور اَیمبَیڈ کرنے کیلئے اپنی ویب سائٹ میں درج ذیل HTML کوڈ استعمال کریں۔ جس پیج پر آپ اسے اَیمبَیڈ کر رہے ہیں اُس کا canonical URL <b>REPLACE_ME</b> کی جگہ اِستعمال کریں۔"
         title: "اَیمبَیڈ کرنا"
         host: "اجازت یافتہ ہَوسٹ"
+        class_name: "کلاس کا نام"
         path_whitelist: "پاتھ وائِٹ لِسٹ"
         edit: "ترمیم"
         category: "زمرہ میں پوسٹ کریں"
@@ -2934,6 +3528,7 @@ ur:
         embed_classname_whitelist: "اجازت یافتہ CSS کلاسوں کے نام"
         feed_polling_enabled: "RSS / ATOM کے ذریعے پوسٹس درآمد کریں"
         feed_polling_url: "کرال کرنے کیلئے RSS / ATOM کا URL"
+        feed_polling_frequency_mins: "فیڈ پولنگ کی فریکوئینسی (منٹوں میں)"
         save: "اَیمبَیڈ کرنے کی سیٹِنگ محفوظ کریں"
       permalink:
         title: "دائمی لِنکس"
@@ -2955,10 +3550,13 @@ ur:
       done: "مکمل"
       back: "واپس"
       next: "اگلا"
-      step: "٪{total} میں سے ٪{current}"
+      step: "%{total} میں سے %{current}"
       upload: "اَپ لوڈ"
       uploading: "اَپ لوڈ کیا جا رہا ہے..."
       quit: "شاید بعد میں"
+      staff_count:
+        one: "آپ کی کمیونٹی میں 1 اسٹاف کا رکن ہے (آپ)۔"
+        other: "آپ کی کمیونٹی میں آپ سمیت، %{count} سٹاف کے ارکان ہیں۔"
       invites:
         add_user: "شامل کریں"
         none_added: "آپ نے کسی  بھی سٹاف کو مدعو نہیں کیا۔ کیا آپ واقعی آگے جانا چاہتے ہیں؟"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 7e9f1df5ed..15a5c6107c 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -307,22 +307,6 @@ vi:
         make_user_group_owner: "Đặt làm người sở hữu"
         remove_user_as_group_owner: "Huỷ quyền sở hữu"
     groups:
-      logs:
-        title: "Bản ghi"
-        when: "Khi"
-        action: "Hành động"
-        acting_user: "Người dùng đang hoạt động"
-        target_user: "Người dùng mục tiêu"
-        subject: "Chủ đề"
-        details: "Chi tiết"
-        from: "Từ"
-        to: "Đến"
-      edit:
-        title: 'Sửa nhóm'
-        full_name: 'Tên đầy đủ'
-        add_members: "Thêm thành viên"
-        delete_member_confirm: "Xoá  '%{username}' khỏi nhóm '%{group}' ?"
-      name_placeholder: "Tên nhóm, không có khoảng trắng, tương tự như luật đặt tên người dùng"
       public_admission: "Cho phép Thành viên tham gia nhóm một cách tự do (nhóm hiển thị công khai)"
       public_exit: "Cho phép Thành viên thoát khỏi nhóm một cách tự do"
       empty:
@@ -333,12 +317,7 @@ vi:
         topics: "Không có chủ đề nào được gửi bởi thành viên của nhóm này."
         logs: "Không có bản ghi nào dành cho nhóm này"
       add: "Thêm"
-      join: "Tham gia nhóm"
-      leave: "Rời nhóm"
-      request: "Xin gia nhập nhóm"
       message: "Tin nh"
-      automatic_group: Nhóm tự động
-      is_group_user: "Bạn là một thành viên của nhóm này"
       allow_membership_requests: "Cho phép người dùng gửi đơn xin gia nhập nhóm đến người quản lí nhóm."
       membership_request_template: "đã tùy chỉnh để hiển thị cho người dùng khi gửi yêu cầu thành viên"
       membership_request:
@@ -359,18 +338,12 @@ vi:
       posts: "Các bài viết"
       mentions: "Được nhắc đến"
       messages: "Tin nhắn"
-      visibility_levels:
-        title: "Ai có thể xem nhóm"
-        public: "Mọi người"
       alias_levels:
         nobody: "Không ai cả"
         only_admins: "Chỉ các quản trị viên"
         mods_and_admins: "Chỉ có người điều hành và ban quản trị"
         members_mods_and_admins: "Chỉ có thành viên trong nhóm, ban điều hành, và ban quản trị"
         everyone: "Mọi người"
-      trust_levels:
-        title: "Cấp độ tin tưởng tự động tăng cho thành viên khi họ thêm:"
-        none: "Không có gì"
       notifications:
         watching:
           title: "Đang theo dõi"
@@ -395,7 +368,6 @@ vi:
       flair_color_placeholder: "(Tuỳ chọn) Giá trị mã màu Hexa"
       flair_preview_icon: "Biểu tượng xem trước"
       flair_preview_image: "Ảnh xem trước"
-      flair_note: "Ghi chú: Ảnh đại diện chỉ hiển thị cho nhóm chính của người dùng"
     user_action_groups:
       '1': "Lượt thích"
       '2': "Lần được thích"
@@ -1040,19 +1012,6 @@ vi:
       empty: "Không có thông báo"
       more: "xem thông báo cũ hơn"
       total_flagged: "tổng số bài viết gắn cờ"
-      alt:
-        mentioned: "Được nhắc đến bởi"
-        quoted: "Trích dẫn bởi"
-        replied: "Đã trả lời"
-        posted: "Đăng bởi"
-        edited: "Bài viết của bạn được sửa bởi"
-        liked: "Bạn đã like bài viết"
-        invited_to_topic: "Lời mời tham gia chủ đề từ"
-        invitee_accepted: "Lời mời được chấp nhận bởi"
-        moved_post: "Bài viết của bạn đã được di chuyển bởi"
-        linked: "Liên kết đến bài viết của bạn"
-        granted_badge: "Cấp huy hiệu"
-        group_message_summary: "Tin nhắn trong hộp thư đến"
       popup:
         mentioned: '{{username}} nhắc đến bạn trong "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nhắc đến bạn trong "{{topic}}" - {{site_title}}'
@@ -1965,7 +1924,6 @@ vi:
         title: "Nhóm"
         edit: "Sửa nhóm"
         refresh: "Làm mới"
-        new: "Mới"
         about: "Chỉnh sửa nhóm thành viên và tên của bạn ở đây"
         group_members: "Nhóm thành viên"
         delete: "Xóa"
@@ -1973,21 +1931,11 @@ vi:
         delete_failed: "Không thể xóa nhóm. Nếu đây là một nhóm tự động, nó không thể hủy bỏ."
         delete_owner_confirm: "Loại bỏ quyền sở hữu của '%{username}'?"
         add: "Thêm"
-        add_members: "Thêm thành viên"
         custom: "Tùy biến"
-        bulk_complete: "Các thành viên đã được thêm vào nhóm."
-        bulk: "Thêm vào nhóm theo lô"
-        bulk_paste: "Dán danh sách username hoặc email, mỗi mục một dòng:"
-        bulk_select: "(chọn nhóm)"
         automatic: "Tự động"
-        automatic_membership_email_domains: "Các thành viên đã đăng ký với đuôi email khớp với một trong danh sách này sẽ được tự động thêm vào nhóm:"
-        automatic_membership_retroactive: "Áp dụng quy tắc đuôi email tương tự để thêm thành viên đăng ký hiện tại"
         default_title: "Tên mặc định cho tất cả các thành viên trong nhóm này"
-        primary_group: "Tự động cài là nhóm chính"
         group_owners: Chủ sở hữu
         add_owners: Thêm chủ sở hữu
-        incoming_email: "Tùy chỉnh địa chỉ email đến"
-        incoming_email_placeholder: "điền địa chỉ email"
       api:
         generate_master: "Tạo Master API Key"
         none: "Không có API keys nào kích hoạt lúc này."
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 0244c7a345..f7b4989f62 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -307,22 +307,6 @@ zh_CN:
         make_user_group_owner: "设为所有者"
         remove_user_as_group_owner: "撤销所有者"
     groups:
-      logs:
-        title: "日志"
-        when: "时间"
-        action: "操作"
-        acting_user: "操作用户"
-        target_user: "目标用户"
-        subject: "主题"
-        details: "详情"
-        from: "来自"
-        to: "发至"
-      edit:
-        title: '编辑群组'
-        full_name: '群组名'
-        add_members: "增加组员"
-        delete_member_confirm: "从“%{group}”群组中移除用户“%{username}'？"
-      name_placeholder: "群组名，没有空格，和用户名一样的规则"
       public_admission: "允许用户自由加入小组（需要小组公开可见）"
       public_exit: "允许用户自由离开小组"
       empty:
@@ -333,12 +317,7 @@ zh_CN:
         topics: "群组的成员从未发表主题。"
         logs: "没有关于群组的日志。"
       add: "添加"
-      join: "加入群组"
-      leave: "离开群组"
-      request: "请求加入群组"
       message: "私信"
-      automatic_group: 自动群组
-      is_group_user: "你是该群组的一个成员"
       allow_membership_requests: "允许用户向小组拥有者发送成员请求"
       membership_request_template: "用户发送会员请求时向其显示的自定义模板"
       membership_request:
@@ -360,12 +339,6 @@ zh_CN:
       mentions: "提及"
       messages: "私信"
       notification_level: "小组私信的默认通知等级"
-      visibility_levels:
-        title: "谁能看到这个小组？"
-        public: "所有人"
-        members: "小组创建人，成员和管理员"
-        staff: "小组创建者及工作人员"
-        owners: "小组创建者及管理员"
       alias_levels:
         mentionable: "谁能@该小组"
         messageable: "谁能私信此小组"
@@ -374,9 +347,6 @@ zh_CN:
         mods_and_admins: "版主与管理员"
         members_mods_and_admins: "组员、版主与管理员"
         everyone: "任何人"
-      trust_levels:
-        title: "这些用户加入时，将自动赋予信任等级："
-        none: "无"
       notifications:
         watching:
           title: "跟踪"
@@ -401,7 +371,6 @@ zh_CN:
       flair_color_placeholder: "（可选）十六进制色彩值"
       flair_preview_icon: "预览图标"
       flair_preview_image: "预览图片"
-      flair_note: "注意：标示将只在用户的主要群组显示"
     user_action_groups:
       '1': "送出赞"
       '2': "获得赞"
@@ -1138,20 +1107,6 @@ zh_CN:
       watching_first_post: "<span>新主题</span> {{description}}"
       group_message_summary:
         other: "{{count}} 条私信在{{group_name}}组的收件箱中"
-      alt:
-        mentioned: "被提及"
-        quoted: "被引用"
-        replied: "回复"
-        posted: "发自"
-        edited: "编辑你的帖子"
-        liked: "赞了你的帖子"
-        invited_to_topic: "主题邀请自"
-        invitee_accepted: "介绍邀请自"
-        moved_post: "你的帖子被移动自"
-        linked: "链接至你的帖子"
-        granted_badge: "勋章授予"
-        group_message_summary: "在群组收件箱中的私信"
-        topic_reminder: "一个提醒"
       popup:
         mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
         group_mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
@@ -2341,7 +2296,6 @@ zh_CN:
         title: "群组"
         edit: "编辑群组"
         refresh: "刷新"
-        new: "新群组"
         about: "在这里编辑群组的名字和成员"
         group_members: "群组成员"
         delete: "删除"
@@ -2349,22 +2303,11 @@ zh_CN:
         delete_failed: "无法删除群组。如果该群组是自动生成的，则不可删除。"
         delete_owner_confirm: "移除“%{username}”的权限？"
         add: "添加"
-        add_members: "添加成员"
         custom: "定制"
-        bulk_complete: "用户已被添加到群组。"
-        bulk_complete_users_not_added: "这些用户还没有被添加（请确保他们已经有账户了）："
-        bulk: "批量添加到群组"
-        bulk_paste: "粘贴用户名邮件列表，一行一个："
-        bulk_select: "( 选择一个群组 )"
         automatic: "自动"
-        automatic_membership_email_domains: "用户注册时邮箱域名若与列表完全匹配则自动添加至这个群组："
-        automatic_membership_retroactive: "应用同样的邮件域名规则添加已经注册的用户"
         default_title: "群组内所有用户的默认头衔"
-        primary_group: "自动设置为主要群组"
         group_owners: 所有者
         add_owners: 添加所有者
-        incoming_email: "自定义进站电子邮件地址"
-        incoming_email_placeholder: "输入邮箱地址"
         none_selected: "选择一个小组以开始"
         no_custom_groups: "创建一个自定义小组"
       api:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 406e984a4f..f72d88ffb5 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -292,22 +292,6 @@ zh_TW:
         make_user_group_owner: "設為所有者"
         remove_user_as_group_owner: "撤銷管理員"
     groups:
-      logs:
-        title: "紀錄"
-        when: "什麼時候"
-        action: "動作"
-        acting_user: "啟用中的用戶"
-        target_user: "目的用戶"
-        subject: "主旨"
-        details: "詳情"
-        from: "從"
-        to: "至"
-      edit:
-        title: '編輯群組'
-        full_name: '全名'
-        add_members: "增加成員"
-        delete_member_confirm: "從「%{group}」群組移除「%{username}」？"
-      name_placeholder: "群組名，沒有空格，和用戶名一樣的規則"
       empty:
         posts: "群組成員沒有發佈帖子。"
         members: "這個團隊裡面沒有成員"
@@ -316,12 +300,7 @@ zh_TW:
         topics: "群組的成員從未發表主題。"
         logs: "這個團隊裡面沒有日誌"
       add: "新增"
-      join: "加入團隊"
-      leave: "離開團隊"
-      request: "請求加入團隊"
       message: "訊息"
-      automatic_group: 自動群組
-      is_group_user: "你是團隊裡面的成員"
       membership: "會員資格"
       name: "名字"
       bio: "關於群組"
@@ -340,9 +319,6 @@ zh_TW:
         mods_and_admins: "只有板主以及管理員"
         members_mods_and_admins: "只有群組成員、板主以及管理員"
         everyone: "所有人"
-      trust_levels:
-        title: "當這些成員加入時自動提升信任等級:"
-        none: "無"
       notifications:
         watching:
           title: "關注"
@@ -367,7 +343,6 @@ zh_TW:
       flair_color_placeholder: "（可選）十六進制色彩值"
       flair_preview_icon: "預覽圖示"
       flair_preview_image: "預覽圖片"
-      flair_note: "注意：標示將只在用戶的主要群組顯示"
     user_action_groups:
       '1': "已按讚"
       '2': "已收到的讚"
@@ -1005,19 +980,6 @@ zh_TW:
       empty: "未找到任何通知。"
       more: "檢視較舊的通知"
       total_flagged: "所有被投訴的文章"
-      alt:
-        mentioned: "被提及"
-        quoted: "引用者"
-        replied: "回覆"
-        posted: "發自"
-        edited: "編輯你的帖子"
-        liked: "讚了你的帖子"
-        invited_to_topic: "主題邀請自"
-        invitee_accepted: "介紹邀請自"
-        moved_post: "你的帖子被移動自"
-        linked: "連結到你的討論"
-        granted_badge: "勛章授予"
-        group_message_summary: "在群組收件箱中的消息"
       popup:
         mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
         group_mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
@@ -2045,7 +2007,6 @@ zh_TW:
         title: "群組"
         edit: "編輯群組"
         refresh: "重新整理"
-        new: "建立"
         about: "請在此編輯你的群組成員與名稱"
         group_members: "群組成員"
         delete: "刪除"
@@ -2053,21 +2014,11 @@ zh_TW:
         delete_failed: "無法刪除群組，自動建立的群組無法刪除。"
         delete_owner_confirm: "移除“%{username}”的權限？"
         add: "加入"
-        add_members: "新增成員"
         custom: "客製"
-        bulk_complete: "用戶已被添加到群組。"
-        bulk: "批量添加到群組"
-        bulk_paste: "粘貼用戶名郵件列表，一行一個："
-        bulk_select: "( 選擇一個群組 )"
         automatic: "自動建立"
-        automatic_membership_email_domains: "註冊的用戶的電子郵件地址網域，完全符合列表裡某項時，會自動加進這個群組裡："
-        automatic_membership_retroactive: "套用相同的電子郵件網域規則到已經註冊的用戶上："
         default_title: "群組內所有成員的預設頭銜"
-        primary_group: "自動設定為主要群組"
         group_owners: 所有者
         add_owners: 添加所有者
-        incoming_email: "自定義進站電子郵件地址"
-        incoming_email_placeholder: "輸入郵箱地址"
       api:
         generate_master: "產生主 API 金鑰"
         none: "目前沒有啟用中的 API 金鑰。"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index f6b49b1d87..21aaef3ece 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -426,20 +426,6 @@ ar:
       title: "قائد"
     change_failed_explanation: "حاولت تخفيض رتبة %{user_name} إلى '%{new_trust_level}'. أيضا مستوى الثقة لهم حاليا '%{current_trust_level}'. %{user_name} سيبقى في '%{current_trust_level}' - إذا رغبت في تخفيض رتبة عضو أنظر لمستوى الثقة أولاً."
   rate_limiter:
-    slow_down: "لقد قمت بهذا الإجراء عدّة مرات. فحاول مجددا لاحقا."
-    by_type:
-      first_day_replies_per_day: "لقد وصلت للعدد الأقصى للردود التي يمكن  للعضو الجديد إنشائها في يومهم الأول. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      first_day_topics_per_day: "لقد وصلت للعدد الأقصى للمواضيع التي يمكن  للعضو الجديد إنشائها في يومهم الأول. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_topic: "أنت تنشأ مواضيع بسرعة عالية. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_post: "أنت ترد بسرعة عالية. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      delete_post: "أنت تقوم بمسح المنشورات بسرعه عاليه . الرجاء الانتظار  %{time_left} قبل المحاوله مجدداً"
-      topics_per_day: "لقد وصلت للعدد الأقصى للمواضيع الجديدة اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      pms_per_day: "لقد وصلت للعدد الأقصى للرسائل اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_like: "لقد وصلت للعدد الأقصى للإعجابات اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_bookmark: "لقد وصلت للعدد الأقصى للعلامات المرجعية اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      live_post_counts: "أنت تطلب تعداد حى للمنشورات بسرعه عاليه . الرجاء الانتظار  %{time_left} قبل المحاوله مجدداً"
-      unsubscribe_via_email: "لقد وصلت للحد الأقصى من الغاء الاشتراكات عبر البريد الالكترونى اليوم. رجاء الانتظار %{time_left} قبل المحاولة مجددا."
-      topic_invitations_per_day: "لقد وصلت للحد الأقصى للدعوة للمواضيع اليوم. رجاء الانتظار %{time_left} قبل المحاولة مجددا."
     hours:
       zero: "أقلّ من ساعة"
       one: "ساعة واحدة"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 1bde6c113d..25779372b5 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -389,21 +389,6 @@ ca:
       title: "líder"
     change_failed_explanation: "Has provat de degradar %{user_name} a '%{new_trust_level}'. En qualsevol cas, el seu nivell de confiança ja és '%{current_trust_level}'. %{user_name} restarà a '%{current_trust_level}' - Si vols degradar una persona usuària, bloca-li abans el nivell de confiança"
   rate_limiter:
-    slow_down: "Has provat de fer el mateix moltes vegades, prova-ho més tard."
-    by_type:
-      first_day_replies_per_day: "Has arribat a la quantitat màxima de respostes que una nova persona usuària pot crear durant el seu primer dia. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      first_day_topics_per_day: "Has arribat a la quantitat màxima de temes que una nova persona usuària pot crear durant el seu primer dia. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      create_topic: "Estàs generant temes massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      create_post: "Estàs responent massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      delete_post: "Estàs esborrant publicacions massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      public_group_membership: "T'estàs unint a grups o abandonant-los massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      topics_per_day: "Avui has arribat a la quantitat màxima de temes. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      pms_per_day: "Avui has arribat a la quantitat màxima de missatges. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      create_like: "Has arribat a la quantitat màxima de m'agrades avui. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      create_bookmark: "Avui has arribat a la quantitat màxima de preferits. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      live_post_counts: "Estàs demanant recomptes de publicacions massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      unsubscribe_via_email: "Avui has arribat a la quantitat màxima de cancel·lacions de subscripcions per correu electrònic. Si us plau, espera %{time_left} abans de tornar a provar-ho."
-      topic_invitations_per_day: "Avui has arribat a la quantitat màxima d'invitacions de temes. Si us plau, espera %{time_left} abans de tornar a provar-ho."
     hours:
       one: "1 hora"
       other: "%{count} hores"
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index d71108efbe..f25438e5e3 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -29,6 +29,7 @@ cs:
   loading: "Nahrávám"
   powered_by_html: 'Systém běží na <a href="https://www.discourse.org">Discourse</a>, nejlépe funguje se zapnutým JavaScriptem'
   log_in: "Přihlásit se"
+  submit: "Odeslat"
   purge_reason: "Tento účet byl automaticky smazán a deaktivován jako opuštěný"
   disable_remote_images_download_reason: "Stahování obrázků z cizích serverů bylo vypnuto protože na disku není dostatek místa."
   anonymous: "Anonymní"
@@ -221,8 +222,6 @@ cs:
     delete_reason: "Smazáno moderátorem"
     not_found: "Příspěvek nebyl nalezen nebo již byl aktualizován."
   groups:
-    success:
-      bulk_add: "Uživatelé %{users_added} byli přidáni do skupiny."
     errors:
       can_not_modify_automatic: "Nelze měnit automatické skupiny"
       invalid_domain: "'%{domain}' není platná doména."
@@ -425,10 +424,6 @@ cs:
     image_placeholder:
       broken: "Tento obrázek je rozbitý"
   rate_limiter:
-    slow_down: "Tuto akci provádíte příliš často, zkuste to prosím později."
-    too_many_requests: "Děláte tuto akci příliš často. Prosím počkejte %{time_left} a zkuste to znovu."
-    by_type:
-      pms_per_day: "Odeslal jsi maximum povolených zpráv za den. Další můžeš odeslat za {time_left}."
     hours:
       one: "1 hodina"
       few: "%{count} hodiny"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 9a6c522411..ed591c6004 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -212,8 +212,6 @@ da:
   queue:
     delete_reason: "Slettet via køen til moderation af indlæg."
   groups:
-    success:
-      bulk_add: "%{users_added} brugere er blevet tilføjet til gruppen."
     errors:
       can_not_modify_automatic: "Du kan ikke modificere en automatisk gruppe"
       invalid_domain: "'%{domain}' er ikke et gyldigt domæne."
@@ -418,22 +416,6 @@ da:
       title: "Veteran"
     change_failed_explanation: "Du har forsøgt at degradere %{user_name} til '%{new_trust_level}'. Imidlertid er deres niveau af tillid allerede '%{current_trust_level}'. %{user_name} vil forblive'%{current_trust_level}' - hvis du ønsker at degradere brugeren, skal du først låse brugerens tillids niveau / Trust Level"
   rate_limiter:
-    slow_down: "Du har udført denne handling for mange gange, prøv igen senere"
-    by_type:
-      first_day_replies_per_day: "Du har nået det maksimalt antal tilladte svar, en ny bruger kan lave på deres første dag. Vent venligst %{time_left} før du fortsætter med at besvare tanker og indlæg."
-      first_day_topics_per_day: "Du har nået det maksimalt antal af tilladte emner, en ny bruger kan lave på første dag.\nVent venligst %{time_left} før du prøver igen."
-      create_topic: "Du opretter emner for hurtigt. Vent venligst %{time_left} før du prøver igen."
-      create_post: "Du svarer for hurtigt. Vent venligst %{time_left} før du prøver igen."
-      delete_post: "Du sletter emner for hurtigt. Vent venligst %{time_left}før du prøver igen."
-      public_group_membership: "Du tilslutter/forlader grupper for ofte. Vent venligst %{time_left} før du forsøger igen."
-      topics_per_day: "Du har nået det maksimalt antal tilladte nye emner i dag. Venligst vent %{time_left} før du prøver igen."
-      pms_per_day: "Du har nu nået det maksimalt antal tilladte beskeder. Vent venligst %{time_left} før du prøver igen."
-      create_like: "Du har nået grænsen for antal tilladte 'likes' for i dag. Vent venligst %{time_left} før du prøver igen."
-      create_bookmark: "Du har nået det maksimalt antal tilladte bogmærker i dag. Vent venligst %{time_left} før du prøver igen. "
-      edit_post: "Du har nået det maksimale antal redigeringer for i dag. Vent venligst  %{time_left} før du forsøger igen."
-      live_post_counts: "Du efterspørger udgivede emner for hurtigt. Vent venligst %{time_left} før du prøver igen."
-      unsubscribe_via_email: "Du har nået det maksimalt antal tilladte afmeldinger via email i dag.  Vent venligst%{time_left} før du prøver igen."
-      topic_invitations_per_day: "Du har nået det maksimalt antal tilladte emne invitationer i dag. Vent venligst %{time_left} før du prøver igen."
     hours:
       one: "1 time"
       other: "%{count} timer"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 400f434463..8573886883 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -27,7 +27,7 @@ de:
   topics: "Themen"
   posts: "Beiträge"
   loading: "Wird geladen"
-  powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>, beste Erfahrung mti aktiviertem JavaScript'
+  powered_by_html: 'Angetrieben von <a href="https://www.discourse.org">Discourse</a>, beste Erfahrung mit aktiviertem JavaScript'
   log_in: "Anmelden"
   submit: "Absenden"
   purge_reason: "Verlassenes, deaktiviertes Konto automatisch gelöscht"
@@ -249,10 +249,9 @@ de:
     delete_reason: "Aus der Moderations-Warteschlange für Beiträge gelöscht"
     not_found: "Seite nicht gefunden oder bereits aktualisiert."
   groups:
-    success:
-      bulk_add: "%{users_added} Benutzer wurden der Gruppe hinzugefügt."
     errors:
       can_not_modify_automatic: "Du kannst eine automatische Gruppe nicht bearbeiten"
+      member_already_exist: "Die folgenden Benutzer sind bereits Mitglied dieser Gruppe: %{username}"
       invalid_domain: "'%{domain}' ist keine gültige Domain."
       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."
@@ -490,7 +489,7 @@ de:
     image_placeholder:
       broken: "Dieses Bild ist beschädigt"
   rate_limiter:
-    slow_down: "Du hast diese Aktion zu oft durchgeführt. Versuche es später wieder."
+    slow_down: "Du hast diese Aktion zu oft durchgeführt. Bitte versuche es später noch einmal."
     too_many_requests: "Du hast diese Aktion zu häufig ausgeführt. Bitte warte %{time_left}, ehe du es erneut versuchst."
     by_type:
       first_day_replies_per_day: "Du hast die maximale Anzahl an Antworten erreicht, die ein neuer Benutzer am ersten Tag erstellen kann. Bitte warte %{time_left}, bis Du es wieder versuchst."
@@ -499,14 +498,14 @@ de:
       create_post: "Du antwortest zu schnell. Bitte warte %{time_left}, bis Du es wieder versuchst."
       delete_post: "Du löschst zu schnell Beiträge. Bitte warte %{time_left}, bis Du es wieder versuchst."
       public_group_membership: "Du wechselst die Gruppenzugehörigkeit zu häufig. Bitte warte %{time_left}, bevor du es erneut versuchst."
-      topics_per_day: "Du hast die maximale Anzahl an neuen Themen für heute erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      pms_per_day: "Du hast die maximale Anzahl an Nachrichten für heute erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      create_like: "Du hast die maximale Anzahl an Likes für heute erreicht. Bitte warte %{time_left}, bevor du es wieder versuchst."
-      create_bookmark: "Du hast die maximale Anzahl an Lesezeichen für heute erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
-      edit_post: "Du hast für heute die maximale Anzahl an Bearbeitungen erreicht. Bitte warte %{time_left}, bevor du es erneut versuchst."
+      topics_per_day: "Du hast die maximale Anzahl an neuen Themen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      pms_per_day: "Du hast die maximale Anzahl an Nachrichten erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      create_like: "Du hast die maximale Anzahl an Likes erreicht. Bitte warte %{time_left}, bevor du es wieder versuchst."
+      create_bookmark: "Du hast die maximale Anzahl an Lesezeichen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      edit_post: "Du hast die maximale Anzahl an Bearbeitungen erreicht. Bitte warte %{time_left}, bevor du es wieder versuchst."
       live_post_counts: "Du forderst die Live-Anzahl der Antworten zu schnell neu an. Bitte warte %{time_left}, bis du es wieder versuchst."
-      unsubscribe_via_email: "Du hast die maximale Anzahl an Abbestell-E-Mails für heute erreicht. Bitte warte %{time_left}, vor einem neuen Versuch."
-      topic_invitations_per_day: "Du hast die maximale Zahl an neuen Thema-Einladungen für heute erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
+      unsubscribe_via_email: "Du hast die maximale Anzahl an Abbestellungen per E-Mail erreicht. Bitte warte %{time_left}, vor einem neuen Versuch."
+      topic_invitations_per_day: "Du hast die maximale Zahl an neuen Thema-Einladungen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
     hours:
       one: "1 Stunde"
       other: "%{count} Stunden"
@@ -615,7 +614,7 @@ de:
     continue_button: "Weiter zu %{site_name}"
     welcome_to: "Willkommen bei %{site_name}!"
     approval_required: "Bevor du auf das Forum zugreifen kannst, muss dein neues Konto noch von einem Moderator genehmigt werden. Du erhältst eine E-Mail, sobald dies geschehen ist!"
-    missing_session: "We können nicht feststellen, ob dein Konto erstellt wurde, bitte stelle sichere, dass du Cookies aktiviert hast."
+    missing_session: "Wir können nicht feststellen, ob dein Konto erstellt wurde. Bitte stelle sicher, dass du Cookies aktiviert hast."
     activated: "Bitte entschuldige, dieses Konto wurde bereits aktiviert."
     admin_confirm:
       title: "Admnistrator-Konto bestätigen"
@@ -788,6 +787,10 @@ de:
       title: "Benutzer-zu-Benutzer"
       xaxis: "Tag"
       yaxis: "Anzahl der Nachrichten"
+    user_to_user_private_messages_with_replies:
+      title: "Benutzer-zu-Benutzer (mit Antworten)"
+      xaxis: "Tag"
+      yaxis: "Anzahl der Nachrichten"
     system_private_messages:
       title: "System"
       xaxis: "Tag"
@@ -879,6 +882,10 @@ de:
       title: "Benutzerbesuche"
       xaxis: "Tag"
       yaxis: "Anzahl der Besuche"
+    web_crawlers:
+      title: "Anfragen von Suchmaschinen"
+      xaxis: "Browserkennung"
+      yaxis: "Seitenaufrufe"
   dashboard:
     rails_env_warning: "Dein Server läuft im %{env}-Modus."
     host_names_warning: "Deine config/database.yml-Datei verwendet localhost als Hostname. Trage hier den Hostnamen deiner Website ein."
@@ -1018,6 +1025,8 @@ de:
     blacklist_ip_blocks: "Eine Liste von privaten IP-Blöcken, die nie von Discourse indiziert werden sollen"
     whitelist_internal_hosts: "Eine Liste interner Hostnamen, die Discourse sicher abrufen kann für Oneboxing und andere Zwecke"
     allowed_iframes: "Eine Liste von iframe-src-Domain-Präfixen, die Discourse in Beiträgen sicher erlauben kann."
+    whitelisted_crawler_user_agents: 'Positivliste mit Browserkennungen von Suchmaschinen, die Zugriff auf die Seite haben sollen.'
+    slow_down_crawler_rate: 'Wenn slow_down_crawler_user_agents ausgewählt ist, wird diese Anfragenbegrenzung auf alle Suchmaschinen angewendet (Anzahl der Sekunden zwischen zwei Anfragen)'
     top_menu: "Legt fest, welche Elemente in der Navigationsleiste der Startseite auftauchen sollen, und in welcher Reihenfolge. Beispiel: latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Legt fest, welche Funktionen in welcher Reihenfolge im Beitragsmenü auftauchen. Beispiel: like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Die Einträge im Menü eines Beitrags, die standardmäßig hinter einer erweiterbaren Ellipse versteckt werden sollen."
@@ -1378,6 +1387,7 @@ de:
     approve_post_count: "Anzahl der Beiträge eines neuen Benutzer oder Anwärters, die genehmigt werden müssen"
     approve_unless_trust_level: "Beiträge von Benutzer unterhalb dieser Vertrauensstufe müssen genehmigt werden"
     approve_new_topics_unless_trust_level: "Beiträge von Benutzer unterhalb dieser Vertrauensstufe müssen genehmigt werden"
+    approve_unless_staged: "Neue Themen und Beiträge für vorbereitete Benutzer müssen genehmigt werden"
     notify_about_queued_posts_after: "Wenn es Beiträge gibt, die länger als diese Anzahl an Stunden auf ihre Überprüfung warten, sende eine Benachrichtigung an alle Moderatoren. Setze die Einstellung auf 0, um diese Benachrichtigungen zu deaktivieren."
     auto_close_messages_post_count: "Maximale Anzahl von Beiträgen, die in einer Nachricht erlaubt sind, bevor sie automatisch geschlossen wird (0 = ausgeschaltet)"
     auto_close_topics_post_count: "Maximale Anzahl von Beiträgen, die in einem Thema erlaubt sind, bevor es automatisch geschlossen wird (0 = ausgeschaltet)"
@@ -1841,6 +1851,8 @@ de:
         Wird der Beitrag allerdings ein zweites Mal von der Community ausgeblendet, bleibt er dies, bis er vom Team bearbeitet wurde.
 
         Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
+    post_hidden_again:
+      title: "Beitrag wieder ausgeblendet"
     usage_tips:
       text_body_template: |
         Für einige schnelle Tipps, um als neuer Benutzer loszulegen, [schaue einmal diesen Blog-Beitrag an](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2463,7 +2475,7 @@ de:
       popular_posts: "Beliebte Beiträge"
       more_new: "Neu für dich"
       subject_template: "[%{email_prefix}] Zusammenfassung"
-      unsubscribe: "Diese Zusammenfassung wird von %{site_link} versendet, wenn wir dich einige Zeit lang nicht gesehen haben. Ändere %{email_preferences_link} oder %{unsubscribe_link}zum Abbestellen."
+      unsubscribe: "Diese Zusammenfassung wird von %{site_link} versendet, wenn wir dich einige Zeit lang nicht gesehen haben. Ändere %{email_preferences_link} oder %{unsubscribe_link} zum Abbestellen."
       your_email_settings: "deine E-Mail-Einstellungen"
       click_here: "klicke hier"
       from: "Zusammenfassung für %{site_name}"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 5cc244e7b8..7280e075d9 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -219,8 +219,6 @@ el:
   queue:
     delete_reason: "Διαγράφτηκαν μέσω της ουράς επανελέγχου "
   groups:
-    success:
-      bulk_add: "%{users_added} χρήστες προστέθηκαν στην ομάδα."
     errors:
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
       invalid_domain: "'%{domain}' δεν είναι έγκυρο domain."
@@ -450,22 +448,6 @@ el:
     image_placeholder:
       broken: "Η εικόνα είναι χαλασμένη"
   rate_limiter:
-    slow_down: "Η εντολή αυτή έχει εκτελεστεί πάρα πολλές φορές, δοκιμάστε ξανά αργότερα."
-    by_type:
-      first_day_replies_per_day: "Έχετε φτάσει τον μέγιστο αριθμό απαντήσεων που δικαιούται ένας νέος χρήστης την πρώτη του μέρα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      first_day_topics_per_day: "Έχεται φτάσει τον μέγιστο αριθμό θεμάτων που δικαιούται ένας νέος χρήστης την πρώτη του μέρα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      create_topic: "Δημιουργείτε θέματα πολύ γρήγορα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      create_post: "Η απάντησή σας ήταν πολύ γρήγορη. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      delete_post: "Διαγράφετε πολύ γρήγορα τις αναρτήσεις.  Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
-      public_group_membership: "Συνδέεστε και αποσυνδέεστε πολύ συχνά. περιμένετε %{time_left} πριν δοκιμάσετε ξανά"
-      topics_per_day: "Έχεις φτάσει το ανώτατο όριο νέων νημάτων για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      pms_per_day: "Έχεις φτάσει το ανώτατο όριο μηνυμάτων για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      create_like: "Έχεις φτάσει το ανώτατο όριο των \"μου αρέσει\" για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      create_bookmark: "Έχεις φτάσει το ανώτατο όριο σελιδοδεικτών για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      edit_post: "Έχεις φτάσει το ανώτατο όριο επεξεργασιών για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      live_post_counts: "Ζητάς την ανανέωση του μετρητή αναρτήσεων πολύ γρήγορα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      unsubscribe_via_email: "Έχεις φτάσει το ανώτατο όριο απεγγραφών μέσω email για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      topic_invitations_per_day: "Έχεις φτάσει το ανώτατο όριο προσκλήσεων σε νήματα για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
     hours:
       one: "1 ώρα"
       other: "%{count} ώρες"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 761d2591c7..879b47c916 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -293,8 +293,11 @@ en:
 
   groups:
     success:
-      bulk_add: "%{users_added} users have been added to the group."
+      bulk_add:
+        one: "%{count} user have been added to the group."
+        other: "%{count} users have been added to the group."
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' is not a valid trust level."
       can_not_modify_automatic: "You cannot modify an automatic group"
       member_already_exist:
         one: "'%{username}' is already a member of this group."
@@ -560,23 +563,23 @@ en:
       broken: "This image is broken"
 
   rate_limiter:
-    slow_down: "You have performed this action too many times, try again later."
-    too_many_requests: "You have performed this action too many times. Please wait %{time_left} before trying again."
+    slow_down: "You’ve performed this action too many times, please try again later."
+    too_many_requests: "You’ve performed this action too many times. Please wait %{time_left} before trying again."
     by_type:
-      first_day_replies_per_day: "You've reached the maximum number of replies a new user can create on their first day. Please wait %{time_left} before trying again."
-      first_day_topics_per_day: "You've reached the maximum number of topics a new user can create on their first day. Please wait %{time_left} before trying again."
-      create_topic: "You're creating topics too quickly. Please wait %{time_left} before trying again."
-      create_post: "You're replying too quickly. Please wait %{time_left} before trying again."
-      delete_post: "You're deleting posts too quickly. Please wait %{time_left} before trying again."
-      public_group_membership: "You're joining/leaving groups too frequently. Please wait %{time_left} before trying again."
-      topics_per_day: "You've reached the maximum number of new topics today. Please wait %{time_left} before trying again."
-      pms_per_day: "You've reached the maximum number of messages today. Please wait %{time_left} before trying again."
-      create_like: "You've reached the maximum number of likes today. Please wait %{time_left} before trying again."
-      create_bookmark: "You've reached the maximum number of bookmarks today. Please wait %{time_left} before trying again."
-      edit_post: "You've reached the maximum number of edits today. Please wait %{time_left} before trying again."
-      live_post_counts: "You're asking for live post counts too quickly. Please wait %{time_left} before trying again."
-      unsubscribe_via_email: "You've reached the maximum number of unsubscribe via email today. Please wait %{time_left} before trying again."
-      topic_invitations_per_day: "You've reached the maximum number of topic invitations today. Please wait %{time_left} before trying again."
+      first_day_replies_per_day: "You’ve reached the maximum number of replies a new user can create on their first day. Please wait %{time_left} before trying again."
+      first_day_topics_per_day: "You’ve reached the maximum number of topics a new user can create on their first day. Please wait %{time_left} before trying again."
+      create_topic: "You’re creating topics too quickly. Please wait %{time_left} before trying again."
+      create_post: "You’re replying too quickly. Please wait %{time_left} before trying again."
+      delete_post: "You’re deleting posts too quickly. Please wait %{time_left} before trying again."
+      public_group_membership: "You’re joining/leaving groups too frequently. Please wait %{time_left} before trying again."
+      topics_per_day: "You’ve reached the maximum number of new topics. Please wait %{time_left} before trying again."
+      pms_per_day: "You’ve reached the maximum number of messages. Please wait %{time_left} before trying again."
+      create_like: "You’ve reached the maximum number of likes. Please wait %{time_left} before trying again."
+      create_bookmark: "You’ve reached the maximum number of bookmarks. Please wait %{time_left} before trying again."
+      edit_post: "You’ve reached the maximum number of edits. Please wait %{time_left} before trying again."
+      live_post_counts: "You’re asking for live post counts too quickly. Please wait %{time_left} before trying again."
+      unsubscribe_via_email: "You’ve reached the maximum number of unsubscribes via email. Please wait %{time_left} before trying again."
+      topic_invitations_per_day: "You’ve reached the maximum number of topic invitations. Please wait %{time_left} before trying again."
 
     hours:
       one: "1 hour"
@@ -873,6 +876,10 @@ en:
       title: "User-to-User"
       xaxis: "Day"
       yaxis: "Number of messages"
+    user_to_user_private_messages_with_replies:
+      title: "User-to-User (with replies)"
+      xaxis: "Day"
+      yaxis: "Number of messages"
     system_private_messages:
       title: "System"
       xaxis: "Day"
@@ -964,6 +971,10 @@ en:
       title: "User Visits"
       xaxis: "Day"
       yaxis: "Number of visits"
+    web_crawlers:
+      title: "Web Crawler Requests"
+      xaxis: "User Agent"
+      yaxis: "Pageviews"
 
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
@@ -1115,6 +1126,10 @@ en:
     blacklist_ip_blocks: "A list of private IP blocks that should never be crawled by Discourse"
     whitelist_internal_hosts: "A list of internal hosts that discourse can safely crawl for oneboxing and other purposes"
     allowed_iframes: "A list of iframe src domain prefixes that discourse can safely allow in posts"
+    whitelisted_crawler_user_agents: 'User agents of web crawlers that should be allowed to access the site.'
+    blacklisted_crawler_user_agents: 'Unique case insensitive word in the user agent string identifying web crawlers that should not be allowed to access the site. Does not apply if whitelist is defined.'
+    slow_down_crawler_user_agents: 'User agents of web crawlers that should be rate limited in robots.txt using the Crawl-delay directive'
+    slow_down_crawler_rate: 'If slow_down_crawler_user_agents is specified this rate will apply to all the crawlers (number of seconds delay between requests)'
     top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "The menu items to hide by default in the post menu unless an expansion ellipsis is clicked on."
@@ -1170,6 +1185,7 @@ en:
     sso_url: "URL of single sign on endpoint (must include http:// or https://)"
     sso_secret: "Secret string used to cryptographically authenticate SSO information, be sure it is 10 characters or longer"
     sso_overrides_bio: "Overrides user bio in user profile and prevents user from changing it"
+    sso_overrides_groups: "Synchronize all manual group membership with groups specified in the groups sso attribute (WARNING: if you do not specify groups all manual group membership will be cleared for user)"
     sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to normalization of local emails)"
     sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)"
     sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes."
@@ -1584,6 +1600,7 @@ en:
     approve_post_count: "The amount of posts from a new or basic user that must be approved"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
     approve_new_topics_unless_trust_level: "New topics for users below this trust level must be approved"
+    approve_unless_staged: "New topics and posts for staged users 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, send a notification to all moderators. Set to 0 to disable these notifications."
     auto_close_messages_post_count: "Maximum number of posts allowed in a message before it is automatically closed (0 to disable)"
     auto_close_topics_post_count: "Maximum number of posts allowed in a topic before it is automatically closed (0 to disable)"
@@ -2091,6 +2108,22 @@ en:
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
 
+    post_hidden_again:
+      title: "Post Hidden again"
+      subject_template: "Post hidden by community flags, staff notified"
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that your post was hidden again.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Multiple community members flagged this post before it was hidden. **Because this post has been hidden more than once, your post will now remain hidden until it is handled by a staff member.**
+
+        For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
+
     usage_tips:
       text_body_template: |
         For a few quick tips on getting started as a new user, [check out this blog post](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -3599,6 +3632,7 @@ en:
     title: "Tags"
     staff_tag_disallowed: "The tag \"%{tag}\" may only be applied by staff."
     staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff."
+    minimum_required_tags: "You must select at least %{count} tags."
   rss_by_tag: "Topics tagged %{tag}"
 
   finish_installation:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index bd25fe8acf..8979d5ff18 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -29,18 +29,39 @@ es:
   loading: "Cargando"
   powered_by_html: 'Funciona gracias a <a href="https://www.discourse.org">Discourse</a>, se ve mejor con JavaScript activado'
   log_in: "Iniciar sesión"
+  submit: "Enviar"
   purge_reason: "Cuenta eliminada automáticamente al detectarse como abandonada, desactivada"
   disable_remote_images_download_reason: "La descarga de imágenes remotas se desactivó porque no había suficiente espacio disponible en disco."
   anonymous: "Anónimos"
   remove_posts_deleted_by_author: "Eliminado por su autor"
+  redirect_warning: "No hemos podido comprobar que el enlace que has seleccionado haya sido publicado en el foro. Si quieres continuar aun así, selecciona el enlace abajo."
   themes:
     bad_color_scheme: "No puedes actualizar theme, esquema de color inválido"
     other_error: "Algo salió mal actualizando el theme"
+    error_importing: "Error al clonar el repositorio de git. El acceso ha sido denegado o el repositorio no se encuentra."
+    settings_errors:
+      invalid_yaml: "El YAML no es válido."
+      data_type_not_a_number: "El tipo de ajuste `%{name}` no está soportado. Los tipos soportados son `integer`, `bool`, `list` y `enum`"
+      name_too_long: "Hay un ajuste con un nombre demasiado largo. La longitud máxima es 255"
+      default_value_missing: "El ajuste `%{name}` no tiene un valor por defecto"
+      default_not_match_type: "El tipo del valor por defecto del ajuste `%{name}`  no coincide con el tipo del ajuste"
+      default_out_range: "El valor por defecto del ajuste `%{name}` no está en el rango especificado."
+      enum_value_not_valid: "El valor seleccionado no es una de las opciones"
+      number_value_not_valid: "El nuevo valor está fuera del rango permitido"
+      number_value_not_valid_min_max: "Debe ser entre %{min} y %{max}."
+      number_value_not_valid_min: "Debe ser mayor o igual que %{min}."
+      number_value_not_valid_max: "Debe ser más pequeño o igual que %{max}."
+      string_value_not_valid: "La longitud del nuevo valor está fuera del rango permitido."
+      string_value_not_valid_min_max: "Debe tener entre %{min} y %{max} caracteres de longitud."
+      string_value_not_valid_min: "Debe tener al menos %{min} caracteres."
+      string_value_not_valid_max: "Debe tener al menos %{max} caracteres de longitud."
   emails:
     incoming:
       default_subject: "Este tema necesita un título"
       show_trimmed_content: "Mostrar contenido recortado"
       maximum_staged_user_per_email_reached: "Alcanzado el número máximo de usuarios provisionales creados por email."
+      no_subject: "(sin asunto)"
+      no_body: "(sin contenido)"
       errors:
         empty_email_error: "Sucede cuando el texto en bruto del email que recibimos está en blanco."
         no_message_id_error: "Sucede cuando el email no tiene Id del mensaje en el encabezado."
@@ -88,6 +109,8 @@ es:
       not_an_integer: debe ser un valor entero
       odd: debe ser impar
       record_invalid: 'Error en la validación: %{errors}'
+      max_emojis: "no puedes tener más de %{max_emojis_count} emojis"
+      ip_address_already_screened: "ya está incluido en una regla existente"
       restrict_dependent_destroy:
         one: "No se pudo eliminar el registro porque existe otro %{record} dependiente"
         many: "No se puede eliminar el registro porque existen otros %{record} dependientes"
@@ -129,6 +152,7 @@ es:
     backup_file_should_be_tar_gz: "El archivo de la copia de seguridad debería ser del tipo .tar.gz"
     not_enough_space_on_disk: "No hay espacio suficiente en el disco para subir esta copia de seguridad."
     invalid_filename: "El nombre de archivo del backup contiene caracteres no válidos. Los válidos son a-z 0-9 . - _."
+  invalid_params: "Has incluido parámetros no válidos a la solicitud: %{message}"
   not_logged_in: "Tienes que iniciar sesión para hacer eso."
   not_found: "No se ha podido encontrar la URL o recurso solicitado."
   invalid_access: "No tienes permiso para ver el recurso solicitado."
@@ -165,6 +189,7 @@ es:
   too_many_mentions_newuser:
     one: "Lo sentimos, pero los usuarios nuevos solo pueden mencionar a un usuario en un post."
     other: "Lo sentimos, pero los usuarios nuevos solo pueden mencionar a %{count} usuarios en un post."
+  no_images_allowed_trust: "Lo sentimos, pero no puedes incluir imágenes en tus mensajes en estos momentos"
   no_images_allowed: "Lo sentimos, pero los usuarios nuevos no pueden poner imágenes en los mensajes."
   too_many_images:
     one: "Lo sentimos, pero los usuarios nuevos solo pueden poner una imagen por post."
@@ -174,9 +199,11 @@ es:
     one: "Lo sentimos, los usuarios nuevos solo pueden adjuntar un archivo por post"
     other: "Lo sentimos, los usuarios nuevos solo pueden adjuntar %{count} archivos por post."
   no_links_allowed: "Lo sentimos, los nuevos usuarios no pueden poner enlaces en los posts."
+  links_require_trust: "Lo sentimos, pero no puedes incluir enlaces en tus mensajes en estos momentos"
   too_many_links:
     one: "Lo sentimos, los nuevos usuarios solo pueden poner un link en un post."
     other: "Lo sentimos, los nuevos usuarios solo pueden poner %{count} enlaces en un post."
+  contains_blocked_words: "Tu mensaje contiene una palabra no permitida: %{word}"
   spamming_host: "Lo sentimos, no puedes publicar un enlace a esa web."
   user_is_suspended: "A los usuarios suspendidos no se les permite publicar."
   topic_not_found: "Algo ha salido mal. ¿Tal vez este tema ha sido cerrado o eliminado mientras estabas lo estabas mirando?"
@@ -208,7 +235,7 @@ es:
     top_weekly: "Semanal: Temas Top"
     top_daily: "Diario: Temas Top"
     posts: "Últimos posts"
-    private_posts: "Últimos mensajes personale"
+    private_posts: "Últimos mensajes personales"
     group_posts: "Últimos posts de %{group_name}"
     group_mentions: "Últimas menciones de %{group_name}"
     user_posts: "Posts recientes por @%{username}"
@@ -223,9 +250,11 @@ es:
     not_found: "Post no encontrado o ya actualizado."
   groups:
     success:
-      bulk_add: "%{users_added} usuarios han sido agregados al grupo."
+      bulk_add: "Se han añadido %{count} usuarios al grupo"
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' no es un nivel de confianza válido"
       can_not_modify_automatic: "No se puede modificar un grupo automático"
+      member_already_exist: "Los siguientes usuarios ya son miembros de este grupo: %{username}"
       invalid_domain: "'%{domain}' no es un dominio válido."
       invalid_incoming_email: "'%{email}' no es una dirección de email válida."
       email_already_used_in_group: "'%{email}' ya está siendo utilizado por el grupo '%{group_name}'."
@@ -308,7 +337,7 @@ es:
 
       La última respuesta a este tema fue **%{time_ago}**. Tu respuesta revivirá el tema y lo subirá al principio de la lista, notificando a los que hayan participado anteriormente.
 
-      ¿Seguro que quieres continuar este conversación antigua?
+      ¿Seguro que quieres continuar esta conversación antigua?
   activerecord:
     attributes:
       category:
@@ -330,6 +359,7 @@ es:
               cant_send_pm: "Lo sentimos, no puedes enviarle mensajes personales a ese usuario."
               no_user_selected: "Debes seleccionar un usuario válido."
               reply_by_email_disabled: "Respuestas por email han sido desactivadas."
+              target_user_not_found: "Uno de los usuarios a los que le estás enviando el mensaje no ha sido encontrado."
             featured_link:
               invalid: "es inválido. La dirección debería incluir http:// o https://."
               invalid_category: "no puede ser editado en esta categoría."
@@ -426,10 +456,11 @@ es:
 
         [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
-    topic_prefix: "Definición de la categoría %{category}"
+    topic_prefix: "Acerca de la categoría %{category}"
     replace_paragraph: "(Sustituye este primer párrafo con una descripción breve de tu nueva categoría. Esta descripción aparecerá en el área de selección de categoría, por ello, intenta que sea inferior a 200 caracteres. **Hasta que edites esta descripción o se creen temas, esta categoría no aparecerá en la página de categorías.**)"
     post_template: "%{replace_paragraph}\n\nUtiliza los siguientes párrafos para una descripción más detallada, o establece las directrices o reglas de la categoría::\n\n- ¿Para qué podrían usar los usuarios esta categoría? ¿De qué trata?\n\n- ¿Cómo se distingue de otras categorías existentes?\n\n- ¿Qué temas debería contener esta categoría normalmente?\n\n- ¿Necesitamos esta categoría? ¿Podría agruparse o converger con otra categoría o subcategoría?\n"
     errors:
+      not_found: "¡Categoría no encontrada!"
       uncategorized_parent: "Sin categoría no puede tener categoría primaria"
       self_parent: "La categoría primaria de una subcategoría no puede ser ella misma."
       depth: "No se puede anidar una subcategoría debajo de otra"
@@ -461,22 +492,23 @@ es:
     image_placeholder:
       broken: "Esta imagen está rota"
   rate_limiter:
-    slow_down: "Has realizado esta acción muchas veces, inténtalo de nuevo más tarde."
+    slow_down: "Has realizado esta acción muchas veces, por favor inténtalo de nuevo más tarde."
+    too_many_requests: "Has realizado esta acción demasiadas veces. Por favor, espera %{time_left} antes de volverlo a intentar."
     by_type:
       first_day_replies_per_day: "Has llegado al límite de respuestas que un nuevo usuario puede crear en su primer día. Por favor, espera %{time_left} antes de intentarlo de nuevo."
       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."
+      delete_post: "Estás eliminando mensajes demasiado rápido. Por favor espera %{time_left} antes de intentarlo de nuevo."
       public_group_membership: "Estás uniéndote o saliendo de grupos con mucha frecuencia. Por favor, espera %{time_left} antes de volver a intentarlo."
-      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."
+      topics_per_day: "Has llegado al límite de nuevos temas. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      pms_per_day: "Has llegado al límite de mensajes. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      create_like: "Has llegado al límite de Me gusta. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      create_bookmark: "Has llegado al límite de marcadores. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      edit_post: "Has llegado al límite de ediciones. 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."
+      unsubscribe_via_email: "Has alcanzado el máximo de bajas de suscripción vía email. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+      topic_invitations_per_day: "Has alcanzado el máximo de invitaciones a temas. Por favor, espera %{time_left} antes de intentarlo de nuevo."
     hours:
       one: "1 hora"
       other: "%{count} horas"
@@ -566,6 +598,9 @@ es:
     title: 'Restablecer contraseña'
     success: "Has cambiado tu contraseña correctamente y ahora has iniciado sesión."
     success_unapproved: "Has cambiado tu password correctamente."
+  email_login:
+    invalid_token: "Lo sentimos, este enlace de inicio de sesión por email es demasiado antiguo. Selecciona el botón de Iniciar sesión y usa la opción 'Olvidé mi contraseña' para obtener un nuevo enlace. "
+    title: "Inicio de sesión con email"
   change_email:
     confirmed: "Tu email ha sido actualizado."
     please_continue: "Continuar a %{site_name}"
@@ -610,6 +645,8 @@ es:
       long_form: 'reportado como inapropiado'
     notify_user:
       title: 'Enviar un mensaje a @{{username}}'
+      description: 'Quiero hablar con esta persona de forma directa y personal sobre su mensaje.'
+      short_description: 'Quiero hablar con esta persona de forma directa y personal sobre su mensaje.'
       long_form: 'usuario notificado vía mensaje'
       email_title: 'Tu publicación en "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -753,6 +790,10 @@ es:
       title: "Usuario a usuario"
       xaxis: "Día"
       yaxis: "Número de mensajes"
+    user_to_user_private_messages_with_replies:
+      title: "De usuario a usuario (con respuesta)"
+      xaxis: "Día"
+      yaxis: "Número de mensajes"
     system_private_messages:
       title: "Sistema"
       xaxis: "Día"
@@ -844,6 +885,10 @@ es:
       title: "Visitas de Usuarios"
       xaxis: "Día"
       yaxis: "Número de visita"
+    web_crawlers:
+      title: "Solicitudes de crawlers"
+      xaxis: "Agente del usuario"
+      yaxis: "Páginas vistas"
   dashboard:
     rails_env_warning: "Tu servidor está funcionando en modo de %{env}."
     host_names_warning: "Tu archivo 'config/database.yml' está utilizando un hostname predeterminado de 'localhost'. Actualízalo para usar el hostname de tu sitio."
@@ -863,21 +908,28 @@ es:
     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."
+    missing_mailgun_api_key: "El servidor está configurado para enviar emails con Mailgun pero no has añadido una clave de API para verificar los mensajes de webhook."
     bad_favicon_url: "El favicon está dando fallos en su carga. Revisa la opción favicon_url en <a href='/admin/site_settings'>Ajustes del sitio</a>."
     poll_pop3_timeout: "La conexión al servidor POP3 está rebasando el tiempo de espera. Los emails entrantes no han podido ser recogidos. Por favor revisa los <a href='/admin/site_settings/category/email'>ajustes de POP3</a> y tu proveedor de servicio."
     poll_pop3_auth_error: "La conexión al servidor POP3 está fallando debido a un error de autenticación. Por favor revisa los <a href='/admin/site_settings/category/email'>ajustes POP3</a>."
+    force_https_warning: "La página está usando SSL, pero el ajuste `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` no está activado."
   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 este sitio de Discourse"
     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)"
+    support_mixed_text_direction: "Aceptar mezcla de textos tanto de derecha a izquierda como de izquierda a derecha."
     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_personal_message_post_length: "La longitud mínima en caracteres para los mensajes personales"
     max_post_length: "Extensión máxima de los posts, en número de caracteres"
     topic_featured_link_enabled: "Activar publicar temas a partir de un enlace."
     show_topic_featured_link_in_digest: "Mostrar el enlace destacado por el tema en el email de resumen."
     min_topic_title_length: "Extensión mínima del título de los temas, en número de caracteres"
     max_topic_title_length: "Extensión máxima del título de los temas, en número de caracteres"
+    min_personal_message_title_length: "La longitud mínima en caracteres para los títulos de los mensajes personales"
+    max_emojis_in_title: "Número máximo de emojis que se pueden incluir en el título de un tema"
     min_search_term_length: "Extensión mínima de una búsqueda válida, en número de caracteres"
     search_tokenize_chinese_japanese_korean: "Forzar la búsqueda a tokenizar Chino/Japonés/Coreano incluso en sitios que no basados en esos idiomas"
     search_prefer_recent_posts: "Si la búsqueda en tu foro gigante es lenta, esta opción prueba primero un índice de posts más recientes"
@@ -898,6 +950,8 @@ es:
     download_remote_images_max_days_old: "No descargar imágenes remotas de posts que sean más antiguos de n días."
     disabled_image_download_domains: "Las imágenes remotas que provengan de estos dominios no serán descargadas. Lista delimitada por barras."
     editing_grace_period: "Durante (n) segundos después de publicar un post, se puede editar ese post sin crear una nueva versión en el historial."
+    editing_grace_period_max_diff: "El número de caracteres que se permitirán cambiar en el periodo de gracia de edición, si se cambian más se creará una nueva revisión (niveles de confianza 0 y 1)"
+    editing_grace_period_max_diff_high_trust: "El número de caracteres que se permitirán cambiar en el periodo de gracia de edición, si se cambian más se creará una nueva revisión (niveles de confianza 2 y superiores)"
     staff_edit_locks_post: "Los mensajes serán bloqueados y no podrán ser editados por usuarios si son editados por miembros del staff."
     post_edit_time_limit: "El autor puede editar o eliminar su post durante (n) minutos después de publicarlo. Pon un 0 para que pueda hacerlo siempre."
     edit_history_visible_to_public: "Permitir a todos ver las versiones previas de un post editado. Si se deshabilita, solo los miembros del staff podrán verlas."
@@ -933,6 +987,7 @@ es:
     summary_likes_required: "Mínimo de \"me gusta\" en un tema para habilitar 'Resumen de este tema'"
     summary_percent_filter: "Cuando un usuario hace clic en 'Resumen de este tema', se muestra el n % mejores posts"
     summary_max_results: "Máximo de posts devueltos en \"Resumen de este  tema\""
+    enable_system_message_replies: "Permitir a los usuarios responder a mensajes del sistema incluso si los mensajes personales están desactivados"
     enable_long_polling: "Los mensajes usados para notificaciones pueden usar el long polling"
     long_polling_base_url: "URL base usada para el 'long polling' (cuando un CDN esta sirviendo contenido dinámico, asegúrate de ajustar esto al 'pull' de origen) ejemplo: http://origin.site.com"
     long_polling_interval: "Cantidad de tiempo que el servidor debe de esperar antes de responder a los clientes que no hay datos enviados (solamente usuarios con sesión iniciada)."
@@ -954,6 +1009,8 @@ es:
     flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia."
     traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea."
     enable_markdown_typographer: "Utilice reglas básicas de tipografía para mejorar la legibilidad de texto de los párrafos de texto, reemplaza (c) (tm) etc, con símbolos, reduce el número de signos de interrogación y así sucesivamente"
+    enable_markdown_linkify: "Tratar como enlaces el texto que parezca uno automáticamente: www.sitio.com y http://sitio.com serán enlazados automáticamente"
+    markdown_linkify_tlds: "Lista de dominios de nivel superior que serán tratados automáticamente como enlaces"
     post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en un post (me gusta, reportes, etc)."
     must_approve_users: "Los miembros administración deben aprobar todas las nuevas cuentas antes de que se les permita el acceso al sitio. AVISO: ¡habilitar esta opción en un sitio activo revocará el acceso a los usuarios que no sean moderadores o admin!"
     pending_users_reminder_delay: "Notificar a los moderadores si hay nuevos usuarios que hayan estado esperando aprbación durante más estas horas. Usa -1 para desactivar estas notificaciones."
@@ -1021,6 +1078,7 @@ es:
     sso_not_approved_url: "Redireccionar cuentas SSO sin aprobar a esta URL"
     sso_allows_all_return_paths: "No restringe el dominio para return_paths provisto por SSO (por defecto, el return_paths debe ser sobre el sitio actual)."
     enable_local_logins: "Habilitar las cuentas con nombre de usuario y contraseña de forma local. (Nota: esto debe estar habilitado para que funcionen las invitaciones)"
+    enable_local_logins_via_email: "Permitir a los usuarios solicitar un enlace de un solo uso para iniciar sesión rápidamente, que les será enviado por email"
     allow_new_registrations: "Permitir el registro de nuevos usuarios. Desactiva esta opción para prevenir que nadie pueda crear una nueva cuenta."
     enable_signup_cta: "Mostrar un aviso a los usuarios anónimos que vuelvan a visitar el sitio animándoles a registrarse."
     enable_yahoo_logins: "Activar autenticación por Yahoo"
@@ -1043,6 +1101,7 @@ es:
     allow_restore: "Permitir restauración, la cual puede sobreescribir TODOS los datos del sitio! Dejela en falso a menos que tenga planeado recuperar sus datos desde una copia de respaldo. "
     maximum_backups: "La cantidad máxima de copias de seguridad a tener en el disco. Las copias de seguridad más antiguas se eliminan automáticamente"
     automatic_backups_enabled: "Ejecutar backups automáticos definidos por la opción de frecuencia de backups"
+    backup_frequency: "Número de días entre copias de seguridad."
     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."
@@ -1064,6 +1123,7 @@ es:
     max_bookmarks_per_day: "Máximo número de marcadores por usuario y día."
     max_edits_per_day: "Máximo número de ediciones por usuario y día."
     max_topics_per_day: "Máximo número de temas que un usuario puede crear al día."
+    max_personal_messages_per_day: "Máximo número de mensajes personales que los usuarios pueden crear por 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."
     max_logins_per_ip_per_hour: "Máximo número de inicios de sesión permitidos por direcciones IP por hora."
@@ -1120,10 +1180,16 @@ es:
     tl3_requires_likes_given: "El mínimo número de me gusta que un usuario debe dar en los últimos (tl3 time period) días para promocionar a nivel de confianza 3."
     tl3_requires_likes_received: "El mínimo número de me gusta que un usuario debe recibir en los últimos (tl3 time period) días para promocionar a nivel de confianza 3."
     tl3_links_no_follow: "No remover rel=nofollow de los enlaces publicados por usuarios con nivel de confianza 3."
+    trusted_users_can_edit_others: "Permitir a usuarios con niveles de confianza altos editar contenido de otros usuarios"
     min_trust_to_create_topic: "El mínimo nivel de confianza requerido para crear un nuevo tema."
+    allow_flagging_staff: "Si se activa, los usuarios pueden reportar mensajes publicados por miembros del staff"
     min_trust_to_edit_wiki_post: "El mínimo nivel de confianza requerido para editar un post marcado como wiki."
     min_trust_to_edit_post: "El mínimo nivel de confianza requerido para editar posts."
     min_trust_to_allow_self_wiki: "El mínimo nivel de confianza requerido para que un usuario convierta sus propios posts a wiki."
+    min_trust_to_send_messages: "El nivel de confianza mínimo necesario para crear nuevos mensajes personales."
+    min_trust_to_flag_posts: "El nivel de confianza mínimo necesario para reportar posts"
+    min_trust_to_post_links: "El nivel de confianza mínimo necesario para incluir enlace en posts"
+    min_trust_to_post_images: "El nivel de confianza mínimo necesario para incluir imágenes en un post"
     newuser_max_links: "Cuántos enlaces puede un nuevo usuario añadir a un post."
     newuser_max_images: "Cuántas imágenes puede un nuevo usuario añadir a un post."
     newuser_max_attachments: "Cuántos adjuntos puede un nuevo usuario añadir a un post."
@@ -1134,6 +1200,7 @@ es:
     enable_mentions: "Permitir a los usuarios mencionar a otros usuarios."
     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."
+    personal_email_time_window_seconds: "Esperar (n) segundos antes de enviar notificaciones de nuevos mensajes personales por email para dar la oportunidad de editar y terminar sus mensajes a los usuarios."
     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."
@@ -1149,6 +1216,7 @@ es:
     max_image_size_kb: "El tamaño máximo, en kB, para subir imágenes. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     max_attachment_size_kb: "El tamaño máximo, en kB, para adjuntar archivos. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     authorized_extensions: "Una lista de las extensiones de archivo permitidas para subir (usa \"*\" para habilitar todos los tipos de archivo)"
+    authorized_extensions_for_staff: "Una lista de extensiones de archivo que el staff puede subir además de la lista definida en el ajuste `authorized_extensions` (usar '*' para permitir todos los tipos de archivo)"
     theme_authorized_extensions: "Una lista de las extensiones de archivo permitidas para subir (usa \"*\" para habilitar todos los tipos)"
     max_similar_results: "Cuántos temas similares se mostrarán encima del editor cuando estés creando un nuevo tema. La comparación se basa en el título y el cuerpo del tema."
     max_image_megapixels: "Máximo de megapíxeles permitidos por una imagen."
@@ -1190,6 +1258,7 @@ es:
     reply_by_email_enabled: "Habilitar la respuesta a temas por email."
     reply_by_email_address: "Plantilla para la dirección de email que aparecerá al recibir correos con la función de respuesta por email: %{reply_key}@respuesta.ejemplo.com o respuestas+%{reply_key}@ejemplo.com"
     alternative_reply_by_email_addresses: "Lista de plantillas alternativa para las direcciones de respuesta por email. Ejemplo: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "Usar HTML en vez de texto para email entrante"
     disable_emails: "Impedir que Discourse envíe cualquier tipo de emails"
     strip_images_from_short_emails: "Remover imágenes de e-mails que tengan un tamaño menor a 2800 Bytes"
     short_email_length: "e-mail corto longitud en Bytes"
@@ -1263,6 +1332,7 @@ es:
     hide_user_profiles_from_public: "Desactiva las tarjetas de usuario, los perfiles y el directorio de usuarios para usuarios anónimos."
     show_inactive_accounts: "Permitir a los usuarios con sesión iniciada ver perfiles de cuentas inactivas."
     hide_suspension_reasons: "No mostrar la razón de suspensión públicamente en el perfil de usuario."
+    log_personal_messages_views: "Registrar en el log cuando los Administradores vean mensajes personales de otros usuarios/grupos."
     user_website_domains_whitelist: "El sitio web del usuario será automáticamente verificado con estos dominios. Lista delimitada por barras |"
     allow_profile_backgrounds: "Permitir a los usuarios subir sus propios fondos de perfil personalizados."
     sequential_replies_threshold: "Número de mensajes que un usuario tiene que publicar seguidos antes de que se le recuerde sobre demasiadas respuestas consecutivas."
@@ -1294,12 +1364,14 @@ es:
     allowed_href_schemes: "Esquemas permitidos en enlaces además de http y https."
     embed_post_limit: "Número máximo de posts a embeber."
     embed_username_required: "Se requiere el nombre de usuario para la creación de temas."
+    notify_about_flags_after: "Si hay reportes que no han sido atendidos después de este número de horas, enviar un mensaje personal al staff. Dejar en 0 para desactivar."
     show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas."
     delete_drafts_older_than_n_days: Eliminar borradores de más de (n) días de antigüedad.
     bootstrap_mode_min_users: "Mínimo número de usuarios requerido para desactivar el modo bootstrap (pon 0 para desactivar esta opción)"
     prevent_anons_from_downloading_files: "Impedir que los usuarios anónimos descarguen archivos. ADVERTENCIA: Esto impedirá que funcione cualquier recurso del sitio publicado como adjunto."
     slug_generation_method: "Elegir un método de generación de slug. 'encoded' generará cadenas con código porciento. 'none' hara que no se genere slug."
     enable_emoji: "Habilitar emoji"
+    enable_emoji_shortcuts: "Los emoticonos comunes como :) :p :( serán convertidos automáticamente a emojis"
     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 que deben ser aprobados de usuarios nuevos o de nivel básico"
@@ -1481,6 +1553,7 @@ es:
   login:
     not_approved: "Tu cuenta aún no ha sido aprobada. Se te notificará por email cuando todo esté listo para iniciar sesión."
     incorrect_username_email_or_password: "Nombre de usuario, dirección de correo o contraseña incorrectos"
+    incorrect_password: "Contraseña incorrecta"
     wait_approval: "Gracias por registrarte. Te notificaremos cuando tu cuenta haya sido aprobada."
     active: "Tu cuenta está activa y lista para usar."
     activate_email: "<p>¡Ya casi has terminado! Te enviamos un correo de activación a <b>%{email}</b>. Por favor sigue las instrucciones de ese correo para activar tu cuenta.</p><p>Si no llega, mira en la carpeta de spam.</p>"
@@ -1503,6 +1576,9 @@ es:
     auth_complete: "Autenticación completa."
     click_to_continue: "Clic aquí para continuar."
     already_logged_in: "Ups, parece que estás intentando aceptar una invitación dirigida a otro usuariol. Si no eres %{current_user}, por favor cierra sesión e inténtalo de nuevo."
+    second_factor_title: "Autentificación de dos factores"
+    second_factor_description: "Por favor, introduce el código de autentificación obtenido en tu aplicación:"
+    invalid_second_factor_code: "Código de autentificación no válido"
   user:
     no_accounts_associated: "No hay cuentas asociadas"
     deactivated: "Ha sido desactivado a causa de muchos rebotes al email '%{email}'."
@@ -1718,6 +1794,8 @@ es:
         Sin embargo, si el mensaje es ocultado por la comunidad una segunda vez, se mantendrá oculto hasta que sea revisado por un miembro del staff.
 
         Para obtener más información sobre el comportamiento esperado, revisa por favor las [directrices de la comunidad](%{base_url}/guidelines).
+    post_hidden_again:
+      title: "Mensaje ocultado de nuevo"
     usage_tips:
       text_body_template: |
         Si quieres unos consejos para empezar, [echa un vistazo a esta entrada de blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2320,6 +2398,15 @@ es:
         Si no quisiste crear una cuenta para  %{email} o cambiar la dirección de correo electrónico, no te preocupes – puedes ignorar este mensaje.
 
         Si tienes alguna pregunta, [contactar a nuestro amigable staff](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "Autentificación de dos factores desactivada"
+      subject_template: "[%{email_prefix}] Autentificación de dos factores desactivada "
+      text_body_template: |
+        La autentificación de dos factores ha sido desactivada en tu cuenta de %{site_name}. Ahora puedes iniciar sesión solo con tu contraseña. No hace falta que nos facilites el código adicional al iniciar sesión.
+
+        Si no has elegido desactivar la autentificación de dos factores, alguien podría tener acceso no autorizado a tu cuenta.
+
+        Si tienes alguna pregunta, [ponte en contacto con nuestro staff](%{base_url}/about).
     digest:
       why: "Un breve resumen de %{site_link} desde tu última visita el %{last_seen_at}"
       since_last_visit: "Desde tu última visita"
@@ -2350,6 +2437,16 @@ es:
 
         Haz clic en el siguiente enlace para cambiar tu contraseña:
         %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "Iniciar sesión con enlace"
+      subject_template: "[%{email_prefix}] Iniciar sesión con enlace"
+      text_body_template: |
+        Aquí tienes tu enlace para iniciar sesión en [%{site_name}](%{base_url}).
+
+        Si no has solicitado este enlace, puedes ignorar sin problema este email.
+
+        Haz clic en el siguiente enlace para iniciar sesión:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Pon una contraseña"
       subject_template: "[%{email_prefix}] Establecer Contraseña"
@@ -2406,6 +2503,21 @@ es:
     signup_after_approval:
       title: "Entra después de ser aprobado"
       subject_template: "¡Tu solicitud ha sido aprobada en %{site_name}!"
+      text_body_template: |
+        ¡Te damos la bienvenida a %{site_name}!
+
+        Un miembro del staff ha aprobado tu cuenta de %{site_name}.
+
+        Ahora puedes acceder a ella iniciando sesión en:
+        %{base_url}
+
+        Si el enlace de arriba no funciona, prueba a copiarlo y pegarlo en la barra de direcciones de tu navegador web.
+
+        %{new_user_tips}
+
+        Creemos en un [comportamiento civilizado de la comunidad](%{base_url}/guidelines) en todo momento.
+
+        ¡Disfruta de tu estancia!
     signup:
       title: "Registrate"
       subject_template: "[%{email_prefix}] Confirma tu nueva cuenta"
@@ -2424,8 +2536,8 @@ es:
     search_title: "Busca en este sitio"
     search_google: "Google"
   offline:
-    title: "No carga app"
-    offline_page_message: "¡Parece que estás offline! Por favor revisa tu conexión a internet e intenta de nuevo."
+    title: "No se ha podido cargar"
+    offline_page_message: "¡Parece que no tienes conexión! Por favor, revisa tu conexión a internet e inténtalo de nuevo."
   login_required:
     welcome_message: |
       ## [Bienvenido a %{title}](#welcome)
@@ -2780,6 +2892,8 @@ es:
     promoter:
       name: Promotor
       description: Invitó a un usuario
+      long_description: |
+        Esta insignia se concede cuanto invitas a alguien a unirse a la comunidad a través del botón de invitar en tu página de usuario o al final de un tema. Invitar amigos que puedan estar interesados en debates específicos es una gran manera de traer gente nueva a la comunidad, así que ¡gracias!
     campaigner:
       name: Paladín
       description: Invitó a 3 usuarios
@@ -2878,6 +2992,8 @@ es:
     first_emoji:
       name: Primer emoji
       description: Utilizó un emoji en un post
+      long_description: |
+        Esta insignia se te concede la primera vez que añades un Emoji a un mensaje :thumbsup:. Los Emoji te permiten mostrar tus emociones en tus mensajes: de alegría :smiley: a tristeza :anguished: o :angry: enfado, y todo lo que esté entre medias :sunglasses:. Basta con escribir : (dos puntos) o pulsar el botón de Emojis en el editor para seleccionar de cientos de opciones :ok_hand:
     first_mention:
       name: Primera mención
       description: Mencionó a un usuario en un post
@@ -2911,6 +3027,9 @@ es:
     badge_title_metadata: "%{display_name} distintivo en %{site_title}"
   admin_login:
     success: "Email enviado"
+    errors:
+      unknown_email_address: "Dirección de email desconocida."
+      invalid_token: "Token inválido."
     email_input: "Email de admin"
     submit_button: "Enviar email"
   performance_report:
@@ -3057,6 +3176,7 @@ es:
           <p>Diviértete, y ¡buena suerte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construyendo tu nueva comunidad!</a></p>
   search_logs:
     graph_title: "Número de búsquedas"
+  joined: "Se unió"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 0a51f14bd5..fa9b3af94d 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -28,6 +28,7 @@ et:
   posts: "postitused"
   loading: "Laetakse"
   log_in: "Logi sisse"
+  submit: "Saada"
   purge_reason: "Kustutatud automaatselt kui mahajäetud, deaktiveeritud konto"
   disable_remote_images_download_reason: "Väliste piltide allalaadimine keelati, kuna polnud polnud piisavalt vaba ruumi."
   anonymous: "Anonüümne"
@@ -355,21 +356,6 @@ et:
       title: "juht"
     change_failed_explanation: "Üritasid alandada %{user_name} tasemele '%{new_trust_level}'. Samas on tal juba tase'%{current_trust_level}'. %{user_name} jääb tasemele '%{current_trust_level}' - kui soovid alandada kasutaja taset, siis lukusta kõigepealt usaldustase."
   rate_limiter:
-    slow_down: "Oled antud seda toimingut liiga palju proovinud. Proovi hiljem uuesti."
-    by_type:
-      first_day_replies_per_day: "Oled ületanud uuele kasutajale esimesel päeval lubatud vastuste limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      first_day_topics_per_day: "Oled ületanud uuele kasutajale esimesel päeval lubatud teemade lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      create_topic: "Lisad teemasid liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid."
-      create_post: "Vastad liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid."
-      delete_post: "Kustutad postitusi liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid."
-      public_group_membership: "Liitud gruppidega/lahkud neist liiga sageli. Palun oota %{time_left} enne kui uuesti proovid."
-      topics_per_day: "Oled ületanud tänaseks lubatud uute teemade lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      pms_per_day: "Oled ületanud tänaseks lubatud sõnumite limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      create_like: "Oled ületanud tänaseks lubatud meeldimiste lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      create_bookmark: "Oled ületanud tänaseks lubatud järjehoidjate lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      live_post_counts: "Küsid postituste reaalajas loendit liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid."
-      unsubscribe_via_email: "Oled ületanud tänaseks lubatud meilitsi tellimuste tühistamise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
-      topic_invitations_per_day: "Oled ületanud tänaseks lubatud teemadesse kutsumise limiidi. Palun oota %{time_left} enne kui uuesti proovid."
     hours:
       one: "1 tund"
       other: "%{count} tundi"
@@ -731,6 +717,24 @@ et:
       text_body_template: |2
 
           %{message}
+    digest:
+      new_topics: "Uued teemad"
+      unread_messages: "Lugemata sõnumid"
+      unread_notifications: "Lugemata teavitused"
+      new_posts: "Uued postitused"
+      new_users: "Uued kasutajad"
+      popular_topics: "Populaarsed teemad"
+      follow_topic: "Jälgi seda teemat"
+      join_the_discussion: "Loe lisa"
+      popular_posts: "Populaarsed postitused"
+      more_new: "Uus sinu jaoks"
+      subject_template: "[%{email_prefix}] Kokkuvõte"
+      your_email_settings: "sinu e-posti seaded"
+      click_here: "kliki siia"
+      from: "%{site_name} kokkuvõte"
+    forgot_password:
+      title: "Unustasin parooli"
+      subject_template: "[%{email_prefix}] Parooli taastamine"
     signup_after_approval:
       subject_template: "Oled saidil %{site_name} heaks kiidetud!"
   page_not_found:
@@ -743,6 +747,9 @@ et:
   terms_of_service:
     title: "Teenuse tingimused"
   deleted: 'kustutatud'
+  image: "pilt"
+  upload:
+    pasted_image_filename: "Asetatud pilt"
   email_log:
     anonymous_user: "Kasutaja on anonüümne"
     seen_recently: "Kasutajat nähti hiljuti"
@@ -751,6 +758,12 @@ et:
     message_to_blank: "message.to on tühi"
     text_part_body_blank: "text_part.body on tühi"
     body_blank: "sisu on tühi"
+  color_schemes:
+    default: "Hele skeem"
+    dark: "Tume skeem"
+    default_theme_name: "Vaikimisi"
+    dark_theme_name: "Tume"
+    light_theme_name: "Hele"
   about: "Teave"
   guidelines: "Juhendid"
   privacy: "Privaatsus"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index a28f822997..e908cabc94 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -201,8 +201,6 @@ fa_IR:
   queue:
     delete_reason: "پاک شد از مدیر زمانبندی نوشته"
   groups:
-    success:
-      bulk_add: "%{users_added} کاربر به گروه اضافه شدند."
     errors:
       can_not_modify_automatic: "نمی‌توانید گروه‌های خودکار را تغییر دهید."
       invalid_domain: "'%{domain}' دامنه معتبری نیست."
@@ -419,22 +417,6 @@ fa_IR:
     image_placeholder:
       broken: "عکس خراب شده است."
   rate_limiter:
-    slow_down: "شما این عمل را بیش از حد انجام داده اید, بعدا دوباره امتحان کنید."
-    by_type:
-      first_day_replies_per_day: "شما به حداکثر تعداد پاسخ هایی که یک کاربر تازه میتواند در روز اولش ایجاد کند رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      first_day_topics_per_day: "شما به حداکثر تعداد موضوعاتی که یک کاربر تازه میتواند در روز اولش ایجاد کند رسیده‌اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      create_topic: "شما  موضوعات را خیلی سریع ایجاد میکنید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      create_post: "شما خیلی سریع پاسخ می‌دهید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      delete_post: "شما نوشته‌ها را بسیار سریع حذف می‌کنید. لطفا %{time_left}  صبر کنید و سبپس دوباره امتحان کنید."
-      public_group_membership: "میزان ورود/ترک شما در گروه‌ها زیاد است. لطفا %{time_left}  صبر کنید و سپس دوباره امتحان کنید."
-      topics_per_day: "شما به حداکثر تعداد مباحث جدیدی که امروز میتوانید ایجاد کنید رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      pms_per_day: "شما به حداکثر تعداد پیام‌هایی که امروز میتوانید بفرستید رسیده‌اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      create_like: "شما به حداکثر تعداد پسند هایی که امروز میتوانید بکنید رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      create_bookmark: "شما به حداکثر تعداد نشانک‌هایی که امروز میتوانید ایجاد کنید، رسیده‌اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید."
-      edit_post: "به حداکثر تعداد ویرایش روزانه رسیدید. بعد از %{time_left} می‌توانید دوباره تلاش کنید."
-      live_post_counts: "درخواست نمایش زنده پست‌های شما بسیار سریع است. لطفا %{time_left} صبر کنید سپس دوباره تلاش کنید."
-      unsubscribe_via_email: "به حداکثر تعداد لغو اشتراک با ایمیل رسیده‌اید. لطفا %{time_left} صبر کنید سپس مجددا تلاش کنید."
-      topic_invitations_per_day: "به حداکثر تعداد دعوت به موضوع رسیده‌اید. لطفا %{time_left} صبر کنید سپس مجددا تلاش کنید."
     hours:
       other: "%{count} ساعت"
     minutes:
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index d29feda67b..a0ce722673 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -220,8 +220,6 @@ fi:
     delete_reason: "Poistettu moderointijonon kautta"
     not_found: "Viestiä ei löytynyt tai se päivittyi jo."
   groups:
-    success:
-      bulk_add: "%{users_added} käyttäjää lisättiin ryhmään."
     errors:
       can_not_modify_automatic: "Et voi muokata automaattista ryhmää"
       invalid_domain: "'%{domain}' ei ole käypä verkkotunnus."
@@ -448,22 +446,6 @@ fi:
     image_placeholder:
       broken: "Tämä kuva ei toimi"
   rate_limiter:
-    slow_down: "Olet tehnyt tämän toiminnon liian monta kertaa, yritä uudelleen myöhemmin."
-    by_type:
-      first_day_replies_per_day: "Uusi käyttäjä ei voi ensimmäisenä päivänään kirjoittaa enempää viestejä. Odota %{time_left} ja yritä sitten uudelleen."
-      first_day_topics_per_day: "Uusi käyttäjä ei voi ensimmäisenä päivänään aloittaa enempää ketjuja. Odota %{time_left} ja yritä sitten uudelleen."
-      create_topic: "Yrität aloittaa ketjuja liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      create_post: "Yrität vastata liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      delete_post: "Poistat viestejä liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      public_group_membership: "Liityt/eroat ryhmistä liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      topics_per_day: "Olet aloittanut enimmäismäärän uusia ketjuja tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      pms_per_day: "Olet lähettänyt enimmäismäärän viestejä tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      create_like: "Olet tykännyt enimmäismäärän tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      create_bookmark: "Olet lisännyt enimmäismäärän kirjanmerkkejä tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      edit_post: "Olet saavuttanut muokkausten enimmäismäärän tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
-      live_post_counts: "Kysyt viestimääriä liian nopealla tahdilla. Odota %{time_left} ja yritä sitten uudelleen."
-      unsubscribe_via_email: "Olet perunut enimmäismäärän sähköpostitse tänään. Odota %{time_left} ja yritä sitten uudelleen."
-      topic_invitations_per_day: "Olet kutsunut enimmäismäärän tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
     hours:
       one: "1 tunti"
       other: "%{count} tuntia"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index c937a57cb5..1d89ba80e9 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -27,21 +27,39 @@ fr:
   topics: "Sujets"
   posts: "messages"
   loading: "Chargement"
-  powered_by_html: 'Propulsé par <a href="https://www.discourse.org">Discourse</a>, nécessite l''activation de JavaScript '
+  powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>,  le rendu est meilleur avec le JavaScript activé '
   log_in: "Se connecter"
   submit: "Envoyer"
   purge_reason: "Supprimé automatiquement comme compte abandonné et non activé"
   disable_remote_images_download_reason: "Le téléchargement des images externes a été désactivé faute de place suffisante sur le disque."
   anonymous: "Anonyme"
   remove_posts_deleted_by_author: "Supprimé par l'auteur"
+  redirect_warning: "Nous n'avons pas été en mesure de vérifier que le lien que vous avez sélectionné a bien été posté sur le forum. Si vous souhaitez quand même continuer, sélectionnez le lien ci-dessous."
   themes:
     bad_color_scheme: "Impossible de mettre à jour le thème, la palette de couleur est invalide"
     other_error: "Il y a eu un problème pendant la mise à jour du thème"
+    error_importing: "Erreur de clonage du dépôt git, l'accès est refusé ou le dépôt n'est pas trouvé."
+    settings_errors:
+      invalid_yaml: "Le YAML est invalide"
+      data_type_not_a_number: "Le type du paramètre `%{name}` n'est pas supporté. Les types supportés sont `integer`, `bool`, `list` et `enum`"
+      name_too_long: "Il y a un paramètre avec un nom trop long. Longueur maximum 255"
+      default_value_missing: "Le paramètre `%{name}` n'a pas de valeur par défaut"
+      default_not_match_type: "Le type de la valeur par défaut de paramètre `%{name}` ne correspond pas au type du paramètre."
+      default_out_range: "La valeur par défaut de paramètre `%{name}` n'est pas dans la plage spécifiée."
+      enum_value_not_valid: "La valeur séléctionnée ne fait pas partie des choix enum."
+      number_value_not_valid: "La nouvelle valeur n'est pas dans la plage autorisée."
+      number_value_not_valid_min_max: "Doit être comprise entre %{min} et %{max}."
+      number_value_not_valid_min: "Doit être supérieure ou égale à %{min}."
+      number_value_not_valid_max: "Doit être inférieur ou égal à %{max}."
+      string_value_not_valid: "La longueur de la nouvelle valeur n'est pas dans la plage autorisée."
+      string_value_not_valid_min_max: "Doit être compris(e) entre %{min} et %{max} caractères."
+      string_value_not_valid_min: "Doit être d'au moins %{count} caractères."
+      string_value_not_valid_max: "Doit être de %{max} caractères au plus."
   emails:
     incoming:
       default_subject: "Ce sujet a besoin d'un titre"
       show_trimmed_content: "Montrer le contenu raccourci"
-      maximum_staged_user_per_email_reached: "Vous avez atteint le nombre maximal d'utilisateurs qui peuvent être créés par courriel."
+      maximum_staged_user_per_email_reached: "Vous avez atteint le nombre maximal d'utilisateurs distants qui peuvent être créés par courriel."
       no_subject: "(aucun objet)"
       no_body: "(aucun texte)"
       errors:
@@ -92,6 +110,7 @@ fr:
       odd: doit être impair
       record_invalid: 'Validation échouée : %{errors}'
       max_emojis: "limité à %{max_emojis_count}emoji"
+      ip_address_already_screened: "est déjà inclus dans une règle existante"
       restrict_dependent_destroy:
         one: "Impossible de supprimer l'enregistrement car certains %{record} existent et en dépendent"
         many: "Impossible de supprimer l'enregistrement car un %{record} existe et en dépend"
@@ -170,7 +189,7 @@ fr:
   too_many_mentions_newuser:
     one: "Désolé, les nouveaux utilisateurs ne peuvent mentionner qu'un utilisateur dans un message."
     other: "Désolé, les nouveaux utilisateurs ne peuvent mentionner que %{count} utilisateurs dans un message."
-  no_images_allowed_trust: "Désole, il ne vous est pas possible d'inclure des images dans un message"
+  no_images_allowed_trust: "Désolé, il ne vous est pas possible d'inclure des images dans un message"
   no_images_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter d'image dans les messages."
   too_many_images:
     one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'une image dans un message."
@@ -231,9 +250,11 @@ fr:
     not_found: "Message non trouvé ou déjà mis à jour."
   groups:
     success:
-      bulk_add: "%{users_added} utilisateurs ont bien été ajoutés au groupe."
+      bulk_add: "%{count}utilisateur(s) a/ont été ajouté(s) au groupe."
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' n'est pas un niveau de confiance valide."
       can_not_modify_automatic: "Vous ne pouvez pas modifier un groupe automatique"
+      member_already_exist: "'%{username}' est déjà membre de ce groupe."
       invalid_domain: "'%{domain}' n'est pas un domaine valide."
       invalid_incoming_email: "« %{email} » n'est pas une adresse de courriel valide."
       email_already_used_in_group: "« %{email} » est déjà utilisé par le groupe « %{group_name} »."
@@ -300,21 +321,21 @@ fr:
     get_a_room: |
       ### Répondre à d'autres personnes
 
-      Vous avez déjà répondu %{count} à @%{reply_username} dans ce sujet.
+      Vous avez déjà répondu %{count} fois à @%{reply_username} dans ce sujet.
 
-      Avez-vous aussi pensé répondre à d'autres personnes dans cette discussion ? Une grande discussion implique plusieurs avis, perspectives.
+      Avez-vous aussi pensé répondre à d'autres personnes dans cette discussion ? Une grande discussion implique plusieurs avis et points de vue.
 
-      Si vous aimeriez continuer la discussion avec ce membre en particulier, [envoyez-leur un message direct](/u/%{reply_username}).
+      Si vous aimeriez prolonger la discussion avec cet utilisateur en particulier, [envoyez-leur un message direct](/u/%{reply_username}).
     too_many_replies: |
-      ### Vous avez atteint le nombre de réponses maximum dans ce topic
+      ### Vous avez atteint le nombre de réponses maximum dans ce sujet
 
-      Nous sommes désolés, les nouveaux membres sont limités temporairement à %{newuser_max_replies_per_topic} réponses dans un même topic.
+      Nous sommes désolés, les nouveaux membres sont limités temporairement à %{newuser_max_replies_per_topic} réponses dans un même sujet.
 
-      Plutôt que d'ajouter une nouvelle réponse, vous pouvez éditer vos messages précédents ou visiter d'autres topics.
+      Plutôt que d'ajouter une nouvelle réponse, vous pouvez éditer vos messages précédents ou visiter d'autres sujets.
     reviving_old_topic: |
       ### Relancer ce sujet ?
 
-      La dernière réponse à ce sujet était **%{time_ago}**. Votre réponse remettre ce sujet en tête de liste et provoquera une notification à tous les intervenants qui y ont pris part auparavant.
+      La dernière réponse à ce sujet était **%{time_ago}**. Votre réponse remettra ce sujet en tête de liste et provoquera une notification à tous les intervenants qui y ont pris part auparavant.
 
       Etes vous sûr de vouloir continuer cette vieille conversation ?
   activerecord:
@@ -323,7 +344,7 @@ fr:
         name: "Nom de la catégorie"
       topic:
         title: 'Titre'
-        featured_link: 'Lien associé'
+        featured_link: 'Lien à la une'
       post:
         raw: "Corps"
       user_profile:
@@ -338,7 +359,7 @@ fr:
               cant_send_pm: "Désolé, vous ne pouvez pas envoyer un message direct à cet utilisateur."
               no_user_selected: "Vous devez choisir un utilisateur valide."
               reply_by_email_disabled: "Réponse par courriel désactivée."
-              target_user_not_found: "Un des utilisateurs à lequel vous envoyez ce message n'a pas été retrouvé."
+              target_user_not_found: "Un des utilisateurs à qui vous envoyez ce message n'a pas été retrouvé."
             featured_link:
               invalid: "est invalide. L'URL doit inclure http:// ou https://."
               invalid_category: "ne peut pas être modifié dans cette catégorie."
@@ -370,11 +391,11 @@ fr:
         custom_emoji:
           attributes:
             name:
-              taken: est déjà utilisé pas un autre emoji
+              taken: est déjà utilisé par un autre emoji
         topic_timer:
           attributes:
             execute_at:
-              in_the_past: "Doit être dans le futur"
+              in_the_past: "doit être dans le futur"
         translation_overrides:
           attributes:
             value:
@@ -403,10 +424,10 @@ fr:
 
         **Modifier le** en une brève description de votre communauté :
 
-        - Pour qui est-elle destinée ?
+        - A qui est-elle destinée ?
         - Que peuvent-ils y trouver ?
-        - Pourquoi doivent-ils venir ici ?
-        - Où peuvent-ils en lire plus (liens, ressources, etc.) ?
+        - Pourquoi devraient-ils venir ici ?
+        - Où peuvent-ils en savoir plus (liens, ressources, etc.) ?
 
         <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
@@ -471,23 +492,23 @@ fr:
     image_placeholder:
       broken: "Cette image ne fonctionne pas"
   rate_limiter:
-    slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, essayez à nouveau plus tard."
-    too_many_requests: "Vous avez effectué cette action trop de fois. Veuillez attendre %{time_left}avant de ressayer."
+    slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, merci d'essayer à nouveau plus tard."
+    too_many_requests: "Vous avez effectué cette action trop de fois. Merci d'attendre %{time_left}avant de ressayer."
     by_type:
-      first_day_replies_per_day: "Vous avez atteint le nombre maximum de réponses qu'un nouvel utilisateur peut créer pour son premier jour. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      first_day_topics_per_day: "Vous avez atteint le nombre maximum de sujets qu'un nouvel utilisateur peut créer pour son premier jour. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      create_topic: "Vous créez des sujets trop rapidement. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      create_post: "Vous répondez trop rapidement. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      delete_post: "Vous effacez des messages trop rapidement. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
+      first_day_replies_per_day: "Vous avez atteint le nombre maximum de réponses qu'un nouvel utilisateur peut créer pour son premier jour. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      first_day_topics_per_day: "Vous avez atteint le nombre maximum de sujets qu'un nouvel utilisateur peut créer pour son premier jour. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      create_topic: "Vous créez des sujets trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      create_post: "Vous répondez trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      delete_post: "Vous effacez des messages trop rapidement. Merci de patienter %{time_left} avant d'essayer à nouveau."
       public_group_membership: "Vous rejoignez et/ou quittez des groupes trop souvent. Veuillez attendre %{time_left} avant d'essayer à nouveau."
       topics_per_day: "Vous avez atteint le nombre maximum de nouveaux sujets pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      pms_per_day: "Vous avez atteint le nombre maximum de nouveaux messages pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      create_like: "Vous avez atteint le nombre maximum de J'aime pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      create_bookmark: "Vous avez atteint le nombre maximum de favoris pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      edit_post: "Vous avez atteint le nombre maximum de modifications pour aujourd'hui. Veuillez patienter %{time_left} avant d'essayer à nouveau."
-      live_post_counts: "Vous demandez le nombre de posts en activité trop rapidement. Veuillez respecter le temps d'attente %{time_left} avant de réessayer."
-      unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par email pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
-      topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau."
+      pms_per_day: "Vous avez atteint le nombre maximum de nouveaux messages. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      create_like: "Vous avez atteint le nombre maximum de J'aime. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      create_bookmark: "Vous avez atteint le nombre maximum de signets. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      edit_post: "Vous avez atteint le nombre maximum de modifications. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      live_post_counts: "Vous demandez le nombre de messages en activité trop rapidement. Veuillez respecter le temps d'attente %{time_left} avant de réessayer."
+      unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par courriel. Merci de patienter %{time_left} avant d'essayer à nouveau."
+      topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet. Merci de patienter %{time_left} avant d'essayer à nouveau."
     hours:
       one: "1 heure"
       other: "%{count} heures"
@@ -578,13 +599,13 @@ fr:
     success: "Vous avez modifié votre mot de passe avec succès et vous êtes maintenant connecté."
     success_unapproved: "Vous avez modifié votre mot de passe avec succès."
   email_login:
-    invalid_token: "Désolé, ce lien de connection courriel est trop vieux. Séléctionner le bouton 'Se connecter' et utiliser 'Mot de passe oublié' pour obtenir un nouveau lien."
-    title: "Connection courriel"
+    invalid_token: "Désolé, ce lien de connexion courriel est trop vieux. Séléctionner le bouton 'Se connecter' et utiliser 'Mot de passe oublié' pour obtenir un nouveau lien."
+    title: "Connexion courriel"
   change_email:
     confirmed: "Votre adresse de courriel a été mise à jour."
     please_continue: "Continuer vers %{site_name}"
     error: "Il y a eu une erreur lors de la modification de votre adresse de courriel. Elle est peut-être déjà utilisée ?"
-    error_staged: "Une erreur est survenue lors de la modification de votre adresse courriel. Cette adresse est déjà utilisée par un utilisateur en attente."
+    error_staged: "Une erreur est survenue lors de la modification de votre adresse courriel. Cette adresse est déjà utilisée par un utilisateur distant."
     already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre adresse de courriel a peut-être déjà été changée ?"
     authorizing_old:
       title: "Merci d'avoir confirmé votre adresse de courriel"
@@ -608,7 +629,7 @@ fr:
     off_topic:
       title: 'Hors-sujet'
       description: 'Étant donné le titre et le premier message de cette discussion, ce message n''est pas pertinent dans ce contexte et devrait probablement être déplacé ailleurs.'
-      short_description: 'Non pertinent pour la discussio'
+      short_description: 'N''est pas pertinent à la discussion'
       long_form: 'signalé comme hors-sujet'
     spam:
       title: 'Spam'
@@ -712,7 +733,7 @@ fr:
     read_write: "lecture/écriture"
     description: "« %{application_name} » demande l'accès suivant à votre compte :"
     no_trust_level: "Désolé, vous n'avez pas le niveau de confiance requis pour accéder à l'API utilisateur"
-    generic_error: "Désolé, nous n'avons pu générer de clés pour l'API utilisateur, cette fonctionnalité peut être désactivée par l'administrateur"
+    generic_error: "Désolé, nous n'avons pu générer de clés pour l'API utilisateur, cette fonctionnalité a peut-être été désactivée par l'administrateur"
     scopes:
       message_bus: "Mises à jour en temps réel"
       notifications: "Lire et supprimer les notifications"
@@ -769,6 +790,10 @@ fr:
       title: "Utilisateur à utilisateur"
       xaxis: "Jour"
       yaxis: "Nombre de messages"
+    user_to_user_private_messages_with_replies:
+      title: "Utilisateur à utilisateur (avec réponses)"
+      xaxis: "Jour"
+      yaxis: "Nombre de messages"
     system_private_messages:
       title: "Système"
       xaxis: "Jour"
@@ -860,6 +885,10 @@ fr:
       title: "Visites d'utilisateurs"
       xaxis: "Jour"
       yaxis: "Nombre de visites"
+    web_crawlers:
+      title: "Requêtes de crawler web"
+      xaxis: "User Agent"
+      yaxis: "Pages vues"
   dashboard:
     rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}."
     host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte."
@@ -896,7 +925,7 @@ fr:
     min_personal_message_post_length: "Longueur minimale des messages en nombre de caractères"
     max_post_length: "Longueur maximale autorisée des messages en nombres de caractères"
     topic_featured_link_enabled: "Activer la création de sujets avec lien"
-    show_topic_featured_link_in_digest: "Afficher les sujets avec lien dans le résumé par courriel."
+    show_topic_featured_link_in_digest: "Afficher le lien du sujet à la une dans le résumé par courriel."
     min_topic_title_length: "Longueur minimale autorisée des titres de sujet en nombre de caractères"
     max_topic_title_length: "Longueur maximale autorisée des titres de sujet en nombre de caractères"
     min_personal_message_title_length: "Longueur minimale pour un titre de message en nombre de caractères"
@@ -921,6 +950,8 @@ fr:
     download_remote_images_max_days_old: "Ne pas télécharger les images distantes pour les messages plus anciens que n jours."
     disabled_image_download_domains: "Les images distantes de ces domaines ne seront jamais téléchargées. Liste délimitée par des pipes (|)."
     editing_grace_period: "Pendant (n) secondes après la publication d'un message, la modification de ce dernier ne provoquera pas d'historisation."
+    editing_grace_period_max_diff: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 0 et 1)."
+    editing_grace_period_max_diff_high_trust: "Nombre maximum de changements de caractères autorisés dans le délai de grâce d'édition, si plus de changements, enregistrez une autre révision de poste (niveaux de confiance 2 et plus)."
     staff_edit_locks_post: "Les messages seront vérouillés à la modification si modifiés par des responsables"
     post_edit_time_limit: "L'auteur peut modifier ou supprimer ses messages pendant (n) minutes après leur publication. Mettre à 0 pour l'autoriser sans limite de temps."
     edit_history_visible_to_public: "Autoriser tout le monde à voir les versions précédentes d'un message modifié. Quand désactivé, seuls les responsables peuvent voir l'historique."
@@ -950,7 +981,7 @@ fr:
     email_custom_headers: "Une liste délimité par des (|) pipes d'entêtes de courriel"
     email_subject: "Format du sujet personnalisable pour les courriels standards. Voir https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "Forcer votre site en HTTPS uniquement. MISE EN GARDE : n'activez PAS cette fonction tant que vous n'avez pas vérifié que le HTTPS est complètement configuré et fonctionne absolument partout ! Avez-vous vérifié que vos CDN, vos connexions via réseaux sociaux ainsi que tous les logos / dépendances tiers sont tous compatibles HTTPS eux aussi ?"
-    same_site_cookies: "Utiliser des cookies de même site, qui éliminent tous les vecteurs de Cross Site Request Forgery sur les navigateurs supportés (Lax ou Strict). Avertissement: Strict ne fonctionnera que sur des sites qui imposent le login et utilisent le SSO."
+    same_site_cookies: "Utiliser des cookies de même site, qui éliminent tous les vecteurs de Cross Site Request Forgery sur les navigateurs supportés (Lax ou Strict). Avertissement: Strict ne fonctionnera que sur des sites qui imposent la connexion et utilisent le SSO."
     summary_score_threshold: "Le score minimum requis pour qu'un message soit inclus dans le 'Résumé de ce sujet'"
     summary_posts_required: "Nombre minimum de messages dans un sujet avant que le 'Résumé du sujet' soit activé"
     summary_likes_required: "Nombre de J'aime minimum dans un sujet avant que le 'Résumé du sujet' soit activé"
@@ -958,7 +989,7 @@ fr:
     summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »"
     enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
     enable_system_message_replies: "Permettre aux utilisateurs de répondre aux messages système, même si les messages directs sont désactivés."
-    enable_personal_email_messages: "Autoriser les utilisateurs de niveau de confiance 1 à envoyer des messages courriel personnels et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
+    enable_personal_email_messages: "Autoriser les utilisateurs de niveau de confiance 1 à envoyer des messages courriel personnels (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
     enable_long_polling: "Utiliser les requêtes longues pour le flux de notifications."
     long_polling_base_url: "Racine de l'URL utilisée pour les requêtes longues (dans le cas de l'utilisation d'un CDN pour fournir du contenu dynamique, pensez à le configurer en mode \"origin pull\") par exemple : http://origin.site.com"
     long_polling_interval: "Délai d'attente du serveur avant de répondre aux clients lorsqu'il n'y a pas de données à envoyer\n(réservé aux utilisateurs connectés)"
@@ -974,17 +1005,21 @@ fr:
     tl4_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 4 (meneurs) en la multipliant par ce nombre"
     num_spam_flags_to_silence_new_user: "Si le message d'un nouvel utilisateur obtient plusieurs signalements pour spam de la part de num_users_to_silence_new_user différents utilisateurs, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     num_users_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent num_spam_flags_to_silence_new_user signalements d'autant d'utilisateurs différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
-    num_tl3_flags_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent\nce nombre de signalements de la part de num_tl3_users_to_silence_new_user utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
+    num_tl3_flags_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent ce nombre de signalements de la part de num_tl3_users_to_silence_new_user utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     num_tl3_users_to_silence_new_user: "Si les messages d'un nouvel utilisateur num_tl3_flags_to_silence_new_user signalements de la part de plusieurs utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     notify_mods_when_user_silenced: "Si un utilisateur est automatiquement mis sous silence, envoyer un message à tous les modérateurs."
     flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse IP que le nouvel utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam."
     traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne."
+    enable_markdown_typographer: "Utiliser des règles typographiques de base pour améliorer la lisibilité des paragraphes de texte, remplacer (c) (tm) etc. par des symboles, réduire le nombre de points d'interrogation, etc."
+    enable_markdown_linkify: "Traiter automatiquement le texte qui ressemble à un lien comme un lien : www.site.com et http://site.com seront automatiquement liés."
+    markdown_linkify_tlds: "Liste des domaines de premier niveau qui sont automatiquement traités comme des liens."
     post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (J'aime, signaler, etc.)"
     must_approve_users: "Les responsables doivent approuver les nouveaux utilisateurs afin qu'ils puissent accéder au site. ATTENTION : activer cette option sur un site en production suspendra l'accès des utilisateurs existants qui ne sont pas des responsables !"
     pending_users_reminder_delay: "Avertir les modérateurs si des nouveaux utilisateurs sont en attente d'approbation depuis x heures. Mettre -1 pour désactiver les notifications."
     maximum_session_age: "L'utilisateur restera connecté pour n heures après la dernière visite"
     ga_universal_tracking_code: "Code de suivi Google Universal Analytics (analytics.js), par exemple : UA-12345678-9 ; voir http://google.com/analytics"
     ga_universal_domain_name: "Nom de domaine Google Universal Analytics (analytics.js), par exemple : monsite.com ; voir http://google.com/analytics"
+    ga_universal_auto_link_domains: "Activer Google Universal Analytics (analytics.js) pour le suivi interdomaine. Les liens sortants vers ces domaines auront l'identifiant client ajouté. Voir le guide Cross-Domain Tracking  de Google."
     gtm_container_id: "ID du conteneur Google Tag Manager, par exemple : GTM-ABCDEF"
     enable_escaped_fragments: "Utiliser l'API Ajax-Crawling de Google si aucun robot n'est détecté. Voir https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Autoriser les modérateurs à créer de nouvelles catégories"
@@ -992,6 +1027,11 @@ fr:
     use_admin_ip_whitelist: "Les administrateurs ne peuvent se connecter que s'ils sont à une adresse IP définie dans la liste des IP surveillées (Admin > Journaux > IP surveillés)."
     blacklist_ip_blocks: "Une liste de blocs IP privés qui ne doivent jamais être crawlés par Discourse"
     whitelist_internal_hosts: "Une liste de domaines internes que Discourse peut crawler en sécurité pour les Onebox et autres"
+    allowed_iframes: "Une liste des préfixes du domaine src iframe que Discourse peut autoriser en toute sécurité dans les messages"
+    whitelisted_crawler_user_agents: 'Les agents utilisateurs des robots d''exploration du Web qui devraient être autorisés à accéder au site.'
+    blacklisted_crawler_user_agents: 'Mot unique insensible à la casse dans la chaîne de caractères de l''agent utilisateur identifiant les robots d''exploration Web qui ne devraient pas être autorisés à accéder au site. Ne s''applique pas si une whitelist est définie.'
+    slow_down_crawler_user_agents: 'Agents de crawlers web qui devrait être limité dans robots.txt avec la commande Crawl-delay.'
+    slow_down_crawler_rate: 'Si slow_down_crawler_user_agents est spécifié ce taux s''appliquera aux crawlers web (secondes d''attente entre requêtes)'
     top_menu: "Déterminer les éléments qui apparaissent dans la navigation de la page d'accueil, et dans quel ordre. Exemple latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "L'ordre des éléments dans le menu de rédaction. Exemple like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Les éléments du menu qui seront cachés par défaut jusqu’à extension du menu."
@@ -1009,19 +1049,23 @@ fr:
     top_page_default_timeframe: "Période par défaut pour la page la plus vue."
     show_email_on_profile: "Afficher l'adresse du courriel de l'utilisateur sur leur page utilisateur (seulement visible pour l'utilisateur et les équipes techniques)"
     prioritize_username_in_ux: "Afficher le pseudonyme en premier sur la page d'un utilisateur, sa carte et ses messages (si désactivé, le nom est affiché en premier)"
+    enable_rich_text_paste: "Permettre la conversion automatique de HTML en Markdown lors que du texte est collé dans l'éditeur. (Expérimental)"
     email_token_valid_hours: "Les jetons (tokens) de Mot de passe oublié / Activation de comptes sont valides (n) jours."
     enable_badges: "Activer le système de badges"
     enable_whispers: "Autoriser les communications privées entre responsables au sein d'un sujet."
     allow_index_in_robots_txt: "Préciser dans robots.txt que le site est autorisé à être indexé par les robots des moteurs de recherche."
     email_domains_blacklist: "Liste des domaines de courriel qui ne sont pas autorisés lors de la création de compte, délimitée par des pipes. Exemple : mailinator.com|trashmail.net"
     email_domains_whitelist: "Liste des domaines de courriel avec lesquelles les utilisateurs DOIVENT s'enregistrer, délimités par un pipe. ATTENTION : les utilisateurs ayant une adresse de courriel sur un autre domaine ne pourront pas s'enregistrer."
+    hide_email_address_taken: "Ne pas informer les utilisateurs qu'un compte existe avec un courriel donné lors de l'inscription ou à partir du formulaire d'oubli du mot de passe."
     log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions pour l'utilisateur sur tous les appareils"
     version_checks: "Ping les serveurs de Discourse afin d'obtenir les mises à jours et affiche les nouveaux messages d'information dans le tableau de bord /admin"
     new_version_emails: "Envoyer un courriel à contact_email quand une nouvelle version de Discourse est disponible."
     invite_expiry_days: "Combien de temps (en jours) les clés d'invitation sont-elles valides"
     invite_passthrough_hours: "Combien de temps un utilisateur peut encore utilisé une clé d'invitation après son expiration, en heure"
-    invite_only: "Les inscriptions sont désactivées, elles ne peuvent se faire uniquement sur invitation par le staff."
+    invite_only: "Les inscriptions publiques sont désactivées, elles ne peuvent se faire uniquement sur invitation par les responsables."
     login_required: "Authentification requise pour lire le contenu du site, interdit l'accès anonyme."
+    min_username_length: "Longueur minimale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus courts que celui-ci, votre site se cassera !"
+    max_username_length: "Longueur maximale du nom d'utilisateur en caractères. ATTENTION : si des utilisateurs ou groupes existants ont des noms plus longs que celui-ci, votre site se cassera !"
     reserved_usernames: "Pseudos pour lesquels l'inscription n'est pas autorisée. Le symbole « * » peut être utilisé pour représenter n'importe quel caractère 0 ou plusieurs fois."
     min_password_length: "Longueur minimale du mot de passe."
     min_admin_password_length: "Longueur minimale du mot de passe pour l'administrateur."
@@ -1032,7 +1076,8 @@ fr:
     enable_sso_provider: "Implémenter le procotole Discourse de provider SSO à /session/sso_provider, requiert sso_secret"
     sso_url: "URL de l'authentification unique SSO (doit inclure http:// ou http://)"
     sso_secret: "Chaîne de caractères secrète utilisée pour authentifier les informations SSO par cryptographie, assurez-vous qu'elle est de 10 caractères ou plus"
-    sso_overrides_bio: "Écrase la biographie du profil utilisateur et empêche son changement"
+    sso_overrides_bio: "Écrase la biographie du profil utilisateur et empêche l'utilisateur de le modifier"
+    sso_overrides_groups: "Synchroniser l'ensemble de adhésions de groupe manuelles avec les groupes spécifiés dans l'attibut sso (ATTENTION : si vous ne spécifiez pas de groupe toutes les adhésions de groupe manuelles seront résiliées pour l'utilisateur)"
     sso_overrides_email: "Surcharger les emails locaux avec les emails externes d'un SSO à chaque connexion, et prévenir les modifications locales. (ATTENTION : Des écarts peuvent se produire dus aux règles locales sur les emails)"
     sso_overrides_username: "Surcharger les pseudos locaux avec les pseudos externes d'un SSO à chaque connexion, et prévenir les modifications locales. (ATTENTION : des écarts peuvent se produire dûes aux différences de longueur et d'exigences sur les pseudos)"
     sso_overrides_name: "Surcharger les noms complets locaux avec les noms complets externes d'un SSO à chaque connexion, et prévenir les modifications locales."
@@ -1040,13 +1085,18 @@ fr:
     sso_not_approved_url: "Rediriger les comptes SSO non validés vers cette URL"
     sso_allows_all_return_paths: "Ne pas restreindre le domaine pour les return_paths fournis par le SSO (par défaut, le chemin de retour doit être sur le site actuel)"
     enable_local_logins: "Activer les comptes locaux avec pseudo et mot de passe. (Note : ceci doit être activé pour que les invitations fonctionnent)"
+    enable_local_logins_via_email: "Permettre aux utilisateurs de demander qu'un lien de connexion en un clic leur soit envoyé par courriel."
     allow_new_registrations: "Autorise l'inscription des nouveaux utilisateurs. Décocher pour prévenir la création de nouveau compte."
     enable_signup_cta: "Afficher un rappel aux visiteurs pour les encourager à créer un compte."
     enable_yahoo_logins: "Activer l'authentification Yahoo"
     enable_google_oauth2_logins: "Activer l'authentification Google Oauth2. C'est la méthode d'authentification que Google supporte désormais. Nécessite une clé et une phrase secrète."
     google_oauth2_client_id: "Identifiante du client de votre application Google."
     google_oauth2_client_secret: "Clé secrète du client de votre application Google."
+    google_oauth2_prompt: "Une liste de valeurs de chaînes de caractères délimitées par des espaces qui spécifie si le serveur d'autorisation demande à l'utilisateur de se réauthentifier et de donner son consentement. Voir https://developers.google.com/identity/protocols/OpenIDConnect#prompt pour les valeurs possibles."
+    google_oauth2_hd: "Google Apps Hosted domain auquel la connexion sera limitée. Voir https://developers.google.com/identity/protocols/OpenIDConnect#hd-param pour plus de détails."
     enable_twitter_logins: "Activer l'authentification Twitter, nécessite twitter_consumer_key et  twitter_consumer_secret"
+    twitter_consumer_key: "Clé consommateur pour l'authentification Twitter, enregistrée sur https://apps.twitter.com/"
+    twitter_consumer_secret: "Secret consommateur pour l'authentification Twitter, enregistré sur http://dev.twitter.com"
     enable_instagram_logins: "Activer l'authentification Instagram, nécessite instagram_consumer_key et  instagram_consumer_secret"
     instagram_consumer_key: "« Consumer key » pour l'identification Instagram"
     instagram_consumer_secret: "« Consumer secret » pour l'identification Instagram"
@@ -1058,9 +1108,11 @@ fr:
     github_client_id: "Id client pour l'authentification Github, enregistré sur https://github.com/settings/applications"
     github_client_secret: "Secret client  pour l'authentification Github, enregistré sur https://github.com/settings/applications"
     readonly_mode_during_backup: "Activer le mode lecture seule pendant une sauvegarde"
+    enable_backups: "Autoriser les administrateurs à créer de nouveaux sauvegardes du forum"
     allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux, sauf si vous envisagez de faire restaurer une sauvegarde"
     maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées"
     automatic_backups_enabled: "Activer les sauvegardes automatiques tels que définis dans les fréquences de sauvegarde"
+    backup_frequency: "Nombre de jours entre sauvegardes"
     enable_s3_backups: "Envoyer vos sauvegardes à S3 lorsqu'elles sont terminées. IMPORTANT : Vous devez avoir renseigné vos identifiants S3 dans les paramètres de fichiers."
     s3_backup_bucket: "Bucket distant qui contiendra les sauvegardes. ATTENTION: Vérifiez que c'est un bucket privé"
     s3_disable_cleanup: "Désactiver la suppression des sauvegardes de S3 lors de leur suppression locale."
@@ -1082,6 +1134,7 @@ fr:
     max_bookmarks_per_day: "Nombre maximum de signets par utilisateur et par jour."
     max_edits_per_day: "Nombre maximum de modifications par utilisateur chaque jour."
     max_topics_per_day: "Nombre maximum de sujet qu'utilisateur peut créer par jour."
+    max_personal_messages_per_day: "Nombre maximum de messages que les utilisateurs peuvent créer chaque jour."
     max_invites_per_day: "Nombre maximum d'invitations qu'un utilisateur peut envoyer par jour."
     max_topic_invitations_per_day: "Nombre maximum d'invitations à un sujet qu'un utilisateur peut envoyer par jour."
     max_logins_per_ip_per_hour: "Nombre maximum de connexions autorisées par adresse IP et par heure"
@@ -1095,7 +1148,9 @@ fr:
     clean_up_uploads: "Retirer les fichiers téléchargés orphelins pour prévenir les hébergements illégaux. ATTENTION: vous devriez faire une sauvegarde de votre répertoire /uploads avant d'activer ce paramètre."
     clean_orphan_uploads_grace_period_hours: "La période de grâce (en heures) avant qu'un fichier envoyé orphelin soit retiré."
     purge_deleted_uploads_grace_period_days: "La période de grâce (en jours) avant qu'un fichier envoyé et supprimé soit effacé."
+    purge_unactivated_users_grace_period_days: "Période de grâce (en jours) avant qu'un utilisateur qui n'a pas activé son compte soit supprimé. Régler à 0 pour ne jamais purger les utilisateurs non activés."
     enable_s3_uploads: "Placez les fichiers envoyés sur un stockage Amazon S3. IMPORTANT: nécessite un accès valide à S3  (l'identifiant et la clé secrète)."
+    s3_use_iam_profile: 'Utiliser un <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">profile d''instance AWS EC2 </a> pour accorder l''accès au S3 bucket. NOTE: pour cela, Discourse doit être exécuté dans une instance EC2 correctement configurée, et remplace les paramètres "s3 access key id" et "s3 secret access key".'
     s3_upload_bucket: "Le nom du bucket Amazon S3 qui contiendra les fichiers téléchargés. ATTENTION : doit être en minuscule, sans points et sans caractères de soulignement."
     s3_access_key_id: "L' access key Amazon S3 qui sera utilisée pour uploader les images."
     s3_secret_access_key: "La clé secrète Amazon S3 qui va être utilisée pour uploader des images."
@@ -1108,7 +1163,7 @@ fr:
     twitter_summary_large_image_url: "URL de l'image par défaut de la carte de résumé Twitter (devrait au moins mesurer 280px en largeur et 150px en hauteur). "
     allow_all_attachments_for_group_messages: "Autorise toutes les pièces-jointes pour les messages de groupes."
     png_to_jpg_quality: "Qualité du fichier JPEG converti (1 est la plus faible, 99 est la meilleure, 100 pour désactiver)."
-    allow_staff_to_upload_any_file_in_pm: "Autoriser les responsables à envoyer n'importe quel fichier dans les messages privés."
+    allow_staff_to_upload_any_file_in_pm: "Autoriser les responsables à envoyer n'importe quel fichier dans les messages directs."
     strip_image_metadata: "Enlever les métadonnées de l'image."
     enable_flash_video_onebox: "Activer l'utilisation de swf et flv (Adobe Flash) dans les boites imbriquées. ATTENTION : cela pourrait introduire un risque de sécurité."
     default_invitee_trust_level: "Niveau de confiance par défaut (0-4) pour les invités."
@@ -1137,12 +1192,17 @@ fr:
     tl3_requires_likes_given: "Le nombre minimum de J'aime à donner dans les (tl3 time period) derniers jours pour être éligible au niveau de confiance 3."
     tl3_requires_likes_received: "Le nombre minimum de J'aime à recevoir dans les (tl3 time period) derniers jours pour être éligible 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."
+    trusted_users_can_edit_others: "Permettre aux utilisateurs ayant un niveau de confiance élevé d'éditer le contenu d'autres utilisateurs"
     min_trust_to_create_topic: "Le niveau de confiance minimum pour créer un nouveau sujet."
+    allow_flagging_staff: "Si cette option est activée, les utilisateurs peuvent signaler les messages des responsables."
     min_trust_to_edit_wiki_post: "Le niveau de confiance minimum requis pour modifier les messages de type wiki."
     min_trust_to_edit_post: "Le niveau de confiance minimum requis pour modifier des messages."
     min_trust_to_allow_self_wiki: "Le niveau de confiance minimum requis pour transformer ses propres messages en type wiki."
     min_trust_to_send_messages: "Le niveau de confiance minimum pour être autorisé à créer des nouveaux messages directs."
-    min_trust_to_send_email_messages: "Le niveau de confiance minimum requis pour envoyer de nouveaux messages directs par courriel (aux utilisateurs générés)."
+    min_trust_to_send_email_messages: "Le niveau de confiance minimum requis pour envoyer de nouveaux messages directs par courriel (aux utilisateurs distants)."
+    min_trust_to_flag_posts: "Le niveau de confiance minimum requis pour signaler des messages"
+    min_trust_to_post_links: "Le niveau de confiance minimum requis pour inclure des liens dans les messages"
+    min_trust_to_post_images: "Le niveau de confiance minimum requis pour inclure des images dans les messages"
     newuser_max_links: "Combien de liens un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_images: "Combien d'images un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_attachments: "Combien de fichiers un nouvel utilisateur peut-il ajouter à un message."
@@ -1150,9 +1210,10 @@ fr:
     newuser_max_replies_per_topic: "Nombre maximum de réponses qu'un nouvel utilisateur peut faire dans une même discussion avant que quelqu'un lui réponde."
     max_mentions_per_post: "Nombre maximal de @pseudo que tout le monde peut mentionner dans un message."
     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 ne sera envoyée)"
+    enable_mentions: "Permettre aux utilisateurs de mentionner d'autres utilisateurs."
     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."
-    personal_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification directs, afin de donner aux utilisateurs la chance d'éditer et de finaliser leurs messages."
+    personal_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification directs, afin de donner aux utilisateurs la possibilité d'éditer et de finaliser 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: "À 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."
@@ -1168,6 +1229,7 @@ fr:
     max_image_size_kb: "La taille maximale des images en Ko. Doit être configuré dans nginx (client_max_body_size) / apache ou proxy aussi."
     max_attachment_size_kb: "La taille maximale des fichiers envoyés en Ko. Doit être configurer dans nginx (client_max_body_size) / apache ou proxy aussi."
     authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois sur le serveur (mettre '*' pour autoriser tous les types)"
+    authorized_extensions_for_staff: "Une liste des extensions de fichiers autorisées pour le téléchargement pour les responsables en plus de la liste définie dans le paramètre `authorized_extensions'. (utilisez '*' pour activer tous les types de fichiers)"
     theme_authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois de thème (mettre « * » pour autoriser tous les types de fichier)"
     max_similar_results: "Combien de sujets similaires sont afficher lorsqu'un utilisateur est en train de créer un nouveau sujet. La comparaison se base sur le titre et le contenu."
     max_image_megapixels: "Nombre maximum autorisé de mégapixels pour une image."
@@ -1187,6 +1249,7 @@ fr:
     faq_url: "Si vous disposez déjà d'une FAQ/Règles de la communauté, hébergée ailleurs, que vous souhaitez utiliser, vous pouvez renseigner l'URL complète ici."
     tos_url: "Si vous disposez déjà de conditions générales d'utilisation hébergées ailleurs que vous souhaitez utiliser, vous pouvez renseigner leur URL complète ici."
     privacy_policy_url: "Si vous disposez déjà d'une politique de confidentialité hébergée ailleurs que vous voulez utiliser, vous pouvez renseigner son URL complète ici."
+    log_anonymizer_details: "S'il y a lieu de conserver les détails d'un utilisateur dans le journal après avoir été rendu anonyme. Lorsque vous vous conformerez au GDPR, vous devrez l'éteindre."
     newuser_spam_host_threshold: "Combien de fois un nouvel utilisateur peut publier un lien vers le même hôte dans la limite de leur `newuser_spam_host_threshold` messages avant d'être considérés comme du spam."
     white_listed_spam_host_domains: "Une liste des domaines exclus des hôtes testés comme spam. Les nouveaux utilisateurs ne seront jamais empêchés de créer des messages contenant des liens vers ces domaines. "
     staff_like_weight: "Quel poids supplémentaire donner aux J'aime de l'équipe."
@@ -1202,11 +1265,14 @@ fr:
     num_hours_to_close_topic: "Nombre d'heures de fermeture d'un sujet pour intervention."
     auto_respond_to_flag_actions: "Activer la réponse automatique lors du traitement d'un signalement."
     min_first_post_typing_time: "Minimum de temps en millisecondes qu'un utilisateur doit passer à la saisie de son premier commentaire, si le seuil n'est pas atteint, il rejoindra automatiquement la file des commentaires en cours d'approbation. Mettre à 0 pour désactiver (non recommandé)"
+    auto_silence_fast_typers_on_first_post: "Mettre sous silence automatiquement les utilisateurs qui n'ont pas respecté min_first_post_typing_time"
     auto_silence_fast_typers_max_trust_level: "Niveau de confiance maximum pour automatiquement mettre sous silence les utilisateurs rédigeant des messages trop rapidement."
+    auto_silence_first_post_regex: "Regex non sensible à la casse qui, si elle est déclenchée, mettre sous silence le premier message de l'utilisateur et l'enverra dans la file d'attente d'approbation.\nExemple: rageux|a[bc]a mettre sous slience les premiers messages contenant rageux ou aba ou aca."
     flags_default_topics: "Afficher les sujets signalés par défaut dans la section administrateur"
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant; exemple : %{reply_key}@reply.example.com ou replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "Utilisez HTML plutôt que du texte pour les courriels entrants."
     disable_emails: "Désactiver l'envoi de les courriels depuis Discourse."
     strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieur à 2800 Octets"
     short_email_length: "Taille des courriels courts en Octets"
@@ -1215,15 +1281,15 @@ fr:
     unsubscribe_via_email_footer: "Inclure un lien dans le pied des courriels envoyés pour se désabonner"
     delete_email_logs_after_days: "Efface les journaux de messagerie après (N) jours. 0 pour conserver indéfiniment."
     max_emails_per_day_per_user: "Nombre maximum de courriels à envoyer aux utilisateurs par jour. 0 pour désactiver la limite"
-    enable_staged_users: "Créer automatiquement les utilisateurs en attente lors du traitement des courriels entrants."
-    maximum_staged_users_per_email: "Nombre maximum d'utilisateurs créés lors du traitement d'un courriel entrant."
+    enable_staged_users: "Créer automatiquement les utilisateurs distants lors du traitement des courriels entrants."
+    maximum_staged_users_per_email: "Nombre maximum d'utilisateurs distants créés lors du traitement d'un courriel entrant."
     auto_generated_whitelist: "Liste des adresses courriel qui ne seront pas vérifiées pour du contenu généré automatiquement. Exemple : foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloquer les courriels entrants identifiés comme générés automatiquement."
     ignore_by_title: "Ignorer les courriels entrants selon leur titre."
     mailgun_api_key: "Clé API secrète de Mailgun utilisée pour vérifier les messages du webhook."
     soft_bounce_score: "Score de rejet ajouté à l'utilisateur lorsqu'un rejet temporaire se produit."
     hard_bounce_score: "Score de rejet ajouté à l'utilisateur lorsqu'un rejet permanent se produit."
-    bounce_score_threshold: "Score de rejet maximum à partir duquel nous allons arrêter d'envoyer des courriels à un utilisateur."
+    bounce_score_threshold: "Score de rejet maximum à partir duquel nous arrêterons d'envoyer des courriels à un utilisateur."
     bounce_score_threshold_deactivate: "Score de rejet maximum à partir duquel nous allons désactiver un utilisateur."
     reset_bounce_score_after_days: "Rétablir automatiquement le score de rejet après X jours."
     attachment_content_type_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du type de contenu."
@@ -1233,7 +1299,7 @@ fr:
     private_email: "Ne pas inclure du contenu des messages ou des sujets dans les courriels pour plus de confidentialité."
     manual_polling_enabled: "Envoyer les courriels en utilisant l'API des réponses par courriel."
     pop3_polling_enabled: "Utiliser POP3 pour les réponses via courriel."
-    pop3_polling_ssl: "Utiliser SSL pour les connections au serveur POP3. (Recommandé)"
+    pop3_polling_ssl: "Utiliser SSL pour les connexions au serveur POP3. (Recommandé)"
     pop3_polling_openssl_verify: "Vérifier le certificat TLS du serveur (activé par défaut)"
     pop3_polling_period_mins: "La période en minute entre chaque vérification du compte POP3 des courriels.\nNote: nécessite un redémarrage de la machine."
     pop3_polling_port: "Le port pour le pooling des courriels via POP3."
@@ -1241,13 +1307,16 @@ fr:
     pop3_polling_username: "Le nom d'utilisateur du compte POP3 pour le pooling des courriels."
     pop3_polling_password: "Le mot de passe du compte POP3 pour le pooling des courriels."
     log_mail_processing_failures: "Enregistrer tous les problèmes de mails sur\nhttp://yoursitename.com/logs"
+    email_in: "Autoriser les utilisateurs à poster de nouveaux sujets par courriel (requêtes manuelles ou via pop3 requises). Configurer les adresses dans l'onglet \"Paramètres\" de chaque catégorie."
     email_in_min_trust: "Le niveau de confiance minimum qu'un utilisateur doit avoir pour être autorisé à poster de nouveaux sujets par courriel."
     email_prefix: "Le [label] qui sera utilisé dans le sujet des courriels. Par défaut il prend la valeur de 'title'."
     email_site_title: "Le titre du site utilisé comme expéditeur pour les courriels du site. Par défaut il prend la valeur de 'title'. Si votre 'title\" utilise des caractères interdits dans les courriels, utiliser ce paramètre."
+    find_related_post_with_key: "N'utilisez que le 'reply key' pour trouver le message auquel on a répondu. ATTENTION : la désactivation de cette option permet l'usurpation d'identité de l'utilisateur sur la base de l'adresse e-mail."
     minimum_topics_similar: "Combien de sujets ont besoin d'exister dans la base de données avant que des sujets similaires soit présentés lors de la rédaction de nouveaux sujets."
     relative_date_duration: "Nombre de jours après la création d'un message à partir desquels les dates seront affichées en absolu (20 Fév) plutôt qu'en relatif (7j)"
     delete_user_max_post_age: "Interdire la suppression des utilisateurs dont le premier message est date de plus de (n) jours."
     delete_all_posts_max: "Le nombre maximum de messages qui peuvent être supprimés en une seule fois avec le bouton Supprimer tous les messages. Si un utilisateur a plus que ce nombre de messages, ses messages ne pourront pas être supprimés en une seule fois et l'utilisateur ne pourra pas être supprimé."
+    username_change_period: "Le nombre de jours maximum après l'enregistrement que l'utilisateur peut encore modifier son pseudo (0 pour empêcher la modification de pseudo)."
     email_editable: "Autoriser les utilisateurs à modifier leur adresse de courriel après l'inscription."
     logout_redirect: "URL vers laquelle rediriger le navigateur après déconnexion (par exemple : http://unsite.com/deconnexion)"
     allow_uploaded_avatars: "Autoriser les utilisateurs à télécharger une photo de profil personnalisé."
@@ -1262,6 +1331,7 @@ fr:
     suppress_digest_email_after_days: "Ne pas envoyer de résumés par courriel aux utilisateurs qui n'ont pas visité le site depuis plus de (n) jours."
     digest_suppress_categories: "Ne pas inclure ces catégories dans les résumés par courriel."
     disable_digest_emails: "Désactiver les résumés par courriel pour tous les utilisateurs."
+    email_accent_bg_color: "La couleur d'accentuation utilisée comme arrière-plan de certains éléments des courriels HTML. Entrez un nom de couleur (« red ») ou une valeur hexadécimale (« #FF0000 »)."
     email_accent_fg_color: "La couleur des textes rendus sur la couleur d'arrière-plan des courriels HTML. Entrez un nom de couleur (« white ») ou une valeur hexadécimale (« #FFFFFF »)."
     email_link_color: "La couleur des liens dans les courriels HTML. Entrez un nom de couleur (« blue ») ou une valeur hexadécimale (« #0000FF »)."
     detect_custom_avatars: "Vérifier ou non si les utilisateurs ont envoyé une photo de profil personnalisée."
@@ -1270,10 +1340,12 @@ fr:
     staff_user_custom_fields: "Une liste blanche des champs personnalisés pour un utilisateur qui peuvent être vus par l'équipe."
     enable_user_directory: "Fournir un répertoire des utilisateurs"
     enable_group_directory: "Proposer un répertoire pour parcourir les groupes"
+    group_in_subject: "Mettre %{optional_pm} dans le sujet du courriel au nom du premier groupe dans le MD. Voir : https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     allow_anonymous_posting: "Permettre aux utilisateurs de passer en mode anonyme"
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
     anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple: si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée."
     hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
+    show_inactive_accounts: "Autoriser les utilisateurs connectés à parcourir les profils de comptes inactifs."
     hide_suspension_reasons: "Ne pas afficher les raisons d'une suspension sur les profils utilisateurs."
     log_personal_messages_views: "Logguer les vues de messages directs par Admin pour d'autres utilisateurs/groupes."
     user_website_domains_whitelist: "Les sites Web des utilisateurs vont être vérifiés contre ces domaines. Liste délimitée par des pipes (|)."
@@ -1292,6 +1364,7 @@ fr:
     topic_page_title_includes_category: "Le titre de la page du sujet inclut le nom de la catégorie."
     native_app_install_banner: "Propose aux visiteurs réguliers d'installer l'application Discourse native."
     share_anonymized_statistics: "Partager les statistiques d'utilisation anonymes."
+    auto_handle_queued_age: "Gérer automatiquement les documents qui attendent d'être examinés après ce nombre de jours. Les signalements seront ignorés. Les messages et les utilisateurs en file d'attente  seront rejetés. Réglez à 0 pour désactiver cette fonction."
     max_prints_per_hour_per_user: "Nombre maximum d'accès à la page /print (mettre à 0 pour désactiver)"
     full_name_required: "Le nom complet est requis dans le profil utilisateur."
     enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout."
@@ -1303,6 +1376,7 @@ fr:
     autohighlight_all_code: "Forcer la mise en évidence de tout les textes dans les balises code, même si ils ne correspondent à aucun langage de programmation."
     highlighted_languages: "Règles de coloration syntaxique supportées. (Attention : supporter trop de langages peut impacter les performances) voir : https://highlightjs.org/static/demo/ pour une démo"
     embed_truncate: "Tronquer les messages embarqués."
+    embed_support_markdown: "Prise en charge du formatage Markdown pour les messages intégrés."
     allowed_href_schemes: "Préfixes autorisés dans les liens en plus de http et https."
     embed_post_limit: "Nombre maximum de messages à embarquer."
     embed_username_required: "Un pseudo d'utilisateur pour la création du sujet est nécessaire."
@@ -1313,11 +1387,14 @@ fr:
     prevent_anons_from_downloading_files: "Refuser le téléchargement de pièces jointes aux visiteurs. ATTENTION : cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images."
     slug_generation_method: "Choisissez une méthode de génération d'identifiant. \"encodé\" générera des chaines de caractères encodées avec des pourcentages. \"aucune\" désactivera complètement les identifiants."
     enable_emoji: "Activer les emojis"
+    enable_emoji_shortcuts: "Les textes de smiley courants :) :p :( seront convertis en emojis"
     emoji_set: "Comment aimeriez-vous vos emoji ?"
     enforce_square_emoji: "Forcer tous les Emojis à être carrés."
     approve_post_count: "Le nombre de messages d'un utilisateur nouveau ou basique devant être approuvés"
     approve_unless_trust_level: "Les messages des utilisateurs qui n'ont pas atteint ce niveau de confiance doivent être approuvés"
     approve_new_topics_unless_trust_level: "Les nouveaux sujets des utilisateurs en dessous de ce niveau de confiance doivent être approuvés"
+    approve_unless_staged: "Les nouveaux sujets et messages des utilisateurs distants doivent être approuvés"
+    notify_about_queued_posts_after: "Si des messages sont en attente de modération depuis ce nombre d'heures, envoyer un courriel à tous les modérateurs. Désactiver ces courriels en indiquant 0."
     auto_close_messages_post_count: "Nombre maximum de messages dans un message privé avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     auto_close_topics_post_count: "Nombre maximum de messages dans un sujet avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     code_formatting_style: "Le bouton Code dans l'éditeur utilisera ce style de formatage par défaut"
@@ -1325,6 +1402,7 @@ fr:
     watched_words_regular_expressions: "Les mots surveillés sont des expressions régulières."
     default_email_digest_frequency: "Par défaut, à quelle fréquence les utilisateurs reçoivent les résumés par courriel."
     default_include_tl0_in_digests: "Par défaut, inclure les messages des nouveaux utilisateurs dans les résumés par courriel. Les utilisateurs peuvent changer cela dans leurs préférences."
+    default_email_personal_messages: "Envoyer un courriel quand quelqu'un envoie un message à l'utilisateur par défaut."
     default_email_direct: "Envoyer un courriel quand quelqu'un cite/répond à/mentionne ou invite un utilisateur."
     default_email_mailing_list_mode: "Envoyer un courriel pour chaque nouveau message."
     default_email_mailing_list_mode_frequency: "Par défaut, les utilisateurs ayant activé la liste de diffusion recevront des courriels à cette fréquence."
@@ -1360,15 +1438,17 @@ fr:
     show_filter_by_tag: "Afficher une liste déroulante pour filtrer une liste de sujet par tag."
     max_tags_in_filter_list: "Nombre maximum de tags à afficher dans la liste déroulante de filtres. Les tags les plus utilisés seront affichés."
     tags_sort_alphabetically: "Afficher les tags par ordre alphabétique. Par défaut, ils sont affichés par ordre de popularité."
+    tags_listed_by_group: "Lister les tags par groupe de tag sur la page Tags (/tags)."
     tag_style: "Style visuel pour tag badges."
     staff_tags: "Une liste de tags qui ne peuvent être appliqués que par des responsables."
-    allow_staff_to_tag_pms: "Autoriser les responsables à singaler n'importe quel message direct"
+    allow_staff_to_tag_pms: "Autoriser les responsables à signaler n'importe quel message direct"
     min_trust_level_to_tag_topics: "Niveau de confiance minimum requis pour taguer des sujets"
     suppress_overlapping_tags_in_list: "Si des tags correspondent exactement à des mots du titre d'un sujet, ne pas afficher ces tags"
     remove_muted_tags_from_latest: "Ne pas afficher les sujets avec des tags silencieux dans la liste des sujets récents."
     company_short_name: "Nom de société (court)"
     company_full_name: "Nom de société (complet)"
     company_domain: "Domaine de la société"
+    shared_drafts_category: "Activez la fonction Ébauches partagées en désignant une catégorie pour les ébauches de sujet."
     errors:
       invalid_email: "Adresse de courriel invalide."
       invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo."
@@ -1392,6 +1472,12 @@ fr:
       email_polling_disabled: "Vous devez activer le relevé manuel ou via POP3 avant d'activer les réponses par courriel."
       user_locale_not_enabled: "Vous devez d'abord activer 'allow user locale' avant d'activer ce paramètre."
       invalid_regex: "L'expression régulière est invalide ou non autorisée."
+      email_editable_enabled: "Vous devez désactiver 'email editable' avant d'activer ce paramètre."
+      enable_sso_disabled: "Vous devez d'abord activer 'enable sso' avant d'activer ce paramètre."
+      staged_users_disabled: "Vous devez d'abord activer 'utilisateurs distants' avant d'activer ce paramètre."
+      reply_by_email_disabled: "Vous devez d'abord activer 'reply by email' avant d'activer ce paramètre."
+      sso_url_is_empty: "Vous devez d'abord configurer un 'sso url' avant d'activer ce paramètre."
+      enable_local_logins_disabled: "Vous devez d'abord activer 'enable local logins' avant d'activer ce paramètre."
   search:
     within_post: "#%{post_number} par %{username}"
     types:
@@ -1486,13 +1572,14 @@ fr:
     pinned_globally_disabled: "Ce sujet est maintenant désépinglé. Il n'apparaîtra plus en haut de sa catégorie."
     visible_enabled: "Ce sujet est maintenant visible. Il sera affiché dans la liste des sujets."
     visible_disabled: "Ce sujet est maintenant invisible. Il ne sera plus affiché dans la liste des sujets. Le seul moyen d'y accéder est par lien direct."
-    auto_deleted_by_timer: "Automatiquement supprimé par planification"
+    auto_deleted_by_timer: "Supprimé automatiquement par planification"
   login:
     not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel quand cela sera fait."
     incorrect_username_email_or_password: "pseudo, adresse de courriel ou mot de passe incorrect"
+    incorrect_password: "Mot de passe incorrect"
     wait_approval: "Merci de vous être inscrit. Nous vous informerons lorsque votre compte aura été approuvé."
     active: "Votre compte est activé et prêt à l'emploi."
-    activate_email: "<p>C'est presque terminé ! Nous avons envoyé un email d'activation à <b>%{email}</b>.  Merci de suivre les instructions pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez le dossier Spam dans votre messagerie."
+    activate_email: "<p>C'est presque terminé ! Nous avons envoyé un email d'activation à <b>%{email}</b>.  Merci de suivre les instructions pour activer votre compte.</p><p>Si vous ne le recevez pas, vérifiez le dossier Spam dans votre messagerie.</p>"
     not_activated: "Vous ne pouvez pas vous connecter pour le moment. Nous vous avons envoyé un courriel d'activation. Merci de suivre les instructions qui s'y trouve pour activer votre compte."
     not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter en tant que %{username} depuis cette adresse IP."
     admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP."
@@ -1503,7 +1590,7 @@ fr:
     something_already_taken: "Quelque chose c'est mal passé. Peut-être que votre pseudo ou votre adresse de courriel est déjà enregistré ? Essayez le lien : j'ai oublié mon mot de passe."
     omniauth_error: "Désolé, une erreur est survenue lors de l'autorisation de votre compte. Vous n'avez peut-être pas approuvé l'autorisation ?"
     omniauth_error_unknown: "Quelque chose s'est mal passé lors de votre connexion, merci de réessayer."
-    authenticator_error_no_valid_email: "Aucune adresse courriel associée à %{account] n'est autorisée. Vous devriez configurer votre compte avec une autre adresse."
+    authenticator_error_no_valid_email: "Aucune adresse courriel associée à %{account}n'est autorisée. Vous devriez configurer votre compte avec une autre adresse."
     new_registrations_disabled: "La création de nouveau compte n'est pas autorisé pour le moment."
     password_too_long: "Les mots de passe sont limités à 200 caractères."
     email_too_long: "L'email renseigné est trop long. Les noms de boîte ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères."
@@ -1512,6 +1599,9 @@ fr:
     auth_complete: "Authentification terminée."
     click_to_continue: "Cliquer ici pour continuer."
     already_logged_in: "Oups, on dirait que vous essayez d'accepter une invitation d'un autre utilisateur. Si vous n'êtes pas %{current_user}, veuillez vous déconnecter et réessayer."
+    second_factor_title: "Authentification à deux facteurs"
+    second_factor_description: "Veuillez saisir le code d'authentification requise de votre app :"
+    invalid_second_factor_code: "Code d'authentification invalide"
   user:
     no_accounts_associated: "Aucun compte associé"
     deactivated: "A été désactivé à cause de trop de courriels rejetés vers '%{email}'."
@@ -1538,6 +1628,11 @@ fr:
       max_new_accounts_per_registration_ip: "Les nouvelles inscriptions ne sont pas autorisées depuis votre adresse IP (limite atteinte). Contactez un responsable."
     website:
       domain_not_allowed: "Site Web invalide. Les domaines autorisés sont : %{domains}"
+    auto_rejected: "Rejeté automatiquement à cause de l'âge. Voir paramètre auto_handle_queued_age site."
+    destroy_reasons:
+      unused_staged_user: "Utilisateur distant inutilisé"
+      fixed_primary_email: "Correction de l'email primaire pour utilisateur distant"
+      same_ip_address: "Même adresse IP (%{ip_address}) que d'autres utilisateurs"
   flags_reminder:
     flags_were_submitted:
       one: "Des signalements ont été soumis il y a plus de 1 heure. [Veuillez les passer en revue](/admin/flags)."
@@ -1558,12 +1653,72 @@ fr:
       Si vous souhaitez continuer à recevoir ces emails, vous pouvez ignorer ce message.
   invite_mailer:
     title: "Invitiation"
+    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} vous a invité(e) à une discussion
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      à
+
+      > %{site_title} -- %{site_description}
+
+      Si cela vous intéresse, cliquez sur le lien ci-dessous :
+
+      %{invite_link}
   custom_invite_mailer:
     title: "Invitation personnalisée"
+    subject_template: "%{inviter_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} vous a invité(e) à une discussion
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      à
+
+      > %{site_title} -- %{site_description}
+
+      Avec ce message :
+
+      > %{user_custom_message}
+
+      Si cela vous intéresse, cliquez sur le lien ci-dessous :
+
+      %{invite_link}
   invite_forum_mailer:
     title: "Invitation sur le forum"
+    subject_template: "%{inviter_name} vous a invité(e) à rejoindre %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} vous invite à rejoindre :
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Si cela vous intéresse, cliquez sur le lien ci-dessous :
+
+      %{invite_link}
   custom_invite_forum_mailer:
     title: "Invitation personnalisée sur le forum"
+    subject_template: "%{inviter_name} vous a invité(e) à rejoindre %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} vous a invité(e) à rejoindre :
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Avec ce message :
+
+      > %{user_custom_message}
+
+      Si cela vous intéresse, cliquez sur le lien ci-dessous :
+
+      %{invite_link}
   invite_password_instructions:
     title: "Instructions du mot de passe d'invité"
     subject_template: "Renseignez le mot de passe pour votre compte utilisateur %{site_name} "
@@ -1587,7 +1742,7 @@ fr:
       Désolé, ce lien de téléchargement a déjà été utilisé ou a expiré.
   admin_confirmation_mailer:
     title: "Confirmation de l'Administrateur"
-    subject_template: "[%{site_name}] Confirmer votre nouveau compte"
+    subject_template: "[%{email_prefix}] Confirmer votre nouveau compte"
     text_body_template: |+
       Merci de confirmer que vous aimeriez ajouter **%{target_username}** comme administrateur de votre forum.
 
@@ -1595,9 +1750,50 @@ fr:
 
   test_mailer:
     title: "Envoyer un courriel de test"
-    subject_template: "[%{email_prefix}] Test de délivrance d'email"
+    subject_template: "[%{email_prefix}] Test de délivrabilité courriel"
+    text_body_template: |
+      Ceci est un courriel de test de
+
+      [**%{base_url}**][0]
+
+      Assurer la distribution de courriel est compliqué. Voici un certain nombre de points importants que vous devez vérifier au préalable :
+
+      - Soyez *certain* de renseigner l'adresse `notification email` dans les paramètres. **Le nom de domaine renseigné dans l'addresse "from" des courriels que vous envoyez sera le nom de domaine utilisé pour la validation**.
+
+      - Sachez comment consulter le format brut d'un courriel dans votre client de courriel et vérifier les entêtes pour obtenir des indices importants. Dans Gmail, il s'agit de l'option "show original" dans le menu contextuel situé en haut à droite de chaque courriel.
+
+      - **IMPORTANT :** Votre FAI a-t-il un enregistrement DNS inverse renseigné pour associer les noms de domaine et les adresses IP depuis lesquelles vous envoyez des courriels ? [Testez votre enregistrement inverse PTR][2] ici. Si votre FAI n'a pas renseigné correctement votre enregistrement DNS inverse, il est très improbable que vos courriels soient délivrés.
+
+      - L'[enregistrement SPF][8] de votre nom de domaine est-il correct ? [Testez votre enregistrement SPF][1] ici. Veuillez noter que le type officiel d'enregistrement est TXT pour le SPF.
+
+      - L'[enregistrement DKIM][3] de votre nom de domaine est-il correct ? Ceci augmentera de manière significative la bonne distribution de vos courriels. [Testez votre enregistrement DKIM][7] ici.
+
+      - Si vous maintenez votre propre serveur de courriel, assurez-vous que les IPs de votre serveur ne sont sur [aucune liste noire de courriel][4]. Vérifiez également qu'il envoie un "fully qualified hostname" résolvable en DNS dans son message HELO. Si ce n'est pas le cas, vos courriels seront rejetés par de nombreux services de courriel.
+
+      - Nous vous recommandons d'**envoyer un courriel de test à [mail-tester.com][mt]** pour vérifier que tout ce qui est mentionné ci-dessus fonctionne bien.
+
+      (La manière *la plus facile* est de créer un compte gratuit sur [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] ou [Mailjet][mj], qui ont des options gratuites et qui seront suffisants pour de petites communautés. Vous devrez malgré tout configurer les entrées SPF et DKIM dans votre DNS !)
+
+      Nous espérons que vous avez bien reçu ce courriel de test de distribution !
+
+      Bonne chance,
+
+      vos amis de [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]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: http://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing
+      [mt]: http://www.mail-tester.com/
   new_version_mailer:
-    title: "Nouvelle version"
+    title: "Avertissement de nouvelle version"
     subject_template: "[%{email_prefix}] Nouvelle version de Discourse, mise à jour disponible"
     text_body_template: |+
       Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible !
@@ -1612,7 +1808,7 @@ fr:
       - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions et de l'aide concernant Discourse
 
   new_version_mailer_with_notes:
-    title: "Nouvelle version avec notes"
+    title: "Avertissement de nouvelle version avec notes"
     subject_template: "[%{email_prefix}] mise à jour disponible"
     text_body_template: |
       Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible !
@@ -1645,16 +1841,32 @@ fr:
     other: "Ce sujet est fermé %{count} heures suite à plusieurs signalements de la communauté."
   system_messages:
     private_topic_title: "Topic #%{id}"
-    contents_hidden: "Veuillez visiter le post pour voir son contenu."
+    contents_hidden: "Veuillez visiter le message pour voir son contenu."
     post_hidden:
       title: "Message caché"
       subject_template: "Message caché suite à des signalements de la communauté"
-    usage_tips:
       text_body_template: |+
-        Pour connaître quelques astuces pour vous aider à démarrer en tant que nouveau membre, [check out this blog post](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+        Bonjour,
 
-        Comme vous êtes nouveau ici, nous aimerions vous connaître un peu plus, aussi quelques limitations seront appliquées temporairement. Avec le temps, vous gagnerez  [trust levels](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)  qui inclus des fonctionnalités spéciales pour nous aider à gérer notre communauté, ensemble.
+        Ceci est un message automatique de %{site_name} pour vous informer que votre message a été caché.
 
+        <%{base_url}%{url} >
+
+        %{flag_reason}
+
+        Plusieurs membres de la communauté ont signalé ce message avant qu'il ne soit masqué donc nous vous invitons à le revoir en fonction de ces retours. **Vous pouvez modifier votre message après %{edit_delay} minutes et il sera alors automatiquement démasqué.**
+
+        Cependant, si votre message est masqué par la communauté une seconde fois, il le restera jusqu'à ce qu'un responsable s'en occupe.
+
+        Pour plus d'informations, merci de vous référer à notre [charte](%{base_url}/guidelines).
+
+    post_hidden_again:
+      title: "Message caché à nouveau"
+    usage_tips:
+      text_body_template: |
+        Pour connaître quelques astuces pour vous aider à démarrer en tant que nouveau membre, [rendez-vous sur cette page](https://meta.discourse.org/t/fr-trucs-et-astuces-pour-nouveaux-utilisateurs/84100/).
+
+        Au fur et à mesure que vous participerez ici, nous apprendrons à vous connaître et les limitations temporaires des nouveaux utilisateurs seront levées. Avec le temps, vous gagnerez [des niveaux de confiance](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) (en anglais) qui incluent des fonctionnalités spéciales pour nous aider à gérer notre communauté ensemble.
     welcome_user:
       title: "Bienvenue Utilisateur"
       subject_template: "Bienvenue sur %{site_name} !"
@@ -1663,7 +1875,7 @@ fr:
 
         %{new_user_tips}
 
-        Nous croyons constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
+        Nous croyons au [comportement civilisé de la communauté](%{base_url}/guidelines) en tout temps.
 
         Amusez-vous bien !
     welcome_invite:
@@ -1678,7 +1890,7 @@ fr:
 
         %{new_user_tips}
 
-        Nous croyons  constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
+        Nous croyons  au [comportement civilisé de la communauté](%{base_url}/guidelines) en tout temps.
 
         Amusez-vous bien !
 
@@ -1745,7 +1957,7 @@ fr:
         %{logs}
         ```
     csv_export_succeeded:
-      title: "Export CVS réussi"
+      title: "Export CSV réussi"
       subject_template: "Exportation des données terminée"
       text_body_template: |
         L'exportation de vos données a réussi !  :dvd:
@@ -1760,24 +1972,63 @@ fr:
       subject_template: "Échec de l'exportation des données "
       text_body_template: "Nous sommes désolés, votre export de données a échoué. Veuillez consulter les journaux ou [contacter un responsable](%{base_url}/about)."
     email_reject_insufficient_trust_level:
+      title: "Courriel rejeté - Niveau de confiance insuffisant "
       subject_template: "[%{email_prefix}] Problème de courriel -- Niveau de confiance insuffisant "
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet via cette adresse de courriel. Si vous pensez qu'il s'agit d'une erreur, [contacter un responsable](%{base_url}/about).
     email_reject_user_not_found:
+      title: "Courriel rejeté - Utilisateur introuvable"
       subject_template: "[%{site_name}] Problème de courriel -- L'utilisateur est introuvable"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre réponse a été envoyée depuis une adresse inconnue. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_screened_email:
+      title: "Courriel rejeté - Courriel sous surveillance"
       subject_template: "[%{email_prefix}] Problème de courriel -- Courriel bloqué"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre réponse a été envoyée depuis une adresse qui est sous surveillance. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_not_allowed_email:
+      title: "Courriel rejeté - Courriel bloqué"
       subject_template: "[%{email_prefix}] Problème de courriel -- Courriel bloqué"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre réponse a été envoyée depuis une adresse bloquée. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_inactive_user:
+      title: "Courriel rejeté -  Utilisateur inactif"
       subject_template: "[%{email_prefix}] Problème de courriel -- Utilisateur inactif"
       text_body_template: |
         Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
 
         Le compte associé avec cette adresse existe n'est pas activé. Veuillez activer votre compte avant d'envoyer des courriels.
+    email_reject_silenced_user:
+      title: "Courriel rejeté - Utilisateur sous silence"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Utilisateur sous silence"
+      text_body_template: |
+        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
+
+        Le compte associé avec cette adresse a été mis sous silence.
     email_reject_reply_user_not_matching:
+      title: "Courriel rejeté - Utilisateur ne correspond pas"
       subject_template: "[%{email_prefix}] Problème de courriel -- Adresse de réponse inattendue"
+      text_body_template: |
+        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
+
+        Votre réponses nous est parvenue d'une autre adresse courriel que celle attendue, nous ne savons donc pas s'il s'agit de la même personne. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_reject_no_account:
+      title: "Courriel rejeté - Aucun compte"
       subject_template: "[%{email_prefix}] Problème de courriel - Compte inconnu"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Aucun compte utilisateur avec cette adresse n'a été trouvé. Essayez de l'envoyer depuis une autre adresse ou [contactez un responsable](%{base_url}/about).
     email_reject_empty:
+      title: "Courriel rejeté - Vide"
       subject_template: "[%{email_prefix}] Problème de courriel - Aucun contenu"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
@@ -1786,22 +2037,35 @@ fr:
 
         Si vous obtenez ce message alors que vous _aviez_ inclus une réponse, réessayez avec un formatage plus simple.
     email_reject_parsing:
+      title: "Courriel rejeté - Parsing"
       subject_template: "[%{email_prefix}] Problème de courriel -- Contenu non reconnu"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
         Nous n'avons pas pu trouver votre réponse dans le courriel. **Assurez-vous que votre réponse se trouve au début du courriel** -- nous ne pouvons pas traiter les réponses en ligne.
     email_reject_invalid_access:
+      title: "Courriel rejeté -  Accès invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Accès invalide"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet dans cette catégorie. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable](%{base_url}/about).
     email_reject_strangers_not_allowed:
+      title: "Courriel rejeté - Inconnus interdits"
       subject_template: "[%{email_prefix}] Problème de courriel -- Accès invalide"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        La catégorie vers laquelle vous avez envoyé ce courriel autorise uniquement les réponses d'utilisateurs avec un compte valide et une adresse de courriel connue. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     email_reject_invalid_post:
+      title: "Courriel rejeté -  Message invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'envoi d'un message"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
         Cela peut-être à cause d'un format trop complexe, d'un message trop long ou trop court. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste.
     email_reject_invalid_post_specified:
+      title: "Courriel rejeté -  Message invalide spécifié"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'envoi d'un message"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
@@ -1812,22 +2076,56 @@ fr:
 
         Si vous pouvez corriger les erreurs, veuillez réessayer.
     email_reject_invalid_post_action:
+      title: "Courriel rejeté -  Message action invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Action de message invalide"
       text_body_template: |
         Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
         Le Post Action n'était pas reconnu. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste.
     email_reject_reply_key:
+      title: "Courriel rejeté - Clé de réponse"
       subject_template: "[%{email_prefix}] Problème de courriel -- Clé de réponse inconnue"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        La clé de réponse est invalide ou inconnue et nous ne pouvons pas savoir à quel message s’adresse cette réponse.  [Contactez un responsable](%{base_url}/about).
     email_reject_bad_destination_address:
+      title: "Courriel rejeté - Mauvaise adresse de destination"
       subject_template: "[%{email_prefix}] Problème de courriel - Adresse de destinataire inconnue"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Aucune des adresses de destination n'est reconnue, ou l'entête Message-ID dans le courriel a été modifié. Veuillez vérifier que vous envoyez bien à l'adresse de courriel fournie par les responsables.
     email_reject_topic_not_found:
+      title: "Courriel rejeté - Sujet introuvable"
       subject_template: "[%{email_prefix}] Problème de courriel -- Sujet introuvable"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Le sujet à lequel vous répondez n'existe plus. Si vous pensez qu'il s'agit d'une erreur, ](/about)contactez un responsable](%{base_url}/about).
     email_reject_topic_closed:
+      title: "Courriel rejeté - Sujet fermé"
       subject_template: "[%{email_prefix}] Problème de courriel -- Sujet fermé"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Le sujet à lequel vous répondez est actuellement fermé et n'accepte plus de réponses. Si vous pensez qu'il s'agit d'une erreur, [contactez un responsable](%{base_url}/about).
     email_reject_auto_generated:
+      title: "Courriel rejeté - Réponse automatique"
       subject_template: "[%{email_prefix}] Problème de courriel - Réponse automatique"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Votre courriel a été marqué comme "automatiquement généré", ce qui signifie qu'il a été créé par un ordinateur au lieu d'être rédigé par un humain ; nous ne pouvons pas accepter ces types de courriel. Si vous pensez qu'il s'agit d'une erreur, [contacter un responsable](%{base_url}/about).
+    email_reject_unrecognized_error:
+      title: "Courriel rejeté -  Erreur inconnue"
+      subject_template: "[%{email_prefix}] Problème de courriel - Erreur inconnue"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Une erreur inconnue est survenue lors du traitement de votre courriel. Essayez de l'envoyer depuis une autre adresse, ou [contactez un responsable](%{base_url}/about).
     email_error_notification:
+      title: "Notification d'erreur courriel"
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'authentification POP3"
       text_body_template: |
         Malheureusement il y a eu un erreur d'authentification lors de la récupération des courriels depuis le serveur POP.
@@ -1847,13 +2145,14 @@ fr:
 
         Pour plus d'informations, merci de vous référer à la [charte de la communauté](%{base_url}/guidelines).
     too_many_tl3_flags:
+      title: "Trop de flags TL3"
       subject_template: "Nouveau compte bloqué"
       text_body_template: |
         Bonjour,
 
         Ceci est un message automatique de %{site_name} pour vous informer que votre compte a été bloqué suite à un grand nombre de signalements de la communauté.
 
-        Par mesure de précaution, votre nouveau compte a été mis sous silence et vous ne pourrez par créer de nouvelles réponses ou sujets tant qu'un responsable n'a pas vérifié votre compte.
+        Par mesure de précaution, votre nouveau compte a été mis sous silence et vous ne pourrez par créer de nouvelles réponses ou sujets tant qu'un responsable n'a pas vérifié votre compte. Veuillez nous excuser pour la gêne occasionnée.
 
         Pour plus d'informations, merci de vous en référer à la [charte de la communauté](%{base_url}/guidelines).
     silenced_by_staff:
@@ -1878,6 +2177,17 @@ fr:
         Merci de [vérifier les signalements](%{base_url}/admin/flags). Si %{username} a été injustement mis sous silence, cliquez sur le bouton d'annulation de la mise sous silence sur la [page d'administration de cet utilisateur](%{user_url}).
 
         Ce seuil peut être changé par le paramètre `silence_new_user`.
+    spam_post_blocked:
+      title: "Message spam bloqué"
+      subject_template: "Les messages du nouvel utilisateur %{username} sont bloqués pour des liens répétés"
+      text_body_template: |
+        Ceci est un message automatique.
+
+        Le nouvel utilisateur [%{username}](%{user_url}) tente de créer de multiples messages avec des liens vers %{domains}, mais que ces messages ont été bloqués pour éviter le spam. Cet utilisateur est toujours capable de créer des messages qui ne contiennent pas de liens vers %{domains}.
+
+        Merci de [review the user](%{user_url}).
+
+        Ceci peut être modifier via les options `newuser_spam_host_threshold` et white_listed_spam_host_domains`.
     unsilenced:
       title: "Mise sous silence annulée"
       subject_template: "Compte débloqué"
@@ -1913,10 +2223,11 @@ fr:
       text_body_template: |
         Félicitations, vous avez reçu le prix du **nouveau membre du mois de %{month_year}**. :trophy:
 
-        Ce prix est seulement décerné à deux nouveaux membres par mois et sera listé [dans vos badges](/my/badges).
+        Ce prix est seulement décerné à deux nouveaux membres par mois et sera listé [dans vos badges](%{url}).
 
         Vous êtes rapidement devenu un membre précieux de notre communauté. Merci de nous avoir rejoint et continuez à participer ainsi !
     queued_posts_reminder:
+      title: "Messages dans la file d'attente"
       subject_template:
         one: "1 message en attente de modération"
         other: "%{count} messages en attention de modération"
@@ -1980,6 +2291,7 @@ fr:
 
       > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm_group:
+      title: "Utilisateur a invité groupe au MD"
       subject_template: "[%{email_prefix}] %{username} a invité @%{group_name} dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
@@ -1988,7 +2300,7 @@ fr:
 
         %{respond_instructions}
     user_invited_to_private_message_pm:
-      title: "Utilisateur invité au MP"
+      title: "Utilisateur invité au MD"
       subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
@@ -1997,6 +2309,7 @@ fr:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
+      title: "Utilisateur distant invité au MD"
       subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
       text_body_template: |
         %{header_instructions}
@@ -2025,8 +2338,8 @@ fr:
 
         %{respond_instructions}
     user_replied_pm:
-      title: "Utilisateur a répondu au MP"
-      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
+      title: "Utilisateur a répondu au MD"
+      subject_template: "[%{email_prefix}] [MD] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2069,6 +2382,7 @@ fr:
 
         %{respond_instructions}
     user_group_mentioned:
+      title: "Mention de groupe utilisateur"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2090,6 +2404,7 @@ fr:
 
         %{respond_instructions}
     user_watching_first_post:
+      title: "Utilisateur surveille premier message"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -2100,8 +2415,8 @@ fr:
 
         %{respond_instructions}
     user_posted_pm:
-      title: "Utilisateur a posté un PM"
-      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
+      title: "Utilisateur a posté un MD"
+      subject_template: "[%{email_prefix}] [MD] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2111,6 +2426,7 @@ fr:
 
         %{respond_instructions}
     user_posted_pm_staged:
+      title: "Utilisateur distant a posté un MD"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
@@ -2137,13 +2453,22 @@ fr:
       title: "Le compte existe déjà"
       subject_template: "[%{email_prefix}] Le compte existe déjà"
       text_body_template: |
-        Vous venez d'essayer de créer un compte sur %{site_name}, ou essayer de changer l'adresse courriel d'un compte vers %{email}. Cependant, un compte existe déjà pour %{email}.
+        Vous venez d'essayer de créer un compte sur %{site_name}, ou d'essayer de changer l'adresse courriel d'un compte vers %{email}. Cependant, un compte existe déjà pour %{email}.
 
         Si vous avez oublié votre mot de passe,  [réinitialisez le maintenant](%{base_url}/password-reset).
 
-        Si vous n'avez pas essayé de créer un compte pour %{email} ou changer votre adresse courriel, ne vous inquiétez pas – vous pouvez ignorer ce message.
+        Si vous n'avez pas essayé de créer un compte pour %{email} ou de changer votre adresse courriel, ne vous inquiétez pas – vous pouvez ignorer ce message.
 
         Si vous avez des questions, [contactez notre équipe](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "Authentification à deux facteurs desactivée"
+      subject_template: "[%{email_prefix}] Authentification à deux facteurs desactivée"
+      text_body_template: |
+        L'authentification à deux facteurs a été désactivée sur votre compte à %{site_name}. Vous pouvez maintenant vous connecter uniquement avec votre mot de passe ; un code d'authentification supplémentaire n'est plus nécessaire.
+
+        Si vous n'avez pas choisi de désactiver l'authentification à deux facteurs, il se peut que quelqu'un ait compromis votre compte.
+
+        Si vous avez des questions,[contactez notre personnel amical](%{base_url}/about).
     digest:
       why: "Voici un bref résumé de ce qu'il s'est passé sur %{site_link} depuis votre dernière visite le %{last_seen_at}"
       since_last_visit: "Depuis votre dernière visite"
@@ -2174,6 +2499,16 @@ fr:
 
         Cliquez sur le lien suivant pour définir un nouveau mot de passe :
         %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "Se connecter avec un lien"
+      subject_template: "[%{email_prefix}] Se connecter avec un lien"
+      text_body_template: |
+        Voilà votre lien pour vous connecter à [%{site_name}](%{base_url}).
+
+        Si vous n'en avez pas fait la demande, vous pouvez ignorer sans crainte ce courriel.
+
+        Sinon, cliquer sur le lien suivant pour vous connecter:
+        %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "Définir le mot de passe"
       subject_template: "[%{email_prefix}] Définir le mot de passe"
@@ -2188,7 +2523,7 @@ fr:
       title: "Identifiant Administrateur"
       subject_template: "[%{email_prefix}] Identification"
       text_body_template: |
-        Vous avez demandé à recevoir un lien pour vous identifier sur [%{site_name}](%{base_url}).
+        Quelqu'un a demandé à se connecter sur votre compte sur [%{site_name}](%{base_url}).
 
         Si vous n'avez pas fait cette demande, vous pouvez ignorer cet email.
 
@@ -2232,6 +2567,21 @@ fr:
     signup_after_approval:
       title: "Inscription après approbation"
       subject_template: "Votre compte a été approuvé sur %{site_name} !"
+      text_body_template: |
+        Bienvenue sur %{site_name}!
+
+        Un responsable a approuvé votre compte sur %{site_name}.
+
+        Cliquez sur le lien suivant pour accèder à votre nouveau compte:
+        %{base_url}
+
+        Si le lien ci-dessus n'est pas cliquable, essayez de le copier/coller dans la barre d'adresse de votre navigateur internet.
+
+        %{new_user_tips}
+
+        Nous croyons constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
+
+        musez-vous bien !
     signup:
       title: "Inscription"
       subject_template: "[%{email_prefix}] Activez votre nouveau compte"
@@ -2268,6 +2618,7 @@ fr:
     store_failure: "Erreur lors du stockage de #%{upload_id} pour l'utilisateur #%{user_id}."
     file_missing: "Désolé, il faut fournir un fichier à envoyer."
     empty: "Désolé, mais le fichier que vous avez fourni est vide."
+    png_to_jpg_conversion_failure_message: "Une erreur est survenue lors de la conversion de PNG en JPG."
     attachments:
       too_large: "Désolé, le fichier que vous essayez d'envoyer est trop gros (taille maximale de %{max_size_kb} Ko)."
     images:
@@ -2318,6 +2669,104 @@ fr:
     Modifier le premier message de ce sujet pour changer le contenu de la page  %{page_name}.
   guidelines_topic:
     title: "FAQ/Charte"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Ceci est un endroit civilisé, merci de le respecter](#civilized)
+
+      Merci de traiter ce forum de discussion avec le même respect que vous pourriez avoir dans un parc public. Nous, aussi, sommes une ressource partagée par la communauté &mdash; un endroit pour partager des compétences, savoirs et intérêts au travers de conversations.
+
+      Il ne s'agit pas de règles absolues, mais de conseils pour le bon fonctionnement de notre communauté. Suivez ces conseils pour garder cet endroit propre et bien éclairé pour un débat public civilisé.
+
+      <a name="improve"></a>
+
+      ## [Améliorez la discussion](#improve)
+
+      Aidez nous à faire de cet endroit un lieu idéal pour la discussion en améliorant constamment le débat d'une certaine façon, même minime. Si vous n'êtes pas sûr que votre message soit utile à la discussion ou pourrait nuire à son utilité, pensez à ce que vous voulez dire et essayer de nouveau plus tard.
+
+      Les sujets abordés ici sont importants pour nous et nous voulons que vous agissiez comme s'ils comptaient également pour vous. Soyez respectueux des sujets et des autres utilisateurs, même si vous êtes en désaccord avec une partie de ce qui est dit.
+
+      Une façon d'améliorer la discussion est de découvrir celles qui sont déjà en cours. Passez un peu de temps à parcourir les sujets avant de répondre ou démarrer votre propre discussion. De fait, vous aurez de plus grandes chances de rencontrer d'autres personnes qui partagent vos intérêts.
+
+      <a name="agreeable"></a>
+
+      ## [Soyez agréable, même si vous n'êtes pas d'accord](#agreeable)
+
+      La critique peut être constructive. Vous pouvez répondre à une personne en étant en désaccord avec elle. C'est très bien. Mais n'oubliez pas de *critiquer les idées, pas les gens*. Merci d'éviter :
+
+      * les injures,
+      * les attaques ad hominem,
+      * de répondre à la tonalité d'un sujet plutôt qu'à son contenu réel,
+      * les contradictions primaires.
+
+      Au lieu de cela, fournissez des contre-arguments motivés qui améliorent la conversation.
+
+      <a name="participate"></a>
+
+      ## [Votre participation compte](#participate)
+
+      Les conversations que nous avons ici donnent le ton pour chaque nouveau venu. Aidez-nous à influencer l'avenir de cette communauté en choisissant de vous engager dans des discussions qui font de ce forum un lieu intéressant &mdash; et en évitant celles qui n'y participent pas.
+
+      Discourse fournit des outils qui permettent à la communauté d'identifier collectivement le meilleur (et le pire) des contributions : signets, des *J'aime*, des signalements, des réponses, des vérifications et ainsi de suite. Utilisez ces outils pour améliorer votre propre expérience et celle de tous les autres aussi.
+
+      Liassons notre communauté en meilleur état que nous l'avons trouvé.
+
+      <a name="flag-problems"></a>
+
+      ## [Si vous voyez un problème, signaler le](#flag-problems)
+
+      Les modérateurs ont un rôle spécial ; ils sont responsables de ce forum. Mais vous aussi. Avec votre aide, les modérateurs peuvent être des facilitateurs de la vie de la communauté et pas seulement des concierges ou des policiers.
+
+      Quand vous voyez un mauvais comportement, ne répondez pas. Votre reconnaissance encourage le mauvais comportement, il consomme votre énergie et fait perdre du temps à chacun. *Signalez-le*. Si suffisamment de signalements s'accumulent, des mesures seront prises, automatiquement ou par l'intervention d'un modérateur.
+
+      Afin de maintenir notre communauté, les modérateurs se réservent le droit de supprimer tout contenu et n'importe quel compte utilisateur pour une raison quelconque, et ce à n'importe quel moment. Les modérateurs ne revoient pas les nouveaux messages avant leur publication, les modérateurs et opérateurs du site n'assument aucune responsabilité pour tout contenu affiché par la communauté.
+
+      <a name="be-civil"></a>
+
+      ## [Soyez toujours civilisé](#be-civil)
+
+      Rien ne sabote une conversation saine mieux que la grossièreté :
+
+      * Soyez civilisé. Ne postez pas ce qu'une personne raisonnable jugerait offensif, ni de discours violent ou haineux.
+      * Gardez-le forum propre. Ne publiez rien d'obscène ou sexuellement explicite.
+      * Se respecter mutuellement est primordial. Ne pas harceler ou chagriner quelqu'un, ni usurper l'identité de quelqu'un ou exposer des informations privées le concernant.
+      * Respecter notre forum. Ne postez pas de spam ou tout autre forme de vandalisme.
+
+      Il ne s'agit pas ici de choses concrètes avec des définitions précises - évitez *même d'avoir l'air* d'agir de la sorte. Si vous avez un doute, demandez-vous comment vous vous sentiriez si votre sujet était publié sur la première page du Monde.
+
+      Il s'agit d'un forum public et les moteurs de recherche indexent ces discussions. Utilisez un langage, des liens et des images sans danger pour votre famille et vos amis.
+
+      <a name="keep-tidy"></a>
+
+      ## [Gardez cet endroit propre](#keep-tidy)
+
+      Faites l'effort de mettre les choses au bon endroit, afin que nous puissions passer plus de temps à discuter et moins à ranger. Ainsi :
+
+      * Ne commencez pas un sujet dans la mauvaise catégorie.
+      * Ne postez pas le même contenu dans plusieurs discussions.
+      * Ne postez pas de message sans contenu.
+      * Ne pas détourner un sujet en le changeant en cours de route.
+      * Ne signez pas vos messages &mdash; chaque message dispose d'informations sur le profil qui s'y rattache.
+
+      Plutôt que de poster "+1", "lol", "mdr" ou "d'accord", utilisez le bouton 'J'aime'. Plutôt que de faire prendre à une discussion existante une direction radicalement différente, utilisez "Répondre en créant un sujet lié".
+
+      <a name="stealing"></a>
+
+      ## [Postez seulement vos propres trucs](#stealing)
+
+      Vous ne pouvez pas poster n'importe quel contenu numérique s'il appartient à quelqu'un d'autre sans son autorisation. Vous ne pouvez pas poster des descriptions, des liens ou des méthodes pour voler la propriété intellectuelle de quelqu'un (logiciels, vidéo, audio, images), ou pour transgresser toute autre loi.
+
+      <a name="power"></a>
+
+      ## [Powered by You](#power)
+
+      Ce site est géré par votre [équipe de responsables](/about) ainsi que *vous*, la communauté. Si vous avez d'autres questions sur comment les choses devraient fonctionner ici, créez un nouveau sujet dans [la catégorie meta](/c/meta) et discutons-en ! S'il y un problème critique ou urgent qui ne peut pas être résolu par un sujet meta ou un signalement, contactez nous [ici](/about).
+
+      <a name="tos"></a>
+
+      ## [Lisez les conditions générales d'utilisation](#tos)
+
+      Oui, le jargon juridique est ennuyeux, mais nous devons nous protéger &ndash; et par extension, vous et vos données &ndash; contre des gens hostiles. Nous avons des [Conditions générales d'utilisation](/tos) décrivant votre (et notre) comportement et les droits liés au contenu, la confidentialité et les lois. Pour utiliser ce service, vous devez accepter de respecter nos [CGU](/tos).
   tos_topic:
     title: "Conditions générales d'utilisation"
   privacy_topic:
@@ -2500,6 +2949,8 @@ fr:
     promoter:
       name: Ambassadeur
       description: A invité un utilisateur
+      long_description: |
+        Ce badge est accordé quand vous invitez quelqu'un à rejoindre la communauté via le bouton d'invitation de la page utilisateur, ou à la fin d'un sujet. Inviter des amis qui peuvent être intéressé par des discussions spécifiques est un bonne manière d'introduire de nouvelles personnes dans la communauté, donc merci !
     campaigner:
       name: Militant
       description: A invité 3 utilisateurs basiques
@@ -2598,6 +3049,8 @@ fr:
     first_emoji:
       name: Premier Emoji
       description: A utilisé un emoji dans un message
+      long_description: |
+        Ce badge est accordé la première fois que vous ajoutez un Emoji à votre message :thumbsup:. Les Emoji vous permettent de transmettre de l'émotion dans vos messages, du bonheur :smiley: à la tristesse :anguished: en passant par la colère :angry: et tout le reste :sunglasses:. Il suffit de taper : (deux-points) ou d'appuyer sur le bouton de la barre d'outils Emoji dans l'éditeur et de choisir parmi des centaines de choix :ok_hand:
     first_mention:
       name: Première mention
       description: A mentionné un utilisateur dans un message
@@ -2631,6 +3084,9 @@ fr:
     badge_title_metadata: "%{display_name} badge sur %{site_title}"
   admin_login:
     success: "Courriel envoyé"
+    errors:
+      unknown_email_address: "Adresse courriel inconnue."
+      invalid_token: "Jeton invalide."
     email_input: "Courriel de l'administrateur"
     submit_button: "Envoyer un courriel"
   performance_report:
@@ -2640,6 +3096,7 @@ fr:
     title: "Tags"
     staff_tag_disallowed: "Le tag \"%{tag}\" ne peut être mis que par un responsable."
     staff_tag_remove_disallowed: "Le tag \"%{tag}\" ne peut être retiré que par un responsable."
+    minimum_required_tags: "Vous devez choisir au moins %{count} tags."
   rss_by_tag: "Sujets avec le tag %{tag}"
   finish_installation:
     congratulations: "Félicitations, vous avez installé Discourse !"
@@ -2661,6 +3118,7 @@ fr:
     only_official: "Désactiver les extensions non officielles"
     no_plugins: "Désactiver toutes les extensions"
     enter: "Activer le mode sans échec"
+    must_select: "Vous devez sélectionner au moins 1 option pour entre en mode sans échec."
   wizard:
     title: "Configuration de Discourse"
     step:
@@ -2774,6 +3232,9 @@ fr:
         description: |
           <p>Si vous souhaitez modifier ces paramètres, rendez-vous dans la section <a href='/admin' target='_blank'>Administration</a> ; trouvez la dans le menu du site.</p>
           <p>Amusez-vous et bonne chance pour <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construire votre nouvelle communauté</a> !</p>
+  search_logs:
+    graph_title: "Nombre de recherches"
+  joined: "Inscrit"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 7723cf3d47..ca71b9cf72 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -214,8 +214,6 @@ he:
   queue:
     delete_reason: "נמחק באמצעות בקרה על תור הפוסטים"
   groups:
-    success:
-      bulk_add: "%{users_added} משתמשים נוספו לקבוצה."
     errors:
       can_not_modify_automatic: "אינכם יכולים לערוך קבוצה אוטומטית"
       invalid_domain: "'%{domain}' אינו שם מתחם תקף."
@@ -432,22 +430,6 @@ he:
     image_placeholder:
       broken: "תמונה זו שבורה"
   rate_limiter:
-    slow_down: "ביצעתם פעולה זו מספר רב מדי של פעמים. נסו שוב מאוחר יותר."
-    by_type:
-      first_day_replies_per_day: "הגעתם למספר המירבי של תגובות שמתמשים חדשים יכולים ליצור ביומם הראשון. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      first_day_topics_per_day: "הגעתם למספר המירבי של נושאים שמשתמשים חדשים יכולים ליצור ביומם הראשון. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      create_topic: "אתם יוצרים נושא חדש מהר מדי. אנא המתנו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      create_post: "אתם מגיבים מהר מדי. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      delete_post: "אתם מוחקים פוסטים מהר מידי. אנא המתינו %{time_left} לפני שאתם מנסים שוב."
-      public_group_membership: "אתם מצטרפים/עוזבים קבוצות בתדירות גבוהה מידי. אנא המתינו %{time_left} לפני שתנסו שוב."
-      topics_per_day: "הגעתם למספר המירבי של נושאים חדשים היום. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      pms_per_day: "הגעתם למספר המירבי של הודעות היום. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      create_like: "הגעתם למספר המירבי של לייקים היום. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      create_bookmark: "הגעתם למספר המירבי של סימניות להיום. אנא המתינו %{time_left} לפני ניסיון חוזר לבצע פעולה זו."
-      edit_post: "הגעתם למספר המרבי של עריכות היום. אנא המתינו %{time_left} לפני שתנסו שוב."
-      live_post_counts: "אתם מבקשים ספירה של פוסטים חיים מהר מידי. אנא המתינו %{time_left} לפני שאתם מנסים שוב."
-      unsubscribe_via_email: "הגעתם למספר המקסימלי של בטולי מנוי באמצעות מייל להיום. אנא המתינו %{time_left} לפני שאתם מנסים שוב."
-      topic_invitations_per_day: "הגעתם למספר המקסימלי של הזמנות לנושאים להיום. אנא המתינו %{time_left} לפני שאתם מנסים שוב."
     hours:
       one: "שעה אחת"
       other: "%{count} שעות"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index c16ee67c8a..8c5907051c 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -219,8 +219,6 @@ it:
   queue:
     delete_reason: "Cancellato attraverso la coda di moderazione"
   groups:
-    success:
-      bulk_add: "%{users_added}utentu sono stati aggiunti al gruppo. "
     errors:
       can_not_modify_automatic: "Non puoi modificare un gruppo automatico"
       invalid_domain: "'%{domain}' non è un dominio valido."
@@ -444,22 +442,6 @@ it:
     image_placeholder:
       broken: "Questa immagine è assente"
   rate_limiter:
-    slow_down: "Hai eseguito questa operazione troppe volte, riprova più tardi."
-    by_type:
-      first_day_replies_per_day: "Hai raggiunto il massimo numero di risposte che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
-      first_day_topics_per_day: "Hai raggiunto il massimo numero di argomenti che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
-      create_topic: "Stai creando argomenti troppo rapidamente. Attendi %{time_left} prima di riprovare."
-      create_post: "Stai rispondendo troppo rapidamente. Attendi %{time_left} prima di riprovare."
-      delete_post: "Stai cancellando i messaggi troppo velocemente. Per favore attendi %{time_left} prima di riprovare."
-      public_group_membership: "Stai entrando/uscendo dai gruppi troppo di frequente. Per favore aspetta %{time_left} prima di riprovare."
-      topics_per_day: "Hai raggiunto il massimo numero di nuovi argomenti per oggi. Per favore attendi %{time_left} prima di riprovare."
-      pms_per_day: "Hai raggiunto il massimo numero di messaggi per oggi. Per favore attendi %{time_left} prima di riprovare."
-      create_like: "Hai raggiunto il massimo numero di \"Mi piace\" per oggi. Per favore attendi %{time_left} prima di riprovare."
-      create_bookmark: "Hai raggiunto il massimo numero di segnalibri per oggi. Per favore attendi %{time_left} prima di riprovare."
-      edit_post: "Hai raggiunto il massimo numero di modifiche per oggi. Per favore attendi %{time_left} prima di riprovare."
-      live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Attendi %{time_left} prima di riprovare."
-      unsubscribe_via_email: "Hai raggiunto il massimo numero di cancellazioni via email per oggi. Per favore aspetta %{time_left}  prima di riprovare ancora."
-      topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti ad argomenti per oggi. Per favore aspetta %{time_left} prima di riprovare."
     hours:
       one: "1 ora"
       other: "%{count} ore"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index bc9f322c99..80d756a068 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -249,8 +249,6 @@ ja:
       title: "ベーシックユーザー"
     change_failed_explanation: "%{user_name} を '%{new_trust_level}' に下げようとしましたが、既にトラストレベルが '%{current_trust_level}' です。%{user_name} は '%{current_trust_level}' のままになります - もしユーザーを降格させたい場合は、トラストレベルをロックしてください"
   rate_limiter:
-    by_type:
-      public_group_membership: "グループへの参加/離脱が多すぎます。%{time_left}お待ち下さい。"
     hours:
       other: "%{count} 時間"
     minutes:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index ae8d311a45..fa73fa0854 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -201,8 +201,6 @@ ko:
   queue:
     delete_reason: "운영팀이 글을 지웠습니다."
   groups:
-    success:
-      bulk_add: "%{users_added}명의 사용자가 그룹에 추가되었습니다."
     errors:
       can_not_modify_automatic: "자동 설정 그룹은 수정할 수 없습니다."
       invalid_domain: "'%{domain}'은 유효한 도메인이 아닙니다."
@@ -401,22 +399,6 @@ ko:
       title: "리더"
     change_failed_explanation: "당신은 %{user_name} 사용자를 '%{new_trust_level}'으로 강등시키려 하였습니다. 하지만 해당 사용자의 회원등급는 이미 '%{current_trust_level}'입니다. %{user_name} 사용자의 회원등급는 '%{current_trust_level}'으로 유지됩니다.  - if you wish to demote user lock trust level first"
   rate_limiter:
-    slow_down: "해당 작업을 너무 많이 수행했습니다. 잠시후 다시 시도해보세요. "
-    by_type:
-      first_day_replies_per_day: "새 유저가 가입한 첫 날에 작성할 수 있는 댓글의 최대 갯수에 도달했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
-      first_day_topics_per_day: "새 유저가 가입한 첫 날에 작성할 수 있는 토픽의 최대 갯수에 도달했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
-      create_topic: "너무 빨리 토픽을 작성했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
-      create_post: "너무 빨리 댓글을 작성했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
-      delete_post: "포스트 삭제속도가 너무 빠릅니다. %{time_left}후에 다시 시도해주세요."
-      public_group_membership: "그룹 가입/탈퇴가 너무 잦습니다. %{time_left} 후에 다시 시도해주세요."
-      topics_per_day: "생성할 수 있는 토픽의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      pms_per_day: "보낼 수 있는 메시지의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      create_like: "쓸 수 있는 좋아요의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      create_bookmark: "북마크할 수 있는 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      edit_post: "일일 최대 편집 횟수에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      live_post_counts: "실시간 포스트 카운트를 너무 빨리 요청하셨습니다. %{time_left} 후에 다시 시도하세요."
-      unsubscribe_via_email: "이메일을 통한 구독취소 일일 최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
-      topic_invitations_per_day: "토픽으로 초청하기의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
     hours:
       other: "%{count}시간"
     minutes:
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 08660b006a..a947da9065 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -349,12 +349,6 @@ nb_NO:
     leader:
       title: "leder"
   rate_limiter:
-    by_type:
-      first_day_replies_per_day: "Du har nådd det maksimale antall svar en ny bruker kan publisere på sin første dag. Vennligst vent %{time_left} før du prøver igjen."
-      first_day_topics_per_day: "Du har nådd det maksimale antall tråder en ny bruker kan publisere på sin første dag. Vennligst vent %{time_left} før du prøver igjen."
-      create_post: "Du svarer for raskt. Vent %{time_left} før du prøver igjen."
-      delete_post: "Du sletter innlegg for raskt. Vent %{time_left} før du prøver igjen."
-      topics_per_day: "Du har oppnådd høyest antall innlegg for i dag. Vær så snill og vent %{time_left} før du prøver igjen."
     hours:
       one: "1 time"
       other: "%{count} timer"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index df88a18d59..7be69d24ae 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -212,8 +212,6 @@ nl:
   queue:
     delete_reason: "Verwijderd via wachtrij voor berichtmoderatie"
   groups:
-    success:
-      bulk_add: "Er zijn %{users_added} gebruikers aan de groep toegevoegd."
     errors:
       can_not_modify_automatic: "U kunt een automatische groep niet wijzigen"
       invalid_domain: "%{domain}' is geen geldig domein."
@@ -431,22 +429,6 @@ nl:
       title: "leider"
     change_failed_explanation: "U probeerde %{user_name} naar '%{new_trust_level}' te degraderen. Zijn of haar vertrouwensniveau is echter al '%{current_trust_level}'. %{user_name} blijft op vertrouwensniveau '%{current_trust_level}'. Als u de gebruiker wil degraderen, vergrendel dan eerst het vertrouwensniveau."
   rate_limiter:
-    slow_down: "U hebt deze actie te vaak uitgevoerd; probeer het later opnieuw."
-    by_type:
-      first_day_replies_per_day: "U hebt het maximale aantal antwoorden dat een nieuwe gebruiker op de eerste dag kan plaatsen bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      first_day_topics_per_day: "U hebt het maximale aantal topics dat een nieuwe gebruiker op de eerste dag kan plaatsen bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_topic: "U maakt te snel topics aan. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_post: "U antwoordt te snel. Wacht %{time_left} voordat u het opnieuw probeert."
-      delete_post: "U verwijdert berichten te snel. Wacht %{time_left} voor u het opnieuw probeert."
-      public_group_membership: "U neemt deel aan of verlaat groepen te regelmatig. Wacht %{time_left} voordat u het opnieuw probeert."
-      topics_per_day: "U hebt het maximale aantal nieuwe topics voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      pms_per_day: "U hebt het maximale aantal berichten voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_like: "U hebt het maximale aantal likes voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      create_bookmark: "U hebt het maximale aantal bladwijzers voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      edit_post: "U hebt het maximale aantal bewerkingen voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      live_post_counts: "U vraagt te snel om live berichtaantallen. Wacht %{time_left} voordat u het opnieuw probeert."
-      unsubscribe_via_email: "U hebt het maximale aantal uitschrijvingen via e-mail voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
-      topic_invitations_per_day: "U hebt het maximale aantal topicuitnodigingen voor vandaag bereikt. Wacht %{time_left} voordat u het opnieuw probeert."
     hours:
       one: "1 uur"
       other: "%{count} uur"
@@ -1429,6 +1411,8 @@ nl:
     unsubscribe:
       title: "Uitschrijven"
       description: "Niet geïnteresseerd in deze e-mails? Geen probleem! Klik hieronder om direct uitgeschreven te worden:"
+    reply_by_email: "[Bezoek topic (het)](%{base_url}%{url}) of beantwoord deze e-mail om te reageren."
+    visit_link_to_respond: "[Bezoek topic (het)](%{base_url}%{url}) om te reageren."
     posted_by: "Geplaatst door %{username} op %{post_date}"
     digest:
       why: "Een korte samenvatting van %{site_link} sinds we je voor het laatst zagen op %{last_seen_at}."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index c768f68dce..38f60a85ee 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -234,8 +234,6 @@ pl_PL:
     delete_reason: "Skasowany z poziomu kolejki moderacji."
     not_found: "Post nie został znaleziony lub jest już zaktualizowany."
   groups:
-    success:
-      bulk_add: "%{users_added} użytkowników zostało dodanych do grupy"
     errors:
       can_not_modify_automatic: "Nie można modyfikować automatyczną grupę"
       invalid_domain: "'%{domain}' nie jest poprawną domeną."
@@ -464,22 +462,6 @@ pl_PL:
     image_placeholder:
       broken: "Ten obraz jest uszkodzony"
   rate_limiter:
-    slow_down: "Powtórzyłeś to działanie zbyt wiele razy, spróbuj ponownie później."
-    by_type:
-      first_day_replies_per_day: "Osiągnąłeś maksymalną liczbę odpowiedzi, jakie może napisać nowy użytkownik pierwszego dnia. Musisz odczekać %{time_left} zanim znów spróbujesz."
-      first_day_topics_per_day: "Osiągnąłeś maksymalną liczbę tematów, jakie może napisać nowy użytkownik pierwszego dnia. Musisz odczekać %{time_left}, zanim znów spróbujesz."
-      create_topic: "Zbyt szybko tworzysz tematy. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      create_post: "Odpowiadasz zbyt szybko. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      delete_post: "Zbyt szybko usuwasz posty. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      public_group_membership: "Dołączasz/opuszczasz grupy zbyt często. Odczekaj %{time_left} przed kolejną próbą."
-      topics_per_day: "Osiągnąłeś maksymalną liczbę nowych tematów na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      pms_per_day: "Osiągnąłeś maksymalną liczbę wiadomości na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      create_like: "Osiągnąłeś maksymalną liczbę lajków na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      create_bookmark: "Wyczerpałeś na dziś możliwość dodawania zakładek. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      edit_post: "Wyczerpałeś na dziś możliwość edytowania. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      live_post_counts: "Zbyt szybko prosisz o bieżące zliczanie postów . Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      unsubscribe_via_email: "Osiągnąłeś maksymalną liczbę wypisań przez maila na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
-      topic_invitations_per_day: "Osiągnąłeś maksymalną liczbę zaproszeń do tematów na dziś. Odczekaj %{time_left} przed kolejną próbą."
     hours:
       one: "1 godzina"
       few: "%{count} godziny"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index d830f679bf..a5f23336bc 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -214,8 +214,6 @@ pt:
   queue:
     delete_reason: "Eliminado através da fila de moderação de mensagens"
   groups:
-    success:
-      bulk_add: "Foram adicionados %{users_added} utilizadores ao grupo."
     errors:
       can_not_modify_automatic: "Não pode modificar um grupo automático"
       invalid_domain: "'%{domain}' não é um domínio válido."
@@ -381,20 +379,6 @@ pt:
       title: "líder"
     change_failed_explanation: "Tentou despromover %{user_name} para '%{new_trust_level}'. Contudo o Nível de Confiança é atualmente '%{current_trust_level}'. %{user_name} irá permanecer em '%{current_trust_level}' - se deseja despromover o utilizador, bloqueie o Nível de Confiança primeiro"
   rate_limiter:
-    slow_down: "Realizou esta ação demasiadas vezes, tente novamente mais tarde."
-    by_type:
-      first_day_replies_per_day: "Atingiu o número máximo de respostas que um novo utilizador pode criar no seu primeiro dia. Por favor espere %{time_left} antes de tentar novamente."
-      first_day_topics_per_day: "Atingiu o número máximo de tópicos que um novo utilizador pode criar no seu primeiro dia. Por favor espere %{time_left} antes de tentar novamente."
-      create_topic: "Está a criar tópicos demasiado rápido. Por favor espere %{time_left} antes de tentar novamente."
-      create_post: "Está a responder demasiado rápido. Por favor espere %{time_left} antes de tentar novamente."
-      delete_post: "Está a apagar publicações a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar novamente."
-      topics_per_day: "Atingiu o número máximo de novos tópicos de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      pms_per_day: "Atingiu o número máximo de mensagens de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      create_like: "Atingiu o número máximo de gostos de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      create_bookmark: "Atingiu o número máximo de marcações de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      live_post_counts: "Está a pedir por contagens de publicações em tempo real a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar outra vez."
-      unsubscribe_via_email: "Atingiu o número máximo de cancelamentos de subscrições por email de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      topic_invitations_per_day: "Atingiu o número máximo de convites para tópicos de hoje. Por favor espere %{time_left} antes de tentar novamente."
     hours:
       one: "1 hora"
       other: "%{count} horas"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index d23368968b..4c633af587 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -8,7 +8,7 @@
 pt_BR:
   dates:
     short_date_no_year: "D MMM"
-    short_date: "D MMM, AAAA"
+    short_date: "D MMM, YYYY"
     long_date: "D de MMMM de YYYY h:mma"
   datetime_formats: &datetime_formats
     formats:
@@ -395,20 +395,6 @@ pt_BR:
     image_placeholder:
       broken: "Esta imagem está danificada"
   rate_limiter:
-    slow_down: "Você fez essa ação demais, tente novamente mais tarde."
-    by_type:
-      first_day_replies_per_day: "Você atingiu o número máximo de respostas que um novo usuário pode criar em seu primeiro dia. Por favor aguarde %{time_left} antes de tentar novamente."
-      first_day_topics_per_day: "Você atingiu o número máximo de tópicos que um novo usuário pode criar em seu primeiro dia. Por favor aguarde %{time_left} antes de tentar novamente."
-      create_topic: "Você está criando tópicos muito rápido. Por favor aguarde %{time_left} antes de tentar novamente."
-      create_post: "Você está respondendo muito rápido. Por favor aguarde %{time_left} antes de tentar novamente."
-      delete_post: "Você está removendo posts muito rapidamente. Por favor, aguarde %{time_left} antes de tentar novamente."
-      topics_per_day: "Você atingiu o número máximo de novos tópicos hoje. Por favor aguarde %{time_left} antes de tentar novamente."
-      pms_per_day: "Você alcançou o número máximo de mensagens por hoje. Por favor aguarde %{time_left} antes de tentar de novo."
-      create_like: "Você atingiu o número máximo de curtidas hoje. Por favor aguarde% {time_left} antes de tentar novamente."
-      create_bookmark: "Você atingiu o número máximo de marcadores hoje. Por favor aguarde% {time_left} antes de tentar novamente."
-      live_post_counts: "Você está pedindo contagens de publicações ao vivo rápido demais. Por favor, espere %{time_left} antes de tentar novamente."
-      unsubscribe_via_email: "Você atingiu o número máximo de cancelamentos de inscrição via email por hoje. Por favor, espere %{time_left} antes de tentar novamente."
-      topic_invitations_per_day: "Você atingiu o número máximo de convites para tópicos hoje. Por favor aguarde %{time_left} antes de tentar novamente."
     hours:
       one: "1 hora"
       other: "%{count} horas"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index eb8f2fb9d3..4385064eb4 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -365,21 +365,6 @@ ro:
       title: "lider"
     change_failed_explanation: "Ai încercat să retrogradezi utilizatorul %{user_name} la nivelul '%{new_trust_level}'. Însă nivelul este deja '%{current_trust_level}'. %{user_name} va rămâne la '%{current_trust_level}' - dacă dorești să retrogradezi utilizatorul, trebuie să îi blochezi întâi nivelul de încredere."
   rate_limiter:
-    slow_down: "Ai executat această acțiune de prea multe ori. Încearcă mai târziu."
-    by_type:
-      first_day_replies_per_day: "Ai atins numărul maxim de răspunsuri pe care un nou utilizator le poate crea în prima sa zi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      first_day_topics_per_day: "Ai atins numărul maxim de subiecte pe care un nou utilizator poate să le creeze în prima sa zi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      create_topic: "Ai atins numărul maxim de subiecte. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      create_post: "Răspunzi prea rapid. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      delete_post: "ștergi postările prea rapid. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      public_group_membership: "Ieși/intri din/în grupuri prea frecvent. Te rugăm așteaptă %{time_left} până să încerci din nou."
-      topics_per_day: "Ai atins numărul maxim de subiecte noi pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      pms_per_day: "Ai atins numărul maxim de mesaje pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      create_like: "Ai atins numărul maxim de aprecieri pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      create_bookmark: "Ai atins numărul maxim de semne de carte pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      live_post_counts: "Ceri prea rapid contorizarea live a numărului de postări. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      unsubscribe_via_email: "Ai atins numărul maxim de dezabonări prin email pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
-      topic_invitations_per_day: "Ai atins numărul maxim de invitații la subiecte pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou."
     hours:
       one: "o oră"
       few: "%{count} ore"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 07892f5e6e..d98ad8eeb7 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -233,8 +233,6 @@ ru:
     delete_reason: "Удалено по запросу модератора."
     not_found: "Сообщение не найдено или уже обновлено."
   groups:
-    success:
-      bulk_add: "%{users_added}пользователей было добавлено в группу."
     errors:
       can_not_modify_automatic: "Вы не можете изменить автоматическую группу."
       invalid_domain: "'%{domain}' является некорректным доменом."
@@ -411,20 +409,6 @@ ru:
       title: "лидер"
     change_failed_explanation: "Вы пытаетесь понизить пользователя %{user_name} до уровня доверия '%{new_trust_level}'. Однако, его уровень доверия уже '%{current_trust_level}'. %{user_name} останется с уровнем доверия '%{current_trust_level}'. Если вы все же хотите понизить пользователя, заблокируйте вначале уровень доверия."
   rate_limiter:
-    slow_down: "Вы выполняли это действие слишком часто, попробуйте еще раз позже."
-    by_type:
-      first_day_replies_per_day: "Вы достигли лимита на создание ответов для нового пользователя в первый день на сайте. Пожалуйста, попробуйте через %{time_left}."
-      first_day_topics_per_day: "Вы достигли лимита на создание тем для нового пользователя в первый день на сайте. Пожалуйста, попробуйте через %{time_left}."
-      create_topic: "Вы создаете темы слишком быстро. Пожалуйста, подождите %{time_left}, затем повторите попытку"
-      create_post: "Вы отвечаете слишком быстро. Пожалуйста, подождите %{time_left} слева, затем повторите попытку."
-      delete_post: "Вы удаляете сообщения слишком быстро. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      public_group_membership: "Вы присоединяетесь/покидаете группы слишком часто. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      topics_per_day: "Вы достигли лимита новых тем на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      pms_per_day: "Вы достигли лимита сообщений на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      create_like: "Вы достигли лимита симпатий на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      create_bookmark: "Вы достигли лимита закладок на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      unsubscribe_via_email: "Вы достигли лимита отказа от подписок через email на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой."
-      topic_invitations_per_day: "На сегодня вы достигли лимита приглашений в темы. Пожалуйста, подождите %{time_left} перед следующей попыткой."
     hours:
       one: "1 час"
       few: "1 часа"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index ac29c13c1d..7ce0d32675 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -357,16 +357,6 @@ sk:
     image_placeholder:
       broken: "Tento obrázok je poškodený"
   rate_limiter:
-    slow_down: "Vykonali ste túto akciu príliš veľa krát, skúste neskôr"
-    by_type:
-      first_day_replies_per_day: "Dosiahli ste maximálny počet odpovedí stanovený pre nového používateľa v jeho prvý deň. Prosím čakajte %{time_left} , než skúsite znova"
-      first_day_topics_per_day: "Dosiahli ste maximálny počet tém stanovený pre nového používateľa v jeho prvý deň. Prosím čakajte %{time_left} , než skúsite znova"
-      create_topic: "Výtvárate témy príliš rýchlo. Prosím čakajte %{time_left} , než skúsite znova"
-      create_post: "Odpovedáte príliš rýchlo. Prosím čakajte %{time_left} , než skúsite znova"
-      topics_per_day: "Dosiahli ste maximálny počet nových tém na tento deň. Prosím čakajte %{time_left} , než skúsite znova"
-      pms_per_day: "Dosiahli ste maximálny počet správ na tento deň. Prosím čakajte %{time_left} , než skúsite znova"
-      create_like: "Dosiahli ste maximálny počet  \"Páči sa\" na tento deň. Prosím čakajte %{time_left} , než skúsite znova"
-      create_bookmark: "Dosiahli ste maximálny počet záložiek na tento deň. Prosím čakajte %{time_left} , než skúsite znova"
     hours:
       one: "1 hodina"
       few: "%{count} hodiny"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 959f587a4a..203bcd314f 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -213,14 +213,6 @@ sq:
     leader:
       title: "udhëheqës"
   rate_limiter:
-    slow_down: "E keni bërë këtë veprim shumë shpesh, prisni pak e provoni më vonë. "
-    by_type:
-      first_day_replies_per_day: "Keni arritur maksimumin e përgjigjeve që një përdorues i ri mund të postojë në ditën e parë. Prisni %{time_left} dhe provoni përsëri."
-      first_day_topics_per_day: "Keni postuar maksimumin e temave që një anëtar i ri mund të krijojë në ditën e parë. Prisni %{time_left} para se të provoni përsëri. "
-      create_topic: "Po nxitoheni shumë për të krijuar tema të reja. Prisni %{time_left} dhe provoni përsëri."
-      create_post: "Po përgjigjeni shumë shpejt. Prisni %{time_left} dhe provoni përsëri."
-      delete_post: "Po fshini postimet shumë shpejt. Prisni %{time_left} dhe provoni përsëri."
-      topics_per_day: "Keni arritur maksimumin e temave të reja për sot. Prisni %{time_left} dhe provoni përsëri."
     hours:
       one: "1 orë"
       other: "%{count} orë"
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index 24237ffca7..93a54c2a82 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -85,8 +85,6 @@ sr:
   revert_version_same: "Trenutna verzija je ista onoj na koju pokušavate da se vratite."
   excerpt_image: "slika"
   groups:
-    success:
-      bulk_add: "%{users_added} korisnika je dodato grupi."
     default_names:
       everyone: "svi"
       admins: "admini"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index e6689dfa7d..dac2c54a75 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -347,21 +347,6 @@ sv:
       title: "ledare"
     change_failed_explanation: "Du försökte degradera %{user_name} till '%{new_trust_level}'. Användarens förtroendenivå är redan '%{current_trust_level}'. %{user_name} kommer behålla '%{current_trust_level}'. Om du vill degradera användaren, lås förtroendenivån först"
   rate_limiter:
-    slow_down: "Du har utfört den här handlingen för många gånger, försök igen senare."
-    by_type:
-      first_day_replies_per_day: "Du har uppnått maximalt antal inlägg en ny användare kan göra under första dagen. Var god vänta %{time_left} innan du försöker igen."
-      first_day_topics_per_day: "Du har uppnått maximalt antal nya ämnen som nya användare kan skapa under första dagen. Var god vänta %{time_left} innan du försöker igen."
-      create_topic: "Du skapar nya ämnen för snabbt. Var god vänta %{time_left} innan du försöker igen."
-      create_post: "Du svarar för snabbt. Var god vänta %{time_left} innan du försöker igen."
-      delete_post: "Du raderar inlägg för snabbt. Var god vänta %{time_left} innan du försöker igen."
-      public_group_membership: "Du deltar/lämnar grupper för frekvent. Vad god och vänta %[tid_kvar] innan du försöker igen."
-      topics_per_day: "Du har uppnått maximalt antal nya ämnen idag. Var god vänta %{time_left} innan du försöker igen."
-      pms_per_day: "Du har uppnått maximalt antal inlägg idag. Var god vänta %{time_left} innan du försöker igen."
-      create_like: "Du har uppnått maximalt antal gillningar idag. Var god vänta %{time_left} innan du försöker igen."
-      create_bookmark: "Du har uppnått maximalt antal bokmärken idag. Var god vänta %{time_left} innan du försöker igen."
-      live_post_counts: "Du ber om uppdateringar för ofta. Var god vänta %{time_left} innan du försöker igen."
-      unsubscribe_via_email: "Du har uppnått maximalt antal avregistreringar via e-post idag. Var god vänta %{time_left} innan du försöker igen."
-      topic_invitations_per_day: "Du har uppnått maximalt antal inbjudningar till ämnen idag. Var god vänta %{time_left} innan du försöker igen."
     hours:
       one: "1 timme"
       other: "%{count} timmar"
@@ -475,12 +460,14 @@ sv:
       long_form: 'flagga detta som orelevant'
     spam:
       title: 'Spam'
+      description: 'Det här inlägget är en annons eller vandalism. Det är inte lämpligt eller relevant med avseende på det aktuella ämnet.'
+      short_description: 'Detta är reklam eller vandalism'
       long_form: 'flagga detta som spam'
       email_title: '"%{title}" flaggades som spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Olämpligt'
-      description: 'Detta inläggs innehåll inkluderar saker som en förnuftig person skulle anse vara stötande, kränkande eller en överträdelse av <a href="/guidelines">våra riktlinjer</a>r.'
+      description: 'Detta inläggs innehåll inkluderar saker som en förnuftig person skulle anse vara stötande, kränkande eller en överträdelse av <a href="/guidelines">våra riktlinjer</a>.'
       long_form: 'flagga detta som olämpligt'
     notify_user:
       title: 'Skicka ett meddelande till @{{username}} '
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index a27c81d5ff..1d9a0af63a 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -318,19 +318,6 @@ tr_TR:
       title: "lider"
     change_failed_explanation: " %{user_name} adlı kullanıcıyı '%{new_trust_level}' seviyesine düşürmeye çalıştınız. Ancak, halihazırda kullanıcının güven seviyesi zaten '%{current_trust_level}'. %{user_name} '%{current_trust_level}' seviyesinde kalacak - eğer seviyesini düşürmek istiyorsanız öncelikle güven seviyesini kilitlemelisiniz"
   rate_limiter:
-    slow_down: "Bu eylemi birçok sefer gerçekleştirdiniz, daha sonra tekrar deneyin."
-    by_type:
-      first_day_replies_per_day: "Yeni bir kullanıcının ilk gününde verebileceği en fazla cevap sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      first_day_topics_per_day: "Yeni bir kullanıcının ilk gününde oluşturabileceği en fazla konu sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      create_topic: "Kısa sürede çok sayıda konu oluşturmaya çalıştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      create_post: "Kısa sürede çok sayıda cevap yazmaya çalıştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      delete_post: "Kısa sürede çok sayıda gönderi silmeye çalıştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      topics_per_day: "Bugün oluşturabileceğiniz en fazla konu sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      pms_per_day: "Bugün oluşturabileceğiniz en fazla ileti sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      create_like: "Bugün yapabileceğiniz en fazla beğeni sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      create_bookmark: "Bugün yapabileceğiniz en fazla imleme sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin."
-      live_post_counts: "Canlı gönderi sayımları için çok hızlı istek yapıyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin."
-      unsubscribe_via_email: "Günlük e-posta ile abonelikten çıkma limitinizi aştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
     hours:
       one: "%{count} saat"
       other: "%{count} saat"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index ffdc57e427..3a37c51200 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -6,13 +6,3363 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 ur:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%m-%d-%Y"
+      short_no_year: "%B %-d"
+      date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
+  time:
+    am: "am"
+    pm: "pm"
+    <<: *datetime_formats
   title: "ڈسکورس"
+  topics: "ٹاپک"
+  posts: "پوسٹ`"
+  loading: "لوڈ ہو رہا ہے"
+  powered_by_html: '<a href="https://www.discourse.org">ڈِسکورس</a>کے مرہونِ مِنَّت، جاوااسکرپٹ کے ساتھ بہترین نظر آئے گا'
+  log_in: "لاگ اِن"
+  submit: "شائع"
+  purge_reason: "ترک کردہ، غیر فعال اکاؤنٹ کے طور پر خود کار طریقے سے حذف کر دیا گیا"
+  disable_remote_images_download_reason: "ریمَوٹ تصاویر کا ڈاؤن لوڈ غیر فعال کردیا گیا تھا کیونکہ ڈِسک میں کافی جگہ دستیاب نہیں تھی۔"
+  anonymous: "گمنام"
+  remove_posts_deleted_by_author: "مصنف کی طرف سے حذف کر دیا گیا"
+  redirect_warning: "ہم تصدیق نہ کر سکے کہ آپ کا منتخب کردہ لِنک اصل میں فورم پر شائع کیا گیا تھا کہ نہیں۔ اگر آپ پھر بھی آگے بڑھنا چاہتے ہیں، تو نیچے دیئے گئے لِنک کو منتخب کریں۔"
+  themes:
+    bad_color_scheme: "تِھیم اَپ ڈَیٹ نہیں ہو سکی، غلط رنگ سکیم"
+    other_error: "تِھیم اَپ ڈَیٹ کرتے ہوے کچھ غلط ہو گیا"
+    error_importing: "گِٹ رِیپَوزِٹَری کلَون کرنے میں خرابی، رسائی کی اجازت نہیں یا رِیپَوزِٹَری موجود نہیں ہے"
+    settings_errors:
+      invalid_yaml: "فراہم کردہ YAML غلط ہے۔"
+      data_type_not_a_number: "ترتیب `%{name}` کی قسم کی اجازت نہیں ہے۔ اجازت یافتہ اقسام `integer'،` bool`، `list` اور `enum` ہیں"
+      name_too_long: "بہت طویل نام کے ساتھ ایک ترتیب موجود ہے۔ زیادہ سے زیادہ لمبائی 255 ہے"
+      default_value_missing: "ترتیب `%{name}` کی کوئی ڈِیفالٹ قدر نہیں ہے"
+      default_not_match_type: "ترتیب `%{name}` کی ڈِیفالٹ قدر کی قِسم، ترتیب قِسم سے مَیچ نہیں کرتی۔"
+      default_out_range: "ترتیب `%{name}` کی ڈِیفالٹ قدر مخصوص رَینج میں نہیں ہے۔"
+      enum_value_not_valid: "منتخب کردہ قدر enum انتخاب میں سے ایک نہیں ہے۔"
+      number_value_not_valid: "نئی قدر اجازت یافتہ رَینج کے اندر نہیں ہے۔"
+      number_value_not_valid_min_max: "یہ %{min} اور %{max} کے درمیان ہونی ضروری ہے۔"
+      number_value_not_valid_min: "اِس کا %{min} سے زیادہ یا اِس کے برابر ہونا لازمی ہے۔"
+      number_value_not_valid_max: "اِس کا %{max} سے کم یا اِس کے برابر ہونا لازمی ہے۔"
+      string_value_not_valid: "نئی قدر کی لمبائی اجازت یافتہ رَینج کے اندر نہیں ہے۔"
+      string_value_not_valid_min_max: "اِس کا %{min} اور %{max} حروف لمبائی کے درمیان ہونا لازمی ہے۔"
+      string_value_not_valid_min: "کم از کم %{min} حروف لمبا ہونا لازمی ہے۔"
+      string_value_not_valid_max: "زیادہ سے زیادہ %{min} حروف لمبا ہونا لازمی ہے۔"
+  emails:
+    incoming:
+      default_subject: "یہ ٹاپک کو ایک عنوان کی ضرورت ہے"
+      show_trimmed_content: "کٹا ہوا مواد دکھائیں"
+      maximum_staged_user_per_email_reached: "فی اِی میل بنائے گئے سٹَیجڈ صارفین کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔"
+      no_subject: "(کوئی موضوع نہیں)"
+      no_body: "(کوئی مواد نہیں)"
+      errors:
+        empty_email_error: "ہو جاتا ہے جب موصول ہونے والی راء میل خالی ہوتی ہے۔"
+        no_message_id_error: "ہو جاتا ہے جب میل کا 'Message-Id' ہیڈر نہ ہو۔"
+        auto_generated_email_error: "جب 'precedence' ہیڈر سَیٹ کیا جائے: list ،junk ،bulk یا auto_reply، پر یا جب کسی اور ہیڈر میں شامل ہو: auto-submitted ،auto-replied یا auto-generated۔"
+        no_body_detected_error: "ہو جاتا ہے جب ہم متن کو نکال نہ سکیں اور کوئی اٹَیچمنٹس نہ ہوں۔"
+        no_sender_detected_error: "ہو جاتا ہے جب ہم فرام ہیڈر میں ایک درست ای میل ایڈریس نہ تلاش کر سکیں۔"
+        inactive_user_error: "ہو جاتا ہے جب بھیجنے والا سرگرم نہ ہو۔"
+        silenced_user_error: "ہو جاتا ہے جب بھیجنے والا خاموش کیا گیا ہو۔"
+        bad_destination_address: "ہو جاتا ہے جب To/Cc/Bcc فیلڈز میں کوئی بھی ای میل ایڈریس ترتیب کردہ آنے والے ای میل ایڈریسوں سے مَیچ نہ کرے۔"
+        strangers_not_allowed_error: "ہو جاتا ہے جب کسی صارف نے ایک ایسے زُمرہ میں نیا ٹاپک بنانے کی کوشش کی ہو جس کا وہ رکن نہ ہوں۔"
+        insufficient_trust_level_error: "ہو جاتا ہے جب کسی صارف نے ایک ایسے زُمرہ میں نیا ٹاپک بنانے کی کوشش کی ہو جس پر اُن کے پاس مطلوبہ ٹرسٹ لَیول نہ ہو۔"
+        reply_user_not_matching_error: "ہو جاتا ہے جب جواب ایک ایسے ای میل ایڈریس سے آیا ہو جو اطلاع بھیجے جانے والے ایڈریس سے مختلف ہو۔"
+        topic_not_found_error: "ہو جاتا ہے جب جواب آجائے لیکن متعلقہ ٹاپک حذف کر دیا گیا ہو۔"
+        topic_closed_error: "ہو جاتا ہے جب جواب آجائے لیکن متعلقہ ٹاپک بند کر دیا گیا ہو۔"
+        bounced_email_error: "یہ ای میل ایک لوٹا دیئے جانے والی ای میل کی رپورٹ ہے۔"
+        screened_email_error: "ہو جاتا ہے جب بھیجنے والے کا ای میل ایڈریس پہلے سے ہی سکرین ہوا ہو۔"
+        unsubscribe_not_allowed: "ہو جاتا ہے جب اِس صارف کیلئے ای میل کے ذریعے سبسکرِپشن ختم کرنے کی اجازت نہ ہو۔"
+        email_not_allowed: "جب ای میل ایڈریس وائٹ لِسٹ میں نہ ہو یا بلیک لِسٹ پر ہو۔"
+      unrecognized_error: "نامعلوم خرابی"
   errors: &errors
+    format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
-      empty: ھالی نہیں ھو سکتا
+      too_long_validation: "%{max} حروف تک محدود ہے؛ آپ نے %{length} درج کیے۔"
+      invalid_boolean: "غلط بُولِیَّن۔"
+      taken: "پہلے سے ہی لیا جا چکا ہے"
+      accepted: منظور کرنا لازمی ہے
+      blank: خالی نہیں ہو سکتا
+      present: خالی ہونا لازمی ہے
+      confirmation: "%{attribute}کے ساتھ مماثلت نہیں رکھتا "
+      empty: خالی نہیں ہو سکتا
+      equal_to: '%{count} کے برابر ہونا لازمی ہے'
+      even: غیر طاق ہونا لازمی ہے
+      exclusion: مخصوص ہے
+      greater_than: '%{count}سے زیادہ ہونا لازمی ہے '
+      greater_than_or_equal_to: '%{count}سے زیادہ یا اُس کے برابر ہونا لازمی ہے '
+      has_already_been_used: "پہلے سے ہی استعمال کیا جا چکا ہے"
+      inclusion: فہرست میں شامل نہیں ہے
+      invalid: غلط ہے
+      is_invalid: "واضح نہیں لگتا، کیا یہ ایک مکمل جملہ ہے؟"
+      contains_censored_words: "درج ذیل سَینسَر کیے گئے الفاظ پر مشتمل ہے: %{censored_words}"
+      less_than: '%{count}سے کم ہونا لازمی ہے '
+      less_than_or_equal_to: '%{count}سے کم یا اُس کے برابر ہونا لازمی ہے '
+      not_a_number: نمبر نہیں ہے
+      not_an_integer: اِنٹیجَر ہونا لازمی ہے
+      odd: طاق ہونا لازمی ہے
+      record_invalid: 'توثیق ناکام ہو گئی: %{errors}'
+      max_emojis: "%{max_emojis_count} سے زیادہ اِیمَوجی نہیں ہو سکتیں"
+      ip_address_already_screened: "پہلے سے موجودہ ایک اصول میں شامل ہے"
+      restrict_dependent_destroy:
+        one: "ریکارڈ حذف نہیں کیا جا سکتا کیونکہ ایک انحصار %{record} موجود ہے"
+        many: "ریکارڈ حذف نہیں کیا جا سکتا کیونکہ ایک انحصار %{record} موجود ہے"
+      too_long:
+        one: بہت لمبا ہے (زیادہ سے زیادہ 1 حرف ہو سکتا ہے)
+        other: بہت لمبا ہے (زیادہ سے زیادہ %{count} حروف ہو سکتے ہیں)
+      too_short:
+        one: بہت مختصر ہے (کم از کم 1 حرف ہو سکتا ہے)
+        other: بہت مختصر ہے (کم از کم %{count} حروف ہو سکتے ہیں)
+      wrong_length:
+        one: غلط لمبائی ہے (1 حرف لمبا ہونا چاہئے)
+        other: غلط لمبائی ہے (%{count} حروف لمبا ہونا چاہئے)
+      other_than: "%{count}کے علاوہ ہونا لازمی ہے "
+    template:
+      body: 'درج ذیل خانوں کے ساتھ مسائل تھے:'
+      header:
+        one: '1 خرابی نے اِس %{model} کو محفوظ ہونے سے روک دیا'
+        other: '%{count}خرابیوں نے اِس %{model} کو محفوظ ہونے سے روک دیا'
+    embed:
+      load_from_remote: "اُس پوسٹ کو لوڈ کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
+    site_settings:
+      min_username_length_exists: "آپ صارف نام کی کم از کم لمبائی، سب سے مختصر صارف نام کی لمبائی سے کم مقرر نہیں کرسکتے۔"
+      min_username_length_range: "آپ کم از کم، زیادہ سے زیادہ سے اوپر مقرر نہیں کرسکتے۔"
+      max_username_length_exists: "آپ صارف نام کی زیادہ سے زیادہ لمبائی، سب سے طویل صارف نام کی لمبائی سے کم مقرر نہیں کرسکتے۔"
+      max_username_length_range: "آپ زیادہ سے زیادہ، کم از کم سے نیچے مقرر نہیں کرسکتے۔"
+      default_categories_already_selected: "آپ کسی دوسری فہرست میں استعمال کردہ زُمرَہ کا انتخاب نہیں کرسکتے۔"
+      s3_upload_bucket_is_required: "آپ S3 پر اَپ لوڈز فعال نہیں کرسکتے جب تک کہ آپ نے 's3_upload_bucket' فراہم نہیں کیا۔"
+    conflicting_google_user_id: 'اِس اکاؤنٹ کے لئے گُوگَل اکاؤنٹ ID تبدیل ہوگئی ہے؛ سیکیورٹی وجوہات کی بناہ پر اسٹاف کی مداخلت کی ضرورت ہے۔ براہ مہربانی اسٹاف سے رابطہ کریں اور اُنہیں اشارہ کریں <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+  invite:
+    not_found: "آپ کا دعوتی ٹوکن غلط ہے۔ براہ کرم سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+    user_exists: "<b>%{email}</b>کو مدعو کرنے کی کوئی ضرورت نہیں ہے، اُن کا <a href='/u/%{username}/summary'>پہلے سے ہی ایک اکاؤنٹ ہے!</a>"
+  bulk_invite:
+    file_should_be_csv: "اَپ لوڈ شدہ فائل CSV فارمیٹ میں ہونی چاہئے۔"
+    error: "یہ فائل اَپ لوڈ کرنے میں ایک خرابی کا سامنا کرنا پڑا۔  براہ مہربانی کچھ دیر بعد دوبارہ کوشش کریں۔"
+  topic_invite:
+    user_exists: "معذرت، وہ صارف پہلے ہی مدعو کیا جا چکا ہے۔ آپ صارف کو ایک ٹاپک پر صرف ایک ہی دفعہ مدعو کرسکتے ہیں۔"
+  backup:
+    operation_already_running: "ایک کارروائی اِس وقت چل رہی ہے۔ ابھی ایک نیا کام شروع نہیں کیا جا سکتا۔"
+    backup_file_should_be_tar_gz: "بیک اَپ فائل کو .tar.gz آرکائیو ہونا چاہئے۔"
+    not_enough_space_on_disk: "اس بیک اَپ کو اَپ لوڈ کرنے کیلئے ڈِسک میں کافی جگہ نہیں ہے۔"
+    invalid_filename: " بیک اَپ فائل کے نام میں غلط حروف شامل ہیں۔ درست حروف a-z 0-9 . - _ ہیں۔"
+  invalid_params: "آپ نے درخواست پر غلط پیرامیٹرز فراہم کیے ہیں: %{message}"
+  not_logged_in: "آپ کو یہ کرنے کیلئے لاگ اِن ہونا ضروری ہے۔"
+  not_found: "مطلوبہ URL یا ریسورس نہیں مل سکی۔"
+  invalid_access: "آپ کو درخواست کردہ ریسورس کو دیکھنے کی اجازت نہیں ہے۔"
+  invalid_api_credentials: "آپ کو درخواست کردہ ریسورس کو دیکھنے کی اجازت نہیں ہے۔ API کا صارف نام یا کِی غلط ہے۔"
+  read_only_mode_enabled: "یہ سائٹ صرف پڑھنے کے مَوڈ میں ہے۔ اِنٹرَیکشنز غیر فعال ہیں۔"
+  reading_time: "پڑھنے کیلئے وقت"
+  likes: "لائیکس"
+  too_many_replies:
+    one: "ہم معذرت خواہ ہیں، لیکن نئے صارفین کو عارضی طور پر ایک ٹاپک میں 1 جواب تک محدود کیا گیا ہے۔"
+    other: "ہم معذرت خواہ ہیں، لیکن نئے صارفین کو عارضی طور پر ایک ٹاپک میں %{count} جوابات تک محدود کیا گیا ہے۔"
+  embed:
+    start_discussion: "بحث شروع کریں"
+    continue: "بحث جاری رکھیں"
+    error: "اَیمبَیڈ کرنے میں خرابی"
+    referer: "حوالہ دہندہ:"
+    mismatch: "حوالہ دہندہ مندرجہ ذیل ہوسٹس میں سے کسی کے ساتھ بھی مَیچ نہیں کیا:"
+    no_hosts: "اَیمبَیڈ کرنے کیلئے کوئی ہوسٹس سَیٹ نہیں کیے گئے۔"
+    configure: "اَیمبَیڈ کرنا ترتیب دیں"
+    more_replies:
+      one: "1 مزید جواب"
+      other: "%{count}مزید جوابات "
+    loading: "بحث لَوڈ ہو رہی ہے..."
+    permalink: "دائمی لِنک"
+    imported_from: "%{link}پر اصل اندراج کیلئے یہ ایک ساتھی بحث ٹاپک ہے "
+    in_reply_to: "◀ %{username}"
+    replies:
+      one: "1 جواب"
+      other: "%{count}جوابات "
+  no_mentions_allowed: "معذرت، آپ دوسرے صارفین کا ذکر نہیں کر سکتے۔"
+  too_many_mentions:
+    one: "معذرت، آپ ایک پوسٹ میں صرف ایک صارف کا ذکر کر سکتے ہیں۔"
+    other: "معذرت، آپ ایک پوسٹ میں صرف %{count} صارفین کا ذکر کر سکتے ہیں۔"
+  no_mentions_allowed_newuser: "معذرت، نئے صارفین دوسرے صارفین کا ذکر نہیں کر سکتے۔"
+  too_many_mentions_newuser:
+    one: "معذرت، نئے صارفین ایک پوسٹ میں صرف ایک دوسرے صارف کا ذکر کر سکتے ہیں۔"
+    other: "معذرت، نئے صارفین ایک پوسٹ میں صرف %{count} صارفین کا ذکر کر سکتے ہیں۔"
+  no_images_allowed_trust: "معذرت، آپ پوسٹ میں تصاویر نہیں ڈال سکتے"
+  no_images_allowed: "معذرت، نئے صارفین پوسٹس میں تصاویر نہیں ڈال سکتے۔"
+  too_many_images:
+    one: "معذرت، نئے صارفین ایک پوسٹ میں صرف ایک تصویر ڈال سکتے ہیں۔"
+    other: "معذرت، نئے صارفین ایک پوسٹ میں صرف %{count} تصاویر ڈال سکتے ہیں۔"
+  no_attachments_allowed: "معذرت، نئے صارفین پوسٹس میں اَٹَیچمنٹس نہیں ڈال سکتے۔"
+  too_many_attachments:
+    one: "معذرت، نئے صارفین ایک پوسٹ میں صرف ایک اَٹَیچمنٹ ڈال سکتے ہیں۔"
+    other: "معذرت، نئے صارفین ایک پوسٹ میں صرف %{count} اَٹَیچمنٹس ڈال سکتے ہیں۔"
+  no_links_allowed: "معذرت، نئے صارفین پوسٹس میں لِنکس نہیں ڈال سکتے۔"
+  links_require_trust: "معذرت، آپ اپنی پوسٹس میں لِنکس شامل نہیں کر سکتے۔"
+  too_many_links:
+    one: "معذرت، نئے صارفین ایک پوسٹ میں صرف ایک لِنک ڈال سکتے ہیں۔"
+    other: "معذرت، نئے صارفین ایک پوسٹ میں صرف %{count} لِنکس ڈال سکتے ہیں۔"
+  contains_blocked_words: "آپ کی پوسٹ میں ایک ایسا لفظ شامل ہے جس کی اجازت نہیں ہے: %{word}"
+  spamming_host: "معذرت، آپ اس ہَوسٹ کیلئے لِنک پوسٹ نہیں کر سکتے۔"
+  user_is_suspended: "معطل صارفین کو پوسٹ کرنے کی اجازت نہیں ہے۔"
+  topic_not_found: "کچھ غلط ہو گیا ہے۔ شاید جس دوران آپ اِسے دیکھ رہے تھے، یہ ٹاپک بند یا حذف کر دیا گیا؟"
+  not_accepting_pms: "معذرت، %{username} اِس وقت پیغامات قبول نہیں کر رہا ہے۔"
+  max_pm_recepients: "معذرت، آپ زیادہ سے زیادہ %{recipients_limit} وصول کنندگان کو ایک پیغام بھیج سکتے ہیں۔"
+  just_posted_that: "آپ نے جو حال ہی میں پوسٹ کیا ہے، یہ اُسی کی طرح کا بہت زیادہ ہے"
+  invalid_characters: "غلط حروف شامل ہیں"
+  is_invalid: "واضح نہیں لگتا، کیا یہ ایک مکمل جملہ ہے؟"
+  next_page: "اگلا صفحہ ←"
+  prev_page: "→ پچھلا صفح"
+  page_num: "صفحہ نمبر %{num}"
+  home_title: "ہَوم"
+  topics_in_category: "'%{category}' زُمرہ میں ٹاپک"
+  rss_posts_in_topic: "'%{topic}' کی RSS فِیڈ"
+  rss_topics_in_category: "'%{category}' زُمرہ میں ٹاپکس کی RSS فِیڈ"
+  author_wrote: "%{author} نے لکھا: "
+  num_posts: "پوسٹس:"
+  num_participants: "شرکاء:"
+  read_full_topic: "مکمل ٹاپک پڑھیں"
+  private_message_abbrev: "پغم"
+  rss_description:
+    latest: "تازہ ترین ٹاپک"
+    hot: "گرم ٹاپک"
+    top: "ٹاپ ٹاپک"
+    top_all: "تمام وقت کے ٹاپ ٹاپک"
+    top_yearly: "سالانہ ٹاپ ٹاپک"
+    top_quarterly: "سہ ماہی ٹاپ ٹاپک"
+    top_monthly: "ماہانہ ٹاپ ٹاپک"
+    top_weekly: "ہفتہ وار ٹاپ ٹاپک"
+    top_daily: "روزانہ کے ٹاپ ٹاپک"
+    posts: "تازہ ترین پوسٹس"
+    private_posts: "تازہ ترین ذاتی پیغامات"
+    group_posts: "%{group_name} کی طرف سے تازہ ترین پوسٹس "
+    group_mentions: "%{group_name} کی طرف سے تازہ ترین ذکر"
+    user_posts: "@%{username} کی طرف سے تازہ ترین پوسٹس"
+    user_topics: "@%{username} کی طرف سے تازہ ترین ٹاپک"
+    tag: "ٹیگ ہوے ٹاپک"
+    badge: "%{display_name} پر %{site_title} بَیج"
+  too_late_to_edit: "یہ پوسٹ بہت دیر پہلے بنائی گئی تھی۔ یہ مزید ترمیم یا حذف نہیں کی جا سکتی۔"
+  revert_version_same: "موجودہ وَرژن وہی وَرژن ہے جسے آپ واپس لوٹانے کی کوشش کررہے ہیں۔"
+  excerpt_image: "تصویر"
+  queue:
+    delete_reason: "پوسٹ ماڈرَیشَن قطار کے ذریعے حذف کر دیا گیا"
+    not_found: "پوسٹ نہیں مل سکی یا پہلے سے ہی اَپ ڈیٹ ہو چکی ہے۔"
+  groups:
+    errors:
+      can_not_modify_automatic: "آپ ایک خودکار گروپ کو ترمیم نہیں کر سکتے ہیں"
+      invalid_domain: "'%{domain}' ایک درست ڈَومَین نہیں ہے۔"
+      invalid_incoming_email: "'%{domain}' ایک درست ایِ میل ایڈریس نہیں ہے۔"
+      email_already_used_in_group: "'%{email}' پہلے ہی گروپ '%{group_name}' کے ذیرِاستعمال ہے۔"
+      email_already_used_in_category: "'%{email}' پہلے ہی زُمرہ '%{category_name}' کے ذیرِاستعمال ہے۔"
+      cant_allow_membership_requests: "آپ ایک ایسا گروپ جس کا کوئی مالک نہ ہو، اُس کیلئے رکنیت کی درخواستوں کی اجازت نہیں دے سکتے۔"
+    default_names:
+      everyone: "ہر کوئی"
+      admins: "ایڈمن"
+      moderators: "ماڈریٹرز"
+      staff: "اسٹاف"
+      trust_level_0: "ٹرسٹ_لَیول_0"
+      trust_level_1: "ٹرسٹ_لَیول_1"
+      trust_level_2: "ٹرسٹ_لَیول_2"
+      trust_level_3: "ٹرسٹ_لَیول_3"
+      trust_level_4: "ٹرسٹ_لَیول_4"
+    request_membership_pm:
+      title: "@%{group_name} کیلئے رکنیت کی درخواست"
+  education:
+    until_posts:
+      one: "1 پوسٹ"
+      other: "%{count} پوسٹس"
+    new-topic: |
+      %{site_name}پر خوش آمدید &mdash؛ **نئی بات چیت شروع کرنے کیلئے شکریہ!**
+
+      - اگر آپ عنوان کو زبان سے پڑھیں تو کیا یہ دِلچسپ سنائی دیتا ہے؟ کیا یہ ایک اچھا خلاصہ ہے؟
+
+      - کون اِس میں دلچسپی رکھے گا؟ یہ کیوں ضروری ہے؟ آپ کو کس قِسم کے جوابات چاہیئیں؟
+
+      - امنے ٹاپک میں عام طور پر استعمال کردہ الفاظ شامل کریں تاکہ دوسرے اِسے *تلاش* کرسکیں۔ اپنے ٹاپک کو متعلقہ ٹاپکس کے ساتھ گروہ کرنے کیلئے، ایک زُمرہ منتخب کریں۔
+
+      مزید کے لئے، [ہماری کمیونٹی کی رہنما ہدایات دیکھیے](/guidelines)۔ یہ پَینل صرف آپ کے پہلے %{education_posts_text} کیلئے ظاہر ہوگا۔
+    new-reply: |
+      %{site_name}پر خوش آمدید &mdash؛ **شراکت کیلئے شکریہ!**
+
+      - کیا آپ کا جواب کسی طرح سے اِس بات چیت کو بہتر بناتا ہے؟
+
+      - اپنے کمیونٹی کے ارکان کے ساتھ مہربان ہوں۔
+
+      - تعمیراتی تنقید قابل قبول ہے، لیکن تنقید *خیالات* پر کریں، نہ کہ لوگوں پر۔
+
+      مزید کے لئے، [ہماری کمیونٹی کی رہنما ہدایات دیکھیے](/guidelines)۔ یہ پَینل صرف آپ کے پہلے %{education_posts_text} کیلئے ظاہر ہوگا۔
+    avatar: |
+      ### آپ کے اکاؤنٹ کیلئے ایک تصویر کیسی لگے گی؟
+
+      آپ نے چند ٹاپک اور جوابات پوسٹ کیے ہیں، لیکن آپ کی پروفائل تصویر آپ کی طرح منفرد نہیں ہے – یہ صرف ایک حرف ہے۔
+
+      کیا آپ نے اِس بات پر غور کیا ہے کہ آپ **[اپنے صارف پروفائل پر جا کر](%{profile_path})** اور ایسی تصویر اَپ لَوڈ کریں جو آپ کی نمائندگی کرتی ہو؟
+
+      بات چیت کی پیروی کرنا اور دلچسپ لوگوں کو بات چیت میں تلاش کرنا آسان ہو جاتا ہے جب سب کی ایک منفرد پروفائل تصویر ہے!
+    sequential_replies: |
+      ### ایک ساتھ کئی پوسٹس کا جواب دینے پر غور کریں
+
+      ٹاپک پر ایک سلسلہ میں کئی جوابوں کے بجائے، براہ کرم ایک ہی جواب، جس میں پچھلی پوسٹس کے اقتباس یا @نام کے حوالے شامل ہوں، پر غور کریں۔
+
+      متن کو اُجاگر کر کہ ظاہر ہونے والے <b>جواب اقتباس کریں</b> بٹن منتخب کرنے سے ایک اقتباس شامل کرنے کیلئے آپ اپنے پچھلے جواب میں ترمیم کرسکتے ہیں۔
+
+      ہر ایک کیلئے اُن ٹاپکس کو پڑھ نا زیادہ آسان ہے جس میں بہت سے چھوٹے، انفرادی جوابات کے مقابلے میں تفصیلی لیکن کم جوابات ہوں۔
+    dominating_topic: |
+      ### دوسروں کو گفتگو میں شامل ہونے کی اجازت دیں
+
+      یہ ٹاپک آپ کے لئے واضح طور پر اہم ہے&ndash; آپ نے یہاں %{percent}% سے زیادہ جوابات پوسٹ کیے ہیں۔
+
+      کیا آپ کو یقین ہے کہ آپ دوسروں کو اپنے نقطہ نظر کا اشتراک کرنے کیلئے کافی وقت فراہم کررہے ہیں؟
+    get_a_room: |
+      ### مزید لوگوں کو جواب دینے پر غور کریں
+
+      آپ نے اِس مخصوص ٹاپک میں پہلے ہی @%{reply_username} کو %{count} مرتبہ جواب دیا ہے۔
+
+      کیا آپ نے بحث میں *دیگر* لوگوں کو بھی جواب دیبے کا سوچا ہے؟ ایک عظیم بحث میں مختلف آرا اور نقطہ نظر شامل ہوتے ہیں۔
+
+      اگر آپ اِس مخصوص صارف کے ساتھ اپنی گفتگو لمبائی میں جاری رکھنا چاہتے ہیں، تو [اِنہیں ایک ذاتی پیغام بھیجیں](/u/%{reply_username})۔
+    too_many_replies: |
+      ### آپ اس ٹاپک پر جوابات کے نمبر کی حد تک پہنچ گئے ہیں
+
+      ہم معذرت خواہ ہیں، لیکن نئے صارفین کو عارضی طور پر ایک ٹاپک میں %{newuser_max_replies_per_topic} جوابات تک محدود کیا گیا ہے۔
+
+      ایک اور جواب کو شامل کرنے کے بجائے، براہ کرم اپنے پچھلے جوابوں میں ترمیم، یا دیگر ٹاپکس ملاحظہ کرنے کے بارے میں سوچیں۔
+    reviving_old_topic: |
+      ### اِس ٹاپک کو بحال کریں؟
+
+      اِس ٹاپک پر آخری جواب **** تھا۔ آپ کا جواب ٹاپک کو اپنی فہرست کے سب سے اوپر پہنچا دے گا اور گفتگو میں پہلے ملوث تمام افراد کو مطلع کردے گا۔
+
+      کیا آپ واقعی یہ پرانی گفتگو جاری رکھنا چاہتے ہیں؟
+  activerecord:
+    attributes:
+      category:
+        name: "زُمرہ کا نام"
+      topic:
+        title: 'عنوان'
+        featured_link: 'نمایاں لنک'
+      post:
+        raw: "متن"
+      user_profile:
+        bio_raw: "میرے بارے میں"
+    errors:
+      models:
+        topic:
+          attributes:
+            base:
+              warning_requires_pm: "آپ ذاتی پیغامات کے ساتھ صرف انتباہات منسلک کرسکتے ہیں۔"
+              too_many_users: "آپ انتباہات ایک وقت میں صرف ایک صارف کو بھیج سکتے ہیں۔"
+              cant_send_pm: "معذرت، آپ اُس صارف کو ذاتی پیغام نہیں بھیج سکتے۔"
+              no_user_selected: "آپ کا ایک درست صارف منتخب کرنا ضروری ہے۔"
+              reply_by_email_disabled: "ای میل کے ذریعے جواب دینا غیر فعال کردیا گیا ہے۔"
+              target_user_not_found: "جن صارفین کو آپ یہ پیغام بھیج رہے ہیں اُن میں سے ایک نہ مل سکا۔"
+            featured_link:
+              invalid: "غلط ہے۔ URL میں http:// یا https:// شامل ہونا چاہئے۔"
+              invalid_category: "اِس زُمرہ میں ترمیم نہیں کیا جا سکتا۔"
+        user:
+          attributes:
+            password:
+              common: "سب سے زیادہ عام 10000 پاسورڈز میں سے ایک ہے۔ براہ مہربانی مزید محفوظ پاسورڈ کا استعمال کریں۔"
+              same_as_username: "آپ کے صارف نام جیسا ہی ہے۔ براہ مہربانی مزید محفوظ پاسورڈ کا استعمال کریں۔"
+              same_as_email: "آپ کے ای میل جیسا ہی ہے۔ براہ مہربانی مزید محفوظ پاسورڈ کا استعمال کریں۔"
+              same_as_current: "آپ کے موجودہ پاسورڈ جیسا ہی ہے۔"
+              unique_characters: "بار بار اِستعمال ہونے والے بہت زیادہ حروف شامل ہیں۔ براہ مہربانی مزید محفوظ پاسورڈ کا استعمال کریں۔"
+            ip_address:
+              signup_not_allowed: "اِس اکاؤنٹ سے سائن اَپ کی اجازت نہیں ہے۔"
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "کسی دوسرے صارف کو ایک بنیادی ای میل دوبارہ تفویض کرنے کی اجازت نہیں ہے۔"
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "درست رنگ نہیں ہے"
+        post_reply:
+          base:
+            different_topic: "پوسٹ اور جواب ایک ہی ٹاپک سے منسلک ہونے چاہئیں۔"
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "URL غلط ہے۔ URL میں http:// یا https:// شامل ہونا چاہئے۔ اور کوئی خالی جگہ کی اجازت نہیں ہے۔"
+        custom_emoji:
+          attributes:
+            name:
+              taken: پہلے سے ہی ایک دوسرے اِیمَوجی کے ذیرِ استعمال ہے
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "مستقبل میں ہونا ضروری ہے۔"
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'مندرجہ ذیل اِنٹَرپَولَیشَن کیز غلط ہیں: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "اس کارروائی کیلئے بہت زیادہ الفاظ"
+      <<: *errors
+  user_profile:
+    no_info_me: "<div class='missing-profile'>آپ کی پروفائل کا \"میرے بارے میں\" والی فیلڈ فی الحال خالی ہے، <a href='/u/%{username_lower}/preferences/about-me'>کیا آپ اسے بھرنا پسند کریں گے؟</a></div>"
+    no_info_other: "<div class='missing-profile'>%{name}نے اپنی پروفائل کے \"میرے بارے میں\" والی فیلڈ میں ابھی تک کچھ نہیں درج کیا</div>"
+  vip_category_name: "لاؤنج"
+  vip_category_description: "ٹرسٹ لَیول 3 یا اُس سے زیادہ والے ارکان کیلئے خاص زُمرہ۔"
+  meta_category_name: "سائٹ کیلئے رائے"
+  meta_category_description: "اِس سائٹ کے بارے میں بحث، اِس کی تنظیم، یہ کیسے کام کرتی ہے، اور ہم کس طرح اِسے بہتر بنا سکتے ہیں۔"
+  staff_category_name: "سٹاف"
+  staff_category_description: "اسٹاف کی گفتگو کیلئے ذاتی زُمرہ۔ ٹاپک صرف ایڈمن اور ماڈریٹرز کو نظر آتے ہیں۔"
+  assets_topic_title: "سائٹ کے ڈیزائن کیلئے اثاثہ جات"
+  assets_topic_body: "یہ ٹاپک، جو صرف اسٹاف کو نظر آتا ہے، سائٹ کے ڈیزائن میں استعمال ہونے والی تصاویر اور فائلوں کو رکھنے کیلئے ہے۔ اسے حذف نہ کیجیے!\n\n\nیہ اِس طرح سے ہے:\n\n\n1. اس ٹاپک پر جواب دیں۔\n2. تمام تصاویر جنہیں آپ لوگو، فیوکان یا دوسری چیزوں کیلئے استعمال کرنا چاہتے ہیں یہاں اَپ لوڈ کریں۔ (پوسٹ ایڈیٹر میں اپلوڈ ٹول بار آئیکن کا استعمال کریں، یا ڈریگ اور ڈراپ یا تصاویر پیسٹ کریں۔)\n3. پوسٹ کرنے کیلئے اپنا جواب شائع کریں۔\n4. اپ لوڈ کردہ تصاویر کے پاتھ حاصل کرنے کیلئے اپنی نئی پوسٹ میں تصاویر پر دائیں کلِک کریں، یا اپنی پوسٹ میں ترمیم کرنے کیلئے ترمیم آئیکن پر کلِک کریں اور تصاویر کے پاتھ حاصل کریں۔ تصویر کا پاتھ کاپی کریں۔\n5. اِن تصاویر کے پاتھ کو [بنیادی ترتیبات](/admin/site_settings/category/required) میں پَیسٹ کریں۔\n\n\nاگر آپ کو مختلف فائل اِقسام کے اَپ لوڈ کو فعال کرنے کی ضرورت ہے تو، [فائل ترتیبات]() کت اندر `authorized_extensions` میں ترمیم کریں۔"
+  discourse_welcome_topic:
+    title: "ڈسکورس میں خوش آمدید"
+    body: |2
+
+        اس پِن کیے گئے ٹاپک کا پہلا پیراگراف آپ کے ہَوم پیج پر تمام نئے زائرین کو ایک خوش آمدید پیغام کے طور پر نظر آئے گا۔ یہ اہم ہے!
+
+        **اس میں ترمیم کریں** آپنی کمیونٹی کی ایک مختصر وضاحت میں:
+
+        یہ کس کیلئے ہے؟
+        وہ یہاں کیا تلاش کرسکتے ہیں؟
+        وہ یہاں کیوں آئیں؟
+        - وہ مزید کہاں پڑھ سکتے ہیں (لنکس، وسائل، وغیرہ)؟
+
+        <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+        آپ اَیڈمن :wrench: (اوپری دائیں اور سب سے نیچے) کے ذریعہ اِس ٹاپک کو بند کرنا چاہیں گے، تاکہ ایک اعلان پر جوابات کا ڈھیر نہ لگ جائے۔
+  lounge_welcome:
+    title: "لاؤنج میں خوش آمدید"
+    body: |2
+
+        مبارک باد! :confetti_ball:
+
+        اگر آپ اِس ٹاپک کو دیکھ سکتے ہیں، تو آپ کو حال ہی میں **رَیگولر** (ٹرسٹ لَیول 3) پر ترقی دے دی گئی ہے۔
+
+        اب آپ &hellip;
+
+        * کسی بھی ٹاپک کے عنوان میں ترمیم کر سکتے ہیں
+        * کسی بھی ٹاپک کا زُمرہ تبدیل کر سکتے ہیں
+        * اپنے تمام لِنکس فَولَو کروا سکتے ہیں ([خود کار طریقے سےغیر فَولَو](http://en.wikipedia.org/wiki/Nofollow) is removed) ہٹا دیا جاتا ہے)
+        * ایک ذاتی لاؤنج زُمرہ جو صرف ٹرسٹ لَیول 3 یا اُس سے زیادہ والے صارفین کو نظر آتا ہے تک رسائی کر سکتے ہیں
+        * ایک ہی فلَیگ سے سپَیم چھپا سکتے ہیں
+
+        یہاں [ساتھی رَیگولرز کی موجودہ فہرست](/badges/3/regular) ہے۔ ہیلو کہنا نہ بھولیے گا۔
+
+        اِس کمیونٹی کا ایک اہم حصہ ہونے کا شکریہ!
+
+        (ٹرسٹ لَیول پر مزید معلومات کیلئے، [یہ ٹاپک دیکھیے][اعتماد]۔ براہ کرم نوٹ کریں کہ صرف ایسے ممبران جو وقت کے ساتھ شرائط کو پورا کرتے رہیں گے صرف وہی رَیگولرز میں شامل رہیں گے۔)
+
+        [اعتماد]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+  category:
+    topic_prefix: "%{category} زُمرہ کے بارے میں"
+    replace_paragraph: "(اس پہلے پیراگراف کو اپنے نئے زُمرہ کے بارے میں ایک مختصر وضاحت کے ساتھ تبدیل کریں۔ یہ ہدایات زُمرہ کے انتخاب کے والی جگہ پر نظر آئے گا، لہٰذا اِسے 200 حروف سے نیچے رکھنے کی کوشش کریں۔ **جب تک آپ اِس وضاحت میں ترمیم یا ٹاپک نہیں بنائیں گے، یہ زُمرہ زُمرہ جات کے صفحہ پر نہیں دکھایا جائے گا۔**)"
+    post_template: "%{replace_paragraph}\n\nطویل تر وضاحت، یا زُمرہ کے قواعد و ضوابط قائم کرنے کیلئے مندرجہ ذیل پیراگراف کا استعمال کریں:\n\n- لوگوں کو اِس زُمرہ کو کیوں استعمال کرنا چاہئے؟ یہ کس لیے ہے؟ \n\n- ہمارے پاس پہلے ہی سے موجود دیگر زُمرہ جات کے مقابلے میں یہ کس طرح مختلف ہے؟\n\n- اس زُمرہ کے ٹاپکس میں عام طور پر کیا ہونا چاہئے؟\n\nکیا ہمیں اِس زُمرہ کی ضرورت ہے؟ کیا ہم کسی اور زُمرہ، یا ذیلی زمرہ کے ساتھ ضم کر سکتے ہیں؟\n"
+    errors:
+      not_found: "زُمرہ نہیں ملا!"
+      uncategorized_parent: "بِلا زُمرہ والوں کا بالائی زُمرہ نہیں ہو سکتا"
+      self_parent: "ایک ذیلی زُمرہ کا بالائی وہ خود ہی نہیں ہوسکتا"
+      depth: "آپ ایک ذیلی زُمرہ کو کسی دوسرے کے تحت نہیں کر سکتے"
+      invalid_email_in: "'%{email}' ایک درست ای میل اَیڈرَیس نہیں ہے۔"
+      email_already_used_in_group: "'%{email}' پہلے ہی گروپ '%{group_name}' کے ذیرِاستعمال ہے۔"
+      email_already_used_in_category: "'%{email}' پہلے ہی زُمرہ '%{category_name}' کے ذیرِاستعمال ہے۔"
+      description_incomplete: "زُمرہ کی وضاحت والی پوسٹ کا کم ازکم ایک پیراگراف ہونا ضروری ہے۔"
+    cannot_delete:
+      uncategorized: "بِلا زُمرہ والوں کو حذف نہیں کیا جا سکتا"
+      has_subcategories: "اِس زُمرہ کو حذف نہیں کیا جا سکتا کیونکہ اِس کے ذیلی زُمرہ ہیں۔"
+      topic_exists:
+        one: "اِس زُمرہ کو حذف نہیں کیا جا سکتا کیونکہ اِس میں 1 ٹاپک ہے۔ سب سے پرانا ٹاپک %{topic_link} ہے۔"
+        other: "اِس زُمرہ کو حذف نہیں کیا جا سکتا کیونکہ اِس میں %{count} ٹاپک ہیں۔ سب سے پرانا ٹاپک %{topic_link} ہے۔"
+      topic_exists_no_oldest: "اِس زُمرہ کو حذف نہیں کیا جا سکتا کیونکہ ٹاپک تعداد %{count} ہے۔"
+    uncategorized_description: "وہ ٹاپک جنہیں کسی زُمرہ کی ضرورت نہیں، یا جو کسی اور موجودہ زُمرہ میں فِٹ نہیں ہوتے۔"
+  trust_levels:
+    newuser:
+      title: "نیا صارف"
+    basic:
+      title: "بَیسِک صارف"
+    member:
+      title: "ممبر"
+    regular:
+      title: "رَیگولر"
+    leader:
+      title: "لِیڈر"
+    change_failed_explanation: "آپ نے %{user_name} کو '%{new_trust_level}' تک درجہ کم کرنے کی کوشش کی۔ تاہم اُن کا ٹرسٹ لَیول پہلے سے ہی '%{current_trust_level}' ہے۔ %{user_name} '%{current_trust_level}' پر رہیں گے - اگر آپ صارف کا درجہ کم کرنا چاہتے ہیں تو پہلے ٹرسٹ لَیول لاک کیجیے"
+  post:
+    image_placeholder:
+      broken: "یہ تصویر ٹوٹی ہوئی ہے"
+  rate_limiter:
+    slow_down: "آپ یہ کارروائی بہت بار کر چکے ہیں، براہ کرم بعد میں دوبارہ کوشش کیجیے۔"
+    too_many_requests: "آپ نے یہ کارروائی بہت زیادہ دفعہ کی ہے۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+    by_type:
+      first_day_replies_per_day: "آپ نئے صارف کیلئے پہلے دن کے زیادہ سے زیادہ جوابات کی حد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      first_day_topics_per_day: "آپ نئے صارف کیلئے پہلے دن کے زیادہ سے زیادہ بنائے جانے والے ٹاپکس کی حد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      create_topic: "آپ بہت جلدی سے ٹاپکس بنائے جا رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      create_post: "آپ بہت جلدی سے جواب دیے جا رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      delete_post: "آپ بہت جلدی سے پوسٹس حذف کرتے جا رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      public_group_membership: "آپ بہت کثرت سے گروپوں میں شامل اور اُنہیں چھوڑ رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      topics_per_day: "آپ نئے ٹاپکس کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      pms_per_day: "آپ نئے پیغامات کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      create_like: "آپ لائیکس کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      create_bookmark: "آپ بُکمارکس کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      edit_post: "آپ ترامیم کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      live_post_counts: "آپ بہت جلدی سے لائیو پوسٹ شمار کیلئے درخواست کر رہے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      unsubscribe_via_email: "آپ ای میل کے ذریعہ رکنیت ختم کرنے کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+      topic_invitations_per_day: "آپ ٹاپک کیلئے دعوت ناموں کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ براہ کرم دوبارہ کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
+    hours:
+      one: "1 گھنٹا"
+      other: "%{count} گھنٹے"
+    minutes:
+      one: "1 منٹ"
+      other: "%{count} منٹس"
+    seconds:
+      one: "1 سیکنڈ"
+      other: "%{count} سیکنڈ"
+  datetime:
+    distance_in_words:
+      half_a_minute: "< 1منٹ"
+      less_than_x_seconds:
+        one: "< 1سیکنڈ"
+        other: "< %{count}سیکنڈ"
+      x_seconds:
+        one: "1سیکنڈ"
+        other: "%{count}سیکنڈ"
+      less_than_x_minutes:
+        one: "< 1منٹ "
+        other: "< %{count}منٹ "
+      x_minutes:
+        one: "1منٹ"
+        other: "%{count}منٹ "
+      about_x_hours:
+        one: "1گھنٹا"
+        other: "%{count}گھنٹے"
+      x_days:
+        one: "1دن"
+        other: "%{count}دن"
+      about_x_months:
+        one: "1ماہ"
+        other: "%{count}مہینے"
+      x_months:
+        one: "1ماہ"
+        other: "%{count}مہینے"
+      about_x_years:
+        one: "1سال"
+        other: "%{count}سال"
+      over_x_years:
+        one: "> 1سال"
+        other: "> %{count}سال"
+      almost_x_years:
+        one: "1سال"
+        other: "%{count}سال"
+    distance_in_words_verbose:
+      half_a_minute: "ابھی"
+      less_than_x_seconds:
+        one: "ابھی"
+        other: "ابھی"
+      x_seconds:
+        one: "1 سیکنڈ قبل"
+        other: "%{count} سیکنڈ قبل"
+      less_than_x_minutes:
+        one: "قبل از 1 منٹ سے بھی کم"
+        other: "قبل از %{count} منٹ"
+      x_minutes:
+        one: "1 منٹ قبل"
+        other: "%{count} منٹ قبل"
+      about_x_hours:
+        one: "قبل از 1 گھنٹہ"
+        other: " %{count} گھنٹے قبل"
+      x_days:
+        one: "قبل از 1 دن"
+        other: "%{count} دن قبل"
+      about_x_months:
+        one: "تقریباً 1 ماہ قبل"
+        other: "تقریباً %{count} مہینے قبل"
+      x_months:
+        one: "1 ماہ قبل"
+        other: " %{count} مہینے قبل "
+      about_x_years:
+        one: "تقریباً 1 سال قبل"
+        other: "تقریباً %{count} سال قبل"
+      over_x_years:
+        one: "1 سال سے زیادہ پہلے"
+        other: "%{count} سال سے زیادہ پہلے"
+      almost_x_years:
+        one: "تقریباً 1 سال قبل"
+        other: "تقریباً %{count} سال قبل"
+  password_reset:
+    no_token: "معذرت، وہ پاسورڈ تبدیل کرنے کا لِنک بہت پرانا ہے۔ لاگ ان کے بٹن کو منتخب کریں اور ایک نیا لِنک حاصل کرنے کیلئے 'میں اپنا پاسورڈ بھول گیا' کا استعمال کریں۔"
+    choose_new: "نیا پاسورڈ منتخب کریں"
+    choose: "پاسورڈ منتخب کریں"
+    update: 'پاسورڈ اَپ ڈیٹ کریں'
+    save: 'پاسورڈ رکھیں'
+    title: 'پاسورڈ رِی سَیٹ کریں'
+    success: "آپ نے کامیابی سے اپنا پاسورڈ تبدیل کر لیا اور اب آپ لاگ ان ہوے وے ہیں۔"
+    success_unapproved: "آپ نے کامیابی سے اپنا پاسورڈ تبدیل کر لیا۔"
+  email_login:
+    invalid_token: "معذرت، وہ بذریعہ ای میل لاگ اِن لِنک بہت پرانا ہے۔ لاگ ان کے بٹن کو منتخب کریں اور ایک نیا لِنک حاصل کرنے کیلئے 'میں اپنا پاسورڈ بھول گیا' کا استعمال کریں۔"
+    title: "بذریعہ ای میل لاگ اِن"
+  change_email:
+    confirmed: "آپ کا اِی میل اپڈیٹ کر دیا کیا ہے۔"
+    please_continue: "%{site_name} پر جاری رکھیں"
+    error: "آپ کا اِی میل ایڈریس تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ شاید یہ ایڈریس پہلے سے استعمال میں ہے؟"
+    error_staged: "آپ کا اِی میل تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ یہ ایڈریس پہلے سے ہی ایک سٹَیجڈ صارف کے استعمال میں ہے۔"
+    already_done: "معذرت، یہ تصدیقی لِنک اب درست نہیں ہے۔ شاید آپ کا اِی میل پہلے ہی بدل چکا تھا؟"
+    authorizing_old:
+      title: "اپنے موجودہ اِی میل ایڈریس کی تصدیق کرنے کیلئے شکریہ"
+      description: "اب ہم تصدیق کیلئے آپ کے نئے ایڈریس پر اِی میل کر رہے ہیں۔"
+  activation:
+    action: "اپنا اکاؤنٹ فعال کرنے کیلئے یہاں کلک کریں"
+    already_done: "معذرت، یہ اکاؤنٹ تصدیق لنک اب درست نہیں ہے۔ شاید آپ کا اکاؤنٹ پہلے ہی سے فعال ہے؟"
+    please_continue: "آپ کا نیا اکاؤنٹ تصدیق کر لیا گیا ہے؛ آپ کو ہَوم پیج پر ری ڈائرَیکٹ کیا جائے گا۔"
+    continue_button: "%{site_name} پر جاری رکھیں"
+    welcome_to: "%{site_name} پر خوش آمدید!"
+    approval_required: "اِس فورم تک رسائی حاصل کرنے سے پہلے ایک ماڈریٹر کو آپ کا نیا اکاؤنٹ دستی طور پر منظور کرنا ضروری ہے۔ جب آپ کا اکاؤنٹ منظور ہوجائے گا تو آپ کو ایک اِی میل مل جائے گی!"
+    missing_session: "ہم یہ پتہ نہیں لگا سکتے کہ آپ کا اکاؤنٹ بن چکا تھا کہ نہیں، براہ مہربانی یقینی بنائیں کہ کُوکِیز فعال ہوں۔"
+    activated: "معذرت، یہ اکاؤنٹ پہلے ہی سے چالو کر دیا گیا ہے۔"
+    admin_confirm:
+      title: "توثیق ایڈمن اکاؤنٹ"
+      description: "کیا آپ واقعی <b>%{target_username}</b> کو ایک ایڈمِنِسٹریٹر بننا چاہتے ہیں؟"
+      grant: "عطا ایڈمن رسائی"
+      complete: "<b>%{target_username}</b> اب ایک ایڈمِنِسٹریٹر ہے۔"
+      back_to: "%{title} پر واپس جائیں"
+  post_action_types:
+    off_topic:
+      title: 'موضوع سے ہٹ کر'
+      description: 'موجودہ بحث جو کہ عنوان اور پہلی پوسٹ سے واضح ہوتی ہے، یہ پوسٹ اُس سے متعلق نہیں ہے، اور غالباً کہیں اور منتقل ہوجانی چاہئیے۔'
+      short_description: 'بحث سے متعلق نہیں'
+      long_form: 'اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا گیا'
+    spam:
+      title: 'سپَیم'
+      description: 'یہ پوسٹ ایک اشتہار، یا وَینڈَلِزم ہے۔ یہ مفید یا موجودہ موضوع کے متعلقہ نہیں ہے۔'
+      short_description: 'یہ ایک اشتہار، یا وَینڈَلِزم ہے'
+      long_form: 'اِس کو سپَیم ہونے کے طور پر فلَیگ کیا گیا'
+      email_title: '"%{title}" کو سپَیم کے طور پر فلَیگ کیا گیا'
+      email_body: "%{link}\n\n%{message}"
+    inappropriate:
+      title: 'نامناسب'
+      description: 'اِس پوسٹ میں ایسا مواد شامل ہے جو ایک مناسب شخص جارحانہ، غیر مہذب، یا <a href="/guidelines">ہماری کمیونٹی کے قواعد و ضوابط</a> کے خلاف سمجھے گا۔'
+      short_description: '<a href="/guidelines">ہماری کمیونٹی کے قواعد و ضوابط</a> کی خلاف ورزی'
+      long_form: 'اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا'
+    notify_user:
+      title: '@{{username}} کو ایک پیغام بھیجیں'
+      description: 'میں اِس شخص سے اُس کی پوسٹ کے بارے میں براہ راست اور ذاتی طور پر بات کرنا چاہتا ہوں۔'
+      short_description: 'میں اِس شخص سے اُس کی پوسٹ کے بارے میں براہ راست اور ذاتی طور پر بات کرنا چاہتا ہوں۔'
+      long_form: 'پیغام دیا گیا صارف'
+      email_title: 'آپ کی "%{title}" میں پوسٹ'
+      email_body: "%{link}\n\n%{message}"
+    notify_moderators:
+      title: " کچھ اور"
+      description: 'اِس پوسٹ پر اسٹاف کی توجہ درکار ہے جس کی وجہ مندرجہ بالا درج وجوہات میں شامل نہیں ہے۔'
+      short_description: 'اسٹاف کی توجہ کسی اور وجہ کی بناہ پر درکار ہے'
+      long_form: 'اِس کو اسٹاف کی توجہ کیلئے فلَیگ کیا گیا'
+      email_title: '"%{title}" میں ایک پوسٹ پر اسٹاف کی توجہ درکار ہے'
+      email_body: "%{link}\n\n%{message}"
+    bookmark:
+      title: 'بُک مارک'
+      description: 'اِس پوسٹ کو بُک مارک کریں'
+      short_description: 'اِس پوسٹ کو بُک مارک کریں'
+      long_form: 'اِس پوسٹ کو بُک مارک کیا'
+    like:
+      title: 'لائیک'
+      description: ' اِس پوسٹ کو لائیک کریں'
+      short_description: ' اِس پوسٹ کو لائیک کریں'
+      long_form: 'اِس کو لائیک کیا'
+    vote:
+      title: 'ووٹ'
+      description: 'اِس پوسٹ کیلیے ووٹ کریں'
+      short_description: 'اِس پوسٹ کیلیے ووٹ کریں'
+      long_form: 'اِس پوسٹ کے لیے ووٹ کیا'
+  user_activity:
+    no_default:
+      self: "ابھی تک آپ کی کوئی سرگرمی نہیں ہے."
+      others: "کوئی سرگرمی نہیں۔"
+    no_bookmarks:
+      self: "آپ کے پاس کوئی بُک مارک کی ہوئی پوسٹس نہیں ہیں، پوسٹس بُک مارک کرنے سے آپ بعد میں اُن تک آسانی سے رسائی حاصل کرپاتے ہیں۔"
+      others: "کوئی بُک مارکس نہیں"
+    no_likes_given:
+      self: "آپ نے کوئی پوسٹس لائیک نہیں کیں۔"
+      others: "کوئی لائیک کردہ پوسٹس نہیں۔"
+    no_replies:
+      self: "آپ نے کسی بھی پوسٹ پر جواب نہیں دیا ہے۔"
+      others: "کوئی جوابات نہیں۔"
+  topic_flag_types:
+    spam:
+      title: 'سپَیم'
+      description: 'یہ ٹاپک ایک اشتہار ہے۔ یہ اِس سائٹ کیلئے مفید یا اِس کے متعلقہ نہیں ہے، لیکن نوعیت میں پروموشنل ہے۔'
+      long_form: 'اِس کو سپَیم کے طور پر فلَیگ کیا گیا'
+    inappropriate:
+      title: 'نامناسب'
+      description: 'اِس ٹاپک میں ایسا مواد شامل ہے جو ایک مناسب شخص جارحانہ، غیر مہذب، یا <a href="/guidelines">ہماری کمیونٹی کے قواعد و ضوابط</a> کے خلاف سمجھے گا۔'
+      long_form: 'اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا'
+    notify_moderators:
+      title: "کچھ اور"
+      description: 'اِس ٹاپک کو، <a href="/guidelines">قواعد و ضوابط</a>، <a href="%{tos_url}">سروس کی شرائط</a>، یا مندرجہ بالا درج وجوہات کے علاوہ، کے مطابق اسٹاف کی عام توجہ کی ضرورت ہے۔'
+      long_form: 'اِس کو ماڈریٹر کی توجہ کیلئے فلَیگ کیا گیا'
+      email_title: 'ٹاپک "%{title}" پر اسٹاف کی توجہ درکار ہے'
+      email_body: "%{link}\n\n%{message}"
+  flagging:
+    you_must_edit: '<p>آپ کی پوسٹ کمیونٹی کی طرف سے فلَیگ کی گئی تھی۔ براہ مہربانی <a href="%{path}">اپنے پیغامات دیکھیے</a>۔</p>'
+    user_must_edit: '<p>یہ پوسٹ کمیونٹی کی طرف سے فلَیگ کی گئی تھی اور عارضی طور پر چھپا دی گئی ہے۔</p>'
+  archetypes:
+    regular:
+      title: "عام ٹاپک"
+    banner:
+      title: "بینر ٹاپک"
+      message:
+        make: "یہ ٹاپک اب ایک بَینر ہے۔ یہ ہر صفحے کے سب سے اوپر دکھایا جائے گا جب تک صارف اِسے برخاست نہیں کر دیتا۔"
+        remove: "یہ ٹاپک اب بینر نہیں ہے۔ یہ اب ہر صفحے کے سب سے اوپر دکھایا نہیں جائے گا۔"
+  unsubscribed:
+    title: "غیر سَبسکرائب شدہ!"
+    description: "<b>%{email}</b> کو غیر سَبسکرائب کر دیا گیا ہے۔ اپنی ای میل کی ترتیبات کو تبدیل کرنے کیلئے <a href='%{url}'>اپنی صارفی ترجیحات پر جائیں</a>۔"
+    topic_description: "%{link} پر دوبارہ سَبسکرائب کرنے کیلئے، ٹاپک کے نچلے حصے یا دائیں جانب اطلاعات کنٹرول کا استعمال کریں۔"
+  unsubscribe:
+    title: "غیر سَبسکرائب"
+    stop_watching_topic: "اس ٹاپک کو دیکھنا چھوڑ دیں، %{link}"
+    mute_topic: "اِس ٹاپک کیلئے تمام اطلاعات کو خاموش کر دیں، %{link}"
+    unwatch_category: "%{category} میں تمام ٹاپکس کو دیکھنا چھوڑ دیں"
+    mailing_list_mode: "مَیلِنگ لِسٹ مَوڈ بند کریں"
+    disable_digest_emails: "مجھے خلاصہ ای میلزبھیجنا روک دیں"
+    all: "مجھے %{sitename} سے کوئی میل نہ بھیجیں"
+    different_user_description: "جس صارف کو ہم نے اِی میل کی، آپ اُس سے مختلف صارف کے طور پر لاگ اِن ہیں۔ براہ مہربانی لاگ آوٹ کریں، یا گمنام مَوڈ میں داخل ہوں، اور دوبارہ کوشش کریں۔"
+    not_found_description: "معذرت، ہم اِس غیر سَبسکرائب کو تلاش نہ کرسکے۔ ممکن ہے کہ آپ کے ای میل میں لِنک کی میعاد ختم ہوگئی ہے؟"
+    log_out: "لاگ آُوٹ"
+  user_api_key:
+    title: "ایپلیکیشن ایکسَیس کی اجازت دیں"
+    authorize: "اجازت دیں"
+    read: "رِیڈ"
+    read_write: "رِیڈ/رائیٹ"
+    description: "\"%{application_name}\" آپ کے اکاؤنٹ سے مندرجہ ذیل رسائی کی درخواست کر رہا ہے:"
+    no_trust_level: "معذرت، صارف API تک رسائی حاصل کرنے کیلئے آپ کے پاس ضروری ٹرسٹ لَیول نہیں ہے"
+    generic_error: "معذرت، ہم صارف API کیز جاری کرنے سے قاصر ہیں، یہ خصوصیت سائٹ کے ایڈمن کی طرف سے غیر فعال کی گئی ہوسکتی ہے"
+    scopes:
+      message_bus: "لائیو اپ ڈیٹس"
+      notifications: "اطلاعات پڑھیں اور ہٹائیں"
+      push: "بیرونی سروِسوں پر اطلاعات بھیجیں"
+      session_info: "صارف سیشن کی معلومات پڑھیں"
+      read: "تمام رِیڈ"
+      write: " تمام رائیٹ"
+  reports:
+    visits:
+      title: "صارف وِزِٹس"
+      xaxis: "دن"
+      yaxis: "وِزِٹس کی تعداد"
+    signups:
+      title: "نئے صارفین"
+      xaxis: "دن"
+      yaxis: "نئے صارفین کی تعداد"
+    profile_views:
+      title: "صارف پروفائل وِیوز"
+      xaxis: "دن"
+      yaxis: "دیکھے گئے صارفین پروفائلز کی تعداد"
+    topics:
+      title: "ٹاپک"
+      xaxis: "دن"
+      yaxis: "نئے ٹاپکس کی تعداد"
+    posts:
+      title: "پوسٹس"
+      xaxis: "دن"
+      yaxis: "نئی پوسٹس کی تعداد"
+    likes:
+      title: "لائیکس"
+      xaxis: "دن"
+      yaxis: "نئے لائیکس کی تعداد"
+    flags:
+      title: "فلَیگز"
+      xaxis: "دن"
+      yaxis: "فلَیگز کی تعداد"
+    bookmarks:
+      title: "بُک مارکس"
+      xaxis: "دن"
+      yaxis: "نئے بُک مارکس کی تعداد"
+    starred:
+      title: "ستارہ شُدہ"
+      xaxis: "دن"
+      yaxis: "نئے ستارہ شُدہ ٹاپکس کی تعداد"
+    users_by_trust_level:
+      title: "صارفین فی ٹرسٹ لَیول"
+      xaxis: "ٹرسٹ لَیول"
+      yaxis: "صارفین کی تعداد"
+    emails:
+      title: "بھیجی گئیں اِی میل"
+      xaxis: "دن"
+      yaxis: "اِی میل کی تعداد"
+    user_to_user_private_messages:
+      title: "صارف-سے-صارف"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    user_to_user_private_messages_with_replies:
+      title: "صارف-سے-صارف (جوابات کے ساتھ)"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    system_private_messages:
+      title: "سِسٹَم"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    moderator_warning_private_messages:
+      title: "ماڈریٹر انتباہ"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    notify_moderators_private_messages:
+      title: "ماڈریٹرز کو مطلع کریں"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    notify_user_private_messages:
+      title: "صارف کو مطلع کریں"
+      xaxis: "دن"
+      yaxis: "پیغامات کی تعداد"
+    top_referrers:
+      title: "ٹاپ تجویز کنندگان"
+      xaxis: "صارف"
+      num_clicks: "کلِکس"
+      num_topics: "ٹاپک"
+    top_traffic_sources:
+      title: "ٹریفک کے ٹاپ ذرائع"
+      xaxis: "ڈَومَین"
+      num_clicks: "کلِکس"
+      num_topics: "ٹاپک"
+      num_users: "صارفین"
+    top_referred_topics:
+      title: "ٹاپ تجویز کردہ ٹاپک"
+      xaxis: "ٹاپک"
+      num_clicks: "کلِکس"
+    page_view_anon_reqs:
+      title: "گمنام"
+      xaxis: "دن"
+      yaxis: "صفحہ کے گمنام ملاحظات"
+    page_view_logged_in_reqs:
+      title: "لاگڈ اِن"
+      xaxis: "دن"
+      yaxis: "صفحہ کے لاگڈ اِن ملاحظات"
+    page_view_crawler_reqs:
+      title: "وَیب کرالرز"
+      xaxis: "دن"
+      yaxis: "صفحہ کے وَیب کرالر ملاحظات"
+    page_view_total_reqs:
+      title: "کُل"
+      xaxis: "دن"
+      yaxis: "صفحہ کے کُل ملاحظات"
+    page_view_logged_in_mobile_reqs:
+      title: "صفحہ کے لاگڈ اِن ملاحظات"
+      xaxis: "دن"
+      yaxis: "صفحہ کے موبائل لاگڈ اِن ملاحظات"
+    page_view_anon_mobile_reqs:
+      title: "صفحہ گمنام ملاحظات"
+      xaxis: "دن"
+      yaxis: "صفحہ موبائل گمنام ملاحظات"
+    http_background_reqs:
+      title: "پس منظر"
+      xaxis: "دن"
+      yaxis: "لائیو اَپ ڈیٹ اور ٹریکنگ کیلئے استعمال ہونے والی درخواستیں"
+    http_2xx_reqs:
+      title: "سٹَیٹَس 2xx (OK)"
+      xaxis: "دن"
+      yaxis: "کامیاب درخواستیں (سٹَیٹَس 2xx)"
+    http_3xx_reqs:
+      title: "HTTP 3xx (ریڈائرَیکٹ)"
+      xaxis: "دن"
+      yaxis: "ریڈائرَیکٹ کردہ درخواستیں (سٹَیٹَس 3xx)"
+    http_4xx_reqs:
+      title: "HTTP 4xx (کلائنٹ کی خرابی)"
+      xaxis: "دن"
+      yaxis: "کلائنٹ خرابیاں (سٹَیٹَس 4xx)"
+    http_5xx_reqs:
+      title: "HTTP 5xx (سرور کی خرابی)"
+      xaxis: "دن"
+      yaxis: "سرور خرابیاں (سٹَیٹَس 5xx)"
+    http_total_reqs:
+      title: "کُل"
+      xaxis: "دن"
+      yaxis: "کُل درخواستیں"
+    time_to_first_response:
+      title: "پہلے جواب تک کا وقت"
+      xaxis: "دن"
+      yaxis: "اوسطً وقت (گھنٹے)"
+    topics_with_no_response:
+      title: "بۃلا جواب والے ٹاپک"
+      xaxis: "دن"
+      yaxis: "کُل"
+    mobile_visits:
+      title: "صارف وِزِٹس"
+      xaxis: "دن"
+      yaxis: "وِزِٹس کی تعداد"
+    web_crawlers:
+      title: "وَیب کرالر درخواستیں"
+      xaxis: "صارف ایجنٹ"
+      yaxis: "صفحہ ملاحظات"
+  dashboard:
+    rails_env_warning: "آپ کا سرور %{env} مَوڈ میں چل رہا ہے۔"
+    host_names_warning: "آپ کی config/database.yml فائل ڈیفالٹ localhost نام استعمال کر رہا ہے۔ اِسے اپنے سائیٹ ہوسٹ کے نام پر اپ ڈیٹ کریں۔"
+    gc_warning: 'آپ کا سرور ڈیفالٹ روبی گاربَیج کولیکشن پیرامیٹرز کا استعمال کر رہا ہے، جو آپ کو بہترین کارکردگی نہیں دے گا۔ کارکردگی کی ٹیوننگ پر اس ٹاپک کو پڑھیں: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">ڈِسکورس کیلئے روبی اور ریلز کی ٹیوننگ</a>۔'
+    sidekiq_warning: 'Sidekiq نہیں چل رہا۔ بہت سے کام، جیسا کہ ای میل بھیجنا، sidekq کی طرف سے اےسِنکرونسلی مکمل کیے جاتے ہیں۔ براہ کرم یقینی بنائیں کہ کم ازکم ایک sidekq پراسیس چل رہا ہے۔ <a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq کے بارے میں یہاں سے جانیے</a>۔'
+    queue_size_warning: 'قطار میں موجود جابز کی تعداد %{queue_size} ہے، جو کہ زیادہ ہے۔ یہ Sidekiq پراسیس کے ساتھ ایک مسئلہ کی نشاندہی کر سکتا ہے، یا آپ کو مزید Sidekiq کارکنوں کو شامل کرنے کی ضرورت ہوسکتی ہے۔'
+    memory_warning: 'آپ کا سرور مجموعی طور پر 1 GB سے کم میموری کے ساتھ چل رہا ہے۔ کم ازکم 1 GB میموری تجویز کی گئی ہے۔'
+    google_oauth2_config_warning: 'سرور کو ترتیب دیا گیا ہے کہ گُوگل (OAuth2 (enable_google_oauth2_logins کے ساتھ سائن اپ اور لاگ اِن کی اجازت ہو، لیکن کلائنٹ آئی ڈی اور کلائنٹ سیکرٹ وَیلِیوز مقرر نہیں کیے گئے ہیں۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">مزید جاننے کے لئے یہ گائیڈ ملاحظہ کریں</a>۔'
+    facebook_config_warning: 'سرور کو ترتیب دیا گیا ہے کہ فیس بُک (OAuth2 (enable_facebook_logins کے ساتھ سائن اپ اور لاگ اِن کی اجازت ہو، لیکن اَیپ آئی ڈی اور اَیپ سیکرٹ وَیلِیوز مقرر نہیں کیے گئے ہیں۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">مزید جاننے کے لئے یہ گائیڈ ملاحظہ کریں</a>۔'
+    twitter_config_warning: 'سرور کو ترتیب دیا گیا ہے کہ ٹَوِیٹر (enable_twitter_logins) کے ساتھ سائن اپ اور لاگ اِن کی اجازت ہو، لیکن قیی اور سیکرٹ وَیلِیوز مقرر نہیں کیے گئے ہیں۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">مزید جاننے کے لئے یہ گائیڈ ملاحظہ کریں</a>۔'
+    github_config_warning: 'سرور کو ترتیب دیا گیا ہے کہ گِٹ ہَب (enable_github_logins) کے ساتھ سائن اپ اور لاگ اِن کی اجازت ہو، لیکن کلائنٹ آئی ڈی اور سیکرٹ وَیلِیوز مقرر نہیں کیے گئے ہیں۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">مزید جاننے کے لئے یہ گائیڈ ملاحظہ کریں</a>۔'
+    s3_config_warning: 'سرور کو s3 پر فائلوں کو اَپ لوڈ کرنے کیلئے ترتیب دیا گیا ہے، لیکن کم از کم ایک درج ذیل ترتیب سَیٹ نہیں کی گئی ہے: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_upload_bucket۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">مزید جاننے کے لئے "S3 پر تصویر اپ لوڈز کیسے سَیٹ کریں؟" ملاحظہ کریں</a>۔'
+    s3_backup_config_warning: 'سرور کو s3 پر بیک اَپس اَپ لوڈ کرنے کیلئے ترتیب دیا گیا ہے، لیکن کم از کم ایک درج ذیل ترتیب سَیٹ نہیں کی گئی ہے: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket۔ <a href="/admin/site_settings">سائٹ ترتیبات</a> پر جائیں اور ترتیبات کو اَپ ڈیٹ کریں۔ <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">مزید جاننے کے لئے "S3 پر تصویر اپ لوڈز کیسے سَیٹ کریں؟" ملاحظہ کریں</a>۔'
+    image_magick_warning: 'سرور کو بڑی تصاویر کے تھَمب نَیل تخلیق کرنے کیلئے ترتیب دیا گیا ہے، لیکن ImageMagick اِنسٹال نہیں ہے۔ اپنے پسندیدہ پیکیج مینیجر کا استعمال کرکے ImageMagick اِنسٹال کریں یا <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">تازہ ترین ورژن ڈاؤن لوڈ کریں</a>۔'
+    failing_emails_warning: 'ناکام ہونے والی %{num_failed_jobs} اِی مَیل جابز موجود ہیں۔ اپنا app.yml چیک کریں اور یہ یقینی بنائیں کہ میل سرور کی ترتیبات درست ہیں۔ Sidekiq میں ناکام جابز ملاحظہ کریں۔'
+    subfolder_ends_in_slash: "آپ کا سب-فولڈر سیٹ اپ غلط ہے؛ DISCOURSE_RELATIVE_URL_ROOT ایک سلَیش میں ختم ہوتا ہے۔"
+    email_polling_errored_recently:
+      one: "گزشتہ 24 گھنٹوں میں ای میل پولِنگ نے ایک خرابی دکھائی ہے۔ مزید تفصیلات کیلئے <a href='/logs' target='_blank'>لاگز</a> کا ملاحضہ کریں۔"
+      other: "گزشتہ 24 گھنٹوں میں ای میل پولِنگ نے %{count} خرابیاں دکھائی ہیں۔ مزید تفصیلات کیلئے <a href='/logs' target='_blank'>لاگز</a> کا ملاحضہ کریں۔"
+    missing_mailgun_api_key: "سرور کو بذریعہ مَیلگَن ای میل بھیجنے کیلئے ترتیب دیا گیا ہے، لیکن آپ نے وَیب ھُوک٘ پیغامات کی توثیق کرنے کیلئے API کلید فراہم نہیں کی ہے۔"
+    bad_favicon_url: "فَیوِکان لوڈ نہیں ہو رہا ہے۔ <a href='/admin/site_settings'>سائٹ ترتیبات</a> میں اپنی favicon_url کی ترتیبات چیک کریں۔"
+    poll_pop3_timeout: "POP3 سرور کے ساتھ کنِکشن کا وقت ختم ہوا جا رہا ہے۔ آنے والی ای میل حاصل نہیں کی جاسکی۔ براہ مہربانی اپنی <a href='/admin/site_settings/category/email'>POP3 ترتیبات</a> اور سروس فراہم کرنے والے کو چیک کریں۔"
+    poll_pop3_auth_error: "POP3 سرور کے ساتھ کنِکشن ایک اوَتھَینٹیکیشن خرابی سے ناکام ہو رہا ہے۔ آنے والی ای میل حاصل نہیں کی جاسکی۔ براہ مہربانی اپنی <a href='/admin/site_settings/category/email'>POP3 ترتیبات</a> کو چیک کریں۔"
+    force_https_warning: "آپ کی ویب سائٹ SSL استعمال کر رہی ہے۔ لیکن `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ابھی تک آپ کی سائٹ ترتیبات میں فعال نہیں ہے۔"
+  site_settings:
+    censored_words: "الفاظ جو خود بخود &#9632;&#9632;&#9632;&#9632; سے تبدیل ہوجائیں گے"
+    delete_old_hidden_posts: "کوئی چھپی ہوئی پوسٹ جو 30 دن سے زائد عرصہ سے چھپا رکھی ہو اُس کو خود کار طریقے سے حذف کر دیں۔"
+    default_locale: "اِس ڈِسکورس سَیٹ اپ کی پہلے سے طہ شدہ زبان"
+    allow_user_locale: "صارفین کو اپنی زبان انٹرفیس ترجیح کو منتخب کرنے کی اجازت دیں"
+    set_locale_from_accept_language_header: "گمنام صارفین کیلئے اِنٹرفیس زبان اُن کے وَیب براؤزر کے لَینگوَیج ہیڈرز سے سَیٹ کریں۔ (تجرباتی، گمنام کَیشے کے ساتھ کام نہیں کرتا)"
+    support_mixed_text_direction: "مخلوط بائیں-سے-دائیں اور دائیں-سے-بائیں ٹیکسٹ سمتوں کی اجازت دیں۔"
+    min_post_length: "حروف میں پوسٹ کی کم از کم لمبائی"
+    min_first_post_length: "حروف میں پہلی پوسٹ (ٹاپک متن) کی کم از کم لمبائی"
+    min_personal_message_post_length: "حروف میں پیغامات کیلئے پوسٹ کی کم از کم لمبائی"
+    max_post_length: "حروف میں پوسٹ کی زیادہ سے زیادہ لمبائی"
+    topic_featured_link_enabled: "ٹاپکس کے ساتھ لِنک پوسٹ کرنا فعال کریں۔"
+    show_topic_featured_link_in_digest: "ڈائجسٹ ای میل میں نمایاں ٹاپک کا لِنک دکھائیں۔"
+    min_topic_title_length: "حروف میں ٹاپک کے عنوان کی کم از کم لمبائی"
+    max_topic_title_length: "حروف میں ٹاپک کے عنوان کی زیادہ سے زیادہ لمبائی"
+    min_personal_message_title_length: "حروف میں ایک پیغام کیلئے عنوان کی کم از کم لمبائی"
+    max_emojis_in_title: "ٹاپک عنوان میں اِیمَوجیوں کی زیادہ سے زیادہ تعداد"
+    min_search_term_length: "حروف میں درست سرچ ٹَرم کی کم از کم لمبائی"
+    search_prefer_recent_posts: "اگر آپ کے بڑے فورم پر سرچ سست ہے، تو یہ آپشن پہلے حالیہ پوسٹس کے ایک اِنڈَیکس پر کوشش کرتا ہے"
+    search_recent_posts_size: "اِنڈَیکس میں کتنی حالیہ پوسٹس رکھی جائیں"
+    log_search_queries: "صارفین کی طرف سے سرچ قُوَیریز کو لاگ کریں"
+    search_query_log_max_size: "رکھی جانے والی سرچ قُوَیریز کی زیادہ سے زیادہ تعداد"
+    allow_uncategorized_topics: "ٹاپکس کو بغیر کسی زُمرہ کے تخلیق ہونے کی اجازت دیں۔ انتباہ: اگر کوئی بِلا زُمرہ ٹاپکس موجود ہوں، تو اِس کو بند کرنے سے پہلے آپ کو اُنہیں دوبارہ کسی زُمرہ میں ڈالنا ہوگا۔"
+    allow_duplicate_topic_titles: "ایک جیسے، نقل عنوانات کے ساتھ ٹاپکس کی اجازت دیں۔"
+    unique_posts_mins: "ایک ہی مواد والی دوبارہ پوسٹ صارف کتنے منٹ بعد بنا سکتا ہے"
+    educate_until_posts: "جب صارف اپنی پہلی (ن) نئی پوسٹس کو ٹائپ کرنا شروع کرے، تو کمپوزر میں نیا صارف تعلیمی پینل کا پاپ-اپ دکھائیں۔"
+    title: "اس سائٹ کا نام، جیسا کہ عنوان ٹَیگ میں استعمال ہوتا ہے۔"
+    site_description: "اِس سائٹ کو ایک جملہ میں بیان کریں، جیسا کہ مَیٹا وضاحتی ٹَیگ میں استعمال کیا جاتا ہے۔"
+    contact_email: "اِس سائٹ کیلئے ذمہ دار اہم کانٹیکٹ کا ای میل ایڈریس۔ اہم اطلاعات کے لئے استعمال کیا جاتا ہے، اور اُس کے ساتھ ساتھ فوری طور کے معاملات کیلئے /about رابطہ فارم پر۔"
+    contact_url: "اِس سائٹ کے لئے رابطہ URL۔ فوری طور کے معاملات کیلئے /about رابطہ فارم پر استعمال کیا جاتا ہے۔"
+    crawl_images: "صحیح چوڑائی اور اونچائی والے طول و عرض داخل کرنے کیلئے ریمَوٹ URL سے تصاویر حاصل کریں۔"
+    download_remote_images_to_local: "ڈاؤن لوڈ کرکے ریمَوٹ تصاویر کو مقامی تصاویر میں تبدیل کریں؛ اِس طرح سے ٹوٹی ہوئی تصاویر کو روکا جا سکتا ہے۔"
+    download_remote_images_threshold: "مقامی طور پر ریمَوٹ تصاویر کو ڈاؤن لَوڈ کرنے کیلئے ڈِسک میں کم از کم جگہ (فیصد میں)"
+    download_remote_images_max_days_old: "اُن پوسٹس کیلئے ریمَوٹ تصاویر ڈاؤن لوڈ نہ کریں جو ن دنوں سے زیادہ پرانی ہوں۔"
+    disabled_image_download_domains: "ریمَوٹ تصاویر اِن ڈومینز سے کبھی ڈاؤن لوڈ نہیں ہوں گی۔ پائپ کے ساتھ الگ کی گئی فہرست۔"
+    editing_grace_period: "پوسٹنگ کے بعد (ن) سیکنڈ تک، نئی ترمیم پوسٹ کی ہسٹری میں ایک نیا ورژن نہیں بنائے گا۔"
+    editing_grace_period_max_diff: "ترمیم کی رعایتی مدت کے دوران حروف تبدیلیوں کی زیادہ سے زیادہ تعداد، اگر اِس سے زیادہ تبدیل کیے جائیں تو ایک اور پوسٹ رَوِیژن سٹور کریں (ٹرسٹ لَیول 0 اور 1)"
+    editing_grace_period_max_diff_high_trust: "ترمیم کی رعایتی مدت کے دوران حروف تبدیلیوں کی زیادہ سے زیادہ تعداد، اگر اِس سے زیادہ تبدیل کیے جائیں تو ایک اور پوسٹ رَوِیژن سٹور کریں (ٹرسٹ لَیول 2 اور اوپر)"
+    staff_edit_locks_post: "پوسٹس کو ترمیم کرنے سے روک دیا جائے گا اگر وہ اسٹاف کے اراکین کی طرف سے ترمیم کی گئی ہوں"
+    post_edit_time_limit: "مصنف اشاعت کے بعد (ن) منٹ تک اپنی پوسٹ میں ترمیم یا اسے خارج کرسکتے ہیں۔ ہمیشہ کیلئے 0 پر سیٹ کریں۔"
+    edit_history_visible_to_public: "سب کو ایک ترمیم شدہ پوسٹ کے پچھلے ورژن دیکھنے کی اجازت دیں۔ غیر فعال ہونے پر، صرف اسٹاف ممبران دیکھ سکتے ہیں۔"
+    delete_removed_posts_after: "مصنف کی طرف سے ہٹائی گئی پوسٹس خود کار طریقے سے (ن) گھنٹوں کے بعد حذف کردی جائیں گی۔ اگر 0 پر سیٹ ہو، تو پوسٹس کو فوری طور پر حذف کردیا جائے گا۔"
+    max_image_width: "پوسٹ میں تصاویر کی زیادہ سے زیادہ تھَمب نَیل چوڑائی"
+    max_image_height: "پوسٹ میں تصاویر کی زیادہ سے زیادہ تھَمب نَیل اونچائی"
+    fixed_category_positions: "اگر باکس چیک شدہ ہو تو، آپ زُمرہ جات کو ایک مقررہ سلسلہ کے حساب سے اُن کی درجہ بندی کرسکیں گے۔ اگر چیک شدہ نہ ہو تو، سرگرمیوں کی تعداد کے مطابق زُمرہ جات درج کیے جاتے ہیں۔"
+    fixed_category_positions_on_create: "اگر باکس چیک شدہ ہو تو، ٹاپک تخلیق ڈائیلاگ پر زُمرہ جات کی درجہ بندی کی ترتیب برقرار رکھی جائے گی (fixed_category_positions ضروری ہے)۔"
+    add_rel_nofollow_to_user_content: "اندرونی لِنکس (بالائی ڈومینز سمیت) کے علاوہ، تمام شائع کردہ صارف کے مواد پر رَیل nofollow شامل کریں۔ اگر آپ اس کو تبدیل کرتے ہیں تو، آپ کو تمام پوسٹس کو دوبارہ رِیبَیک کرنا ہوگا: \"rake posts:rebake\""
+    exclude_rel_nofollow_domains: "اُن ڈومینز کی فہرست جن کے لنکس پر nofollow کو شامل نہیں کیا جانا چاہئے۔ example.com خود بخود sub.example.com کو بھی اجازت دیدے گا۔ وَیب کرالرز کو تمام مواد تلاش کرنے میں مدد دینے کیلئے آپ کو کم از کم، اِس سائٹ کا ڈومَین شامل کرلینا چاہئے۔ اگر آپ کی ویب سائٹ کے دوسرے حصے دوسرے ڈومینز پر ہیں، تو اُنہیں بھی شامل کر لیں۔"
+    post_excerpt_maxlength: "پوسٹ اقتباس / خلاصہ کی زیادہ سے زیادہ لمبائی۔"
+    show_pinned_excerpt_mobile: "موبائل وِیو میں پِن ہوے ٹاپکس پر اقتباس دکھائیں۔"
+    show_pinned_excerpt_desktop: "ڈیسک ٹاپ وِیو میں پِن ہوے ٹاپکس پر اقتباس دکھائیں۔"
+    post_onebox_maxlength: "ایک وَن باکسڈ ڈِسکورس پوسٹ کے حروف کی زیادہ سے زیادہ لمبائی۔"
+    onebox_domains_blacklist: "ڈومینز کی ایک فہرست جو کبھی بھی وَن باکسڈ نہیں کیے جائیں گے۔"
+    inline_onebox_domains_whitelist: "ڈومینز کی ایک فہرست جو چھوٹے فارم میں وَن باکسڈ کیے جائیں گے اگر وہ عنوان کے بغیر لنک کیے جائیں"
+    enable_inline_onebox_on_all_domains: "inline_onebox_domain_whitelist سائٹ ترتیب کو نظر انداز کریں اور تمام ڈَومینز پر وَن باکس کی اجازت دیں۔"
+    max_oneboxes_per_post: "ایک پوسٹ میں وَن باکس کی زیادہ سے زیادہ تعداد۔"
+    logo_url: "آپ کی سائٹ کے سب سے اوپر بائیں پر لوگو کی تصویر وسیع مستطیل شکل ہونی چاہئے۔ اگر خالی چھوڑ دیا گیا ہو تو سائٹ کا عنوان دکھایا جائے گا۔"
+    digest_logo_url: "آپ کی سائٹ کے ای میل خلاصہ کے اوپر استعبال ہونے والا متبادل کوگو۔ ایک وسیع مستطیل شکل ہونی چاہئے۔ ایک SVG تصویر نہیں ہونی چاہئے۔ اگر خالی چھوڑ دیا گیا ہو تو `logo_url` استعمال کیا جائے گا۔"
+    logo_small_url: "آپ کی سائٹ کے سب سے اوپر بائیں پر چھوٹا سی لوگو کی تصویر، ایک چکور شکل ہونی چاہئے، جب نیچے سکرول کیا جائے تو دکھائی دیتا ہے۔ اگر خالی چھوڑ دیا گیا ہو تو ایک ہَوم گلِف دکھایا جائے گا۔"
+    favicon_url: "آپ کی ویب سائٹ کیلئے ایک فَیوِکان، http://en.wikipedia.org/wiki/Favicon دیکھیے، ایک CDN پر صحیح کام کرنے کیلئے اِس کا png ہونا ضروری ہے"
+    mobile_logo_url: "آپکی سائٹ کے موبائل ورژن پر استعمال ہونے والا اپنی مرضی کا لوگو url۔ اگر خالی چھوڑ دیا گیا ہو تو `logo_url` استعمال کیا جائے گا۔ مثال: http://example.com/uploads/default/logo.png"
+    large_icon_url: "تصویر جو اینڈرائڈ پر لوگو/سپلیش تصویر کے طور پر استعمال ہو۔ تجویز شدہ سائز 512px/512px ہے۔"
+    apple_touch_icon_url: "اَیپل ٹَچ ڈِیوائیسِز پر استعمال ہونے والا آئکن۔ تجویز شدہ سائز 144px/144px ہے۔"
+    notification_email: "تمام ضروری سِسٹم ای میلز بھیجنے کیلئے استعمال ہونے والا from: ای میل ایڈریس۔ یہاں درج کردہ ڈومین کا SPF ،DKIM اور ریورس PTR ریکارڈ، ای میل کے پہنچنے کیلئے، صحیح طریقے سے مقرر ہونا لازمی ہے۔"
+    email_custom_headers: "اپنی مرضی کے ای میل ہیڈرز کی پائپ سے علیحدہ کردہ فہرست"
+    email_subject: "سٹینڈرڈ ای میلز کیلئے اپنی مرضی کا موضوع فارمَیٹ۔ دیکھیے https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    force_https: "صرف HTTPS استعمال کرنے کیلئے اپنی سائٹ کو مجبورکریں۔ انتباہ: جب تک آپ تصدیق نہ کر لیں کہ HTTPS مکمل طور پر سیٹ ہے اور ہر جگہ کام کر رہا ہے، اِس کو فعال نہ کریں! کیا آپ نے اپنا CDN، تمام سماجی لاگ ان، اور بیرونی لوگو / انحصارات کو چیک کر کے یہ یقینی بنا لیا ہے کہ وہ تمام HTTPS سے مطابقت رکھتے ہیں؟"
+    same_site_cookies: "سَیم سائٹ کے کُوکِیز کا استعمال کریں، وہ قابل براؤزرز (Lax یا Strict) پر تمام ویکٹر Cross Site Request Forgery کو ختم کر دیتے ہیں۔ انتباہ: Strict صرف اُن سائٹس پر کام کرے گا جو لاگ اِن پر مجبور کرتے ہیں اور SSO کا استعمال کرتے ہیں۔"
+    summary_score_threshold: "'اِس ٹاپک کا خلاصہ کریں' میں شامل ہونے کیلئے ایک پوسٹ کا کم از کم سکور"
+    summary_posts_required: "'اِس ٹاپک کا خلاصہ کریں' فعال ہونے سے پہلے ٹاپک میں پوسٹس کی کم از کم تعداد"
+    summary_likes_required: "'اِس ٹاپک کا خلاصہ کریں' فعال ہونے سے پہلے ٹاپک میں لائیکس کی کم از کم تعداد"
+    summary_percent_filter: "جب صارف 'اِس ٹاپک کا خلاصہ کریں' پر کلک کرتا ہے، تو سب سے اوپر % پوسٹس دکھائیں"
+    summary_max_results: "'اِس ٹاپک کا خلاصہ کریں' کی طرف سے لوٹائی جانے والی زیادہ سے زیادہ پوسٹس"
+    enable_personal_messages: "ٹرسٹ لَیول 1 (پیغامات بھیجنے کیلئے کم از کم ٹرسٹ لَیول کے ذریعہ ترتیب دے سکتے ہیں) والے صارفین کو پیغامات بنانے اور پیغامات کا جواب دینے کی اجازت دیں۔ نوٹ کریں کہ جوبھی ہو، اسٹاف ہمیشہ پیغامات بھیج سکتا ہے۔"
+    enable_system_message_replies: "صارفین کو سِسٹم پیغامات کا جواب دینے کی اجازت دیں، یہاں تک کہ اگر ذاتی پیغامات بھی غیر فعال ہوں"
+    enable_personal_email_messages: "ٹرسٹ لَیول 4 (پیغامات بھیجنے کیلئے کم از کم ٹرسٹ لَیول کے ذریعہ ترتیب دے سکتے ہیں) والے صارفین کو ذاتی ای میل پیغامات کی اجازت دیں۔ نوٹ کریں کہ جوبھی ہو، اسٹاف ہمیشہ پیغامات بھیج سکتا ہے۔"
+    enable_long_polling: "نوٹیفکیشن کیلئے مَیسج بس استعمال ہو رہا ہے، لانگ پولِنگ کا استعمال کیا جا سکتا ہے"
+    long_polling_base_url: "لانگ پولِنگ کیلئے استعمال ہونے والا بَیس URL (جب ایک CDN متحرک مواد فراہم کر رہا ہو، تو اِس کو اوریِجِن پُل پر سَیٹ کرنا یقینی بنائیں) مثال: http://origin.site.com"
+    long_polling_interval: "جب بھیجنے کیلئے کوئی ڈیٹا نہ ہو تو کلائینٹس کوجواب دینے سے پہلے سرور کو کتنا وقت انتظار کرنا چاہئے (صرف لاگ ہوئے صارفین)"
+    polling_interval: "جب لانگ پولِنگ نہ ہو، تو لاگ ہوئے کلائنٹس کو مِلی سیکنڈوں میں کتنی دفعہ پَول کرنا چاہئے"
+    anon_polling_interval: "گمنام کلائنٹس کو مِلی سیکنڈوں میں کتنی دفعہ پَول کرنا چاہئے"
+    background_polling_interval: "کلائنٹس کو مِلی سیکنڈوں میں کتنی دفعہ پَول کرنا چاہئے (جب وِنڈو پسِ منظر میں ہو)"
+    flags_required_to_hide_post: "فلَیگز کی تعداد جس کے بعد کسی پوسٹ کو خود کار طریقہ سے چھپا دیا اور صارف کو پیغام بھیج دیا جاتا ہے (کبھی نہیں کیلئے 0)"
+    cooldown_minutes_after_hiding_posts: "منٹوں کی تعداد جن کیلئے ایک صارف کو کمیونٹی فلَیگ بندی کے ذریعہ چھپائی گئی پوسٹ میں ترمیم کرنے سے پہلے انتظار کرنا لازمی ہے"
+    max_topics_in_first_day: "اُن کی پہلی پوسٹ بنانے کے بعد 24 گھنٹوں کی مدت میں ایک صارف کی طرف سے تخلیق کردہ ٹاپکس کی زیادہ سے زیادہ تعداد"
+    max_replies_in_first_day: "اُن کی پہلی پوسٹ بنانے کے بعد 24 گھنٹوں کی مدت میں ایک صارف کی طرف سے تخلیق کردہ جوابات کی زیادہ سے زیادہ تعداد"
+    tl2_additional_likes_per_day_multiplier: "اِس نمبر کے ساتھ ضرب کر کے ٹ.ل.2 (ممبر) کیلئے فی دن لائیکس کی حد میں اضافہ کریں"
+    tl3_additional_likes_per_day_multiplier: "اِس نمبر کے ساتھ ضرب کر کے ٹ.ل.3 (رَیگولر) کیلئے فی دن لائیکس کی حد میں اضافہ کریں"
+    tl4_additional_likes_per_day_multiplier: "اِس نمبر کے ساتھ ضرب کر کے ٹ.ل.4 (لِیڈر) کیلئے فی دن لائیکس کی حد میں اضافہ کریں"
+    num_spam_flags_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو num_users_to_silence_new_user مختلف صارفین سے اتنے سپَیم فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
+    num_users_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو اتنے مختلف صارفین سے num_spam_flags_to_silence_new_user سپَیم فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
+    num_tl3_flags_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو num_tl3_users_to_silence_new_user مختلف ٹرسٹ لَیول 3 والے صارفین سے اتنے فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
+    num_tl3_users_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو اتنے مختلف ٹرسٹ لَیول 3 والے صارفین سے num_tl3_flags_to_silence_new_user فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
+    notify_mods_when_user_silenced: "اگر صارف خود کار طریقے سے خاموش کر دیا جائے، تو تمام ماڈریٹرزکو ایک پیغام بھیجیں۔"
+    flag_sockpuppets: "اگر ایک نیا صارف اُسی IP ایڈریس سے کسی ٹاپک پر جواب دیتا ہے جس IP ایڈریس سے ایک دوسرے نئے صارف نے وہی ٹاپک شروع کیا تھا، تو اُن دونوں کی پوسٹس کو ممکنہ سپَیم کے طور پر فلَیگ کریں۔"
+    traditional_markdown_linebreaks: "مارکڈائون میں روایتی لائن وقفے کا استعمال کریں، جس میں ایک لائن وقفے کیلئے دو ٹریلنگ خالی جگہوں کی ضرورت ہوتی ہے۔"
+    enable_markdown_typographer: "پیراگرافوں کے ٹیکسٹ کا پڑھنا آسان بنانے کیلئے بنیادی چپھائی کے قوانین کا استعمال کریں، (c) (tm) وغیرہ کو علامات کے ساتھ تبدیل کردیں، کئی سوالیہ نشانوں کی تعداد کم ہوجائے اور اِسی طرح دیگر"
+    enable_markdown_linkify: "ٹیکسٹ جو ایک لنک کی طرح لگے اُسے خود کار طریقے سے ایک لنک کے طور پر دکھائیں: www.site.com اور http://site.com خود کار طریقے سے لِنک کر دیے جائیں گے"
+    markdown_linkify_tlds: "سب سے اوپر کی سطح کے ڈَومینز کی فہرست جو خود بخود لِنکس کے طور پر دکھائے جاتے ہیں"
+    post_undo_action_window_mins: "منٹوں کی تعداد جب تک صارفین کو ایک پوسٹ پر حالیہ کارروائیوں (لائیک، فلَیگ، وغیرہ) کو واپس کرلینے کی اجازت ہے۔"
+    must_approve_users: "سائٹ تک رسائی حاصل کرنے سے پہلے اسٹاف کو تمام نئے صارف اکاؤنٹس کو منظور کرنا ضروری ہے۔ انتباہ: کسی لائیو سائٹ کیلئے اِس کو فعال کرنے سے غیر اسٹاف صارفین کیلئے رسائی منسوخ ہو جائے گی!"
+    pending_users_reminder_delay: "ماڈریٹرز کو مطلع کریں اگر نئے صارفین اِس سے زیادہ گھنٹوں سے منظوری کے منتظر ہوں۔ اطلاعات کو غیر فعال کرنے کیلئے -1 سَیٹ کریں۔"
+    maximum_session_age: "آخری وزٹ سے ن گھنٹوں بعد تک صارف کو لاگڈ اِن رکھا جائے گا"
+    ga_universal_tracking_code: "گُوگل یونیوَرسل اَینَیلَیٹِکس (analytics.js) ٹرَیکِنگ کَوڈ کَوڈ، مثال: UA-12345678-9؛ دیکھیے http://google.com/analytics"
+    ga_universal_domain_name: "گُوگل یونیوَرسل اَینَیلَیٹِکس (analytics.js) ڈَومَین نام، مثال: mysite.com؛ دیکھیے http://google.com/analytics"
+    ga_universal_auto_link_domains: "گُوگل یونیوَرسل اَینَیلَیٹِکس (analytics.js) کراس ڈَومَین ٹرَیکِنگ فعال کریں۔ اِن ڈومینز کے باہر جانے والے لِنکس کے ساتھ کلائینٹ id شامل کر دی جائے گی۔ گُوگل کی کراس ڈَومَین ٹریکنگ گائیڈ ملاحظہ کریں۔"
+    gtm_container_id: "گُوگل ٹیگ مینیجر کی کنٹینر آئی ڈی. مثال: GTM-ABCDEF"
+    enable_escaped_fragments: "اگر کسی وَیب کرالر کا پتہ نہ لگے تو گُوگل اَیجَیکس-کرالِنگ API کا استعمال کریں۔ دیکھیے https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
+    allow_moderators_to_create_categories: "منتظمین کو نئے زُمرہ جات بنانے کی اجازت دیں"
+    cors_origins: "وہ اَوریجِن جن کیلئے کراس-اَوریجِن درخواستوں (CORS) کی اجازت ہے۔ ہراَوریجِن میں http:// یا https:// شامل ہونا ضروری ہے۔ CORS کو فعال کرنے کیلئے DISCOURSE_ENABLE_CORS کی وَیلِیو ٹرُو پر مقرر ہونا لاذمی ہے۔"
+    use_admin_ip_whitelist: "ایڈمن صرف اُس صورت میں لاگ ان کرسکتے ہیں اگر وہ ایسے IP ایڈریس میں ہیں جو اسکرین کردہ آئی پیز کی فہرست (ایڈمن > لاگز > اسکرین کردہ آئی پیز) میں بیان کیا گیا ہو۔"
+    blacklist_ip_blocks: "نجی IP بلاکس کی فہرست جو ڈِسکَورس کی طرف سے کبھی کرال نہیں ہونی چاہئیں"
+    whitelist_internal_hosts: "اندرونی ہَوسٹس کی فہرست جو ڈِسکَورس محفوظ طریقے سے وَن باکس اور دیگر مقاصد کیلئے کرال کر سکتا ہے"
+    allowed_iframes: "iframe src ڈَومَین کے سابقوں کی ایک فہرست جو ڈِسکَورس محفوظ طریقے سے پوسٹس میں شامل ہونے کی اجازت دے سکتا ہے"
+    whitelisted_crawler_user_agents: 'وَیب کرالرز کے صارف ایجنٹوں جن کو اِس سائٹ تک رسائی کی اجازت دی جانی چاہیئے۔'
+    slow_down_crawler_rate: 'اگر slow_down_crawler_user_agents کی وضاحت کی گئی ہے تو یہ شرح تمام کرالرز پر لاگو ہوگی (درخواستوں کے درمیان سیکنڈوں کی تاخیر)'
+    top_menu: "اِس بات کا تعین کریں کہ ہَوم پیج نیویگیشن پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظاہر ہوں۔ مثال کے طور پر تازہ ترین|نئی|بغیر پڑھی|زُمرہ جات|ٹاپ|پڑھ لیے گئے|شائع کیے|بُکمارکس"
+    post_menu: "اِس بات کا تعین کریں کہ پوسٹ مَینِیو پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظاہر ہوں۔ مثال کے طور پر لائیک|ترمیم| فلَیگ|حذف|شئیر|بُکمارک|جواب"
+    post_menu_hidden_items: "پوسٹ مینیو میں ڈیفالٹ کے طور پرچھپائی جانے والی اشیاء جب تک کسی توسیعی ellipsis پر کلِک نہ کیا جائے۔"
+    share_links: "اِس بات کا تعین کریں کہ شیئر ڈائیلاگ پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظاہر ہوں۔"
+    track_external_right_clicks: "بیرونی لِنکس جن پر دائیاں کلک کیا جائے اُن کو ٹریک کریں (مثال: نئے ٹیب میں کھولیں) ڈیفالٹ کے طور پر غیر فعال، کیونکہ یہ URLs کو رِیرائیٹ کر دیتا ہے"
+    site_contact_username: "ایک درست سٹاف صارف نام جس کی طرف سے تمام خود کار طریقے سے پیغامات بھیجے جائیں۔ اگر خالی چھوڑ دیا گیا ہو تو ڈیفالٹ سِسٹم اکاؤنٹ استعمال کیا جائے گا۔"
+    send_welcome_message: "تمام نئے صارفین کو فوری شروعات کے گائیڈ کے ساتھ خوش آمدید کا پیغام بھیجیں۔"
+    suppress_reply_directly_below: "پوسٹ پر وسیع ہو سکنے والا جوابات کی تعداد مت دکھائیں جب اِس پوسٹ کے براہ راست نیچے ایک ہی واحد جواب موجود ہو۔"
+    suppress_reply_directly_above: "پوسٹ پر وسیع ہو سکنے والا جس-کے-جواب-میں مت دکھائیں جب اِس پوسٹ کے براہ راست اوپر ایک ہی واحد جواب موجود ہو۔"
+    suppress_reply_when_quoting: "پوسٹ پر وسیع ہو سکنے والا جس-کے-جواب-میں مت دکھائیں جب پوسٹ میں جواب کا اقتباس شامل ہو۔"
+    max_reply_history: "جس-کے-جواب-میں توسیع کرتے وقت، توسیع کیے گئے جوابات کی زیادہ سے زیادہ تعداد"
+    topics_per_period_in_top_summary: "ڈیفالٹ کے طور پر ٹاپ ٹاپکس خلاصہ میں دکھائے گئے ٹاپ ٹاپکس کی تعداد۔"
+    topics_per_period_in_top_page: "توسیع کردہ ٹاپ ٹاپکس 'مزید دکھائیں' میں دکھائے گئے ٹاپ ٹاپکس کی تعداد۔"
+    redirect_users_to_top_page: "نئے اور طویل غیر حاضر صارفین کو خود کار طریقے سے ٹاپ صفحے پر ریڈائرَیکٹ کریں۔"
+    top_page_default_timeframe: "ٹاپ وِیُو صفحے کیلئے ڈِیفالٹ ٹائم فریم۔"
+    show_email_on_profile: "صارف کا ای میل اُن کی پروفائل پر دکھائیں (صرف خود اُنہیں اور سٹاف کو نظر آتا ہے)"
+    prioritize_username_in_ux: "صارف صفحے، صارف کارڈ اور پوسٹس پر پہلے صارف نام دکھائیں (جب غیر فعال ہو تو نام پہلے دکھایا جاتا ہے)"
+    enable_rich_text_paste: "کمپَوزر میں ٹیکسٹ پَیسٹ کرتے وقت خود کار طریقہ سے HTML سے مارکڈائون میں تبادلہ فعال کریں۔ (تجرباتی)"
+    email_token_valid_hours: "پاسورڈ بھولنے / اکاؤنٹ چالو کرنے کے ٹوکن (ن) گھنٹوں کیلئے درست ہیں۔"
+    enable_badges: "بَیج سِسٹم فعال کریں"
+    enable_whispers: "ٹاپک کے اندر سٹاف کے درمیان ذاتی مواصلات کی اجازت دیں۔"
+    allow_index_in_robots_txt: "robots.txt فائل میں وضاحت کریں کہ یہ سائٹ وَیب سرچ اِنجنوں کی طرف سے انڈیکس کی جاسکتی ہے۔"
+    email_domains_blacklist: "ای میل ڈومینز کی پائپ سے علیحدہ کردہ فہرست جن کے ساتھ صارفین کو اکاؤنٹس رجسٹر کرنے کی اجازت نہیں ہے۔ مثال: mailinator.com|trashmail.net"
+    email_domains_whitelist: "ای میل ڈومینز کی پائپ سے علیحدہ کردہ فہرست جن کے ساتھ صارفین کو اکاؤنٹس رجسٹر کرنا لاذمی ہے۔ انتباہ: اِس فہرست کے علاوہ ای میل ڈومینز والے صارفین کو روک دیا جائے گی!"
+    hide_email_address_taken: "سائن اَپ کے دوران اور بھولا پاسورڈ فارم سے صارفین کو مطلع نہ کریں کہ فراہم کیے گئے ای میل ایڈریس کے ساتھ ایک اکاؤنٹ موجود ہے۔"
+    log_out_strict: "لاگ آؤٹ ہونے پر، صارف کیلئے تمام ڈِیوائیسِز پر تمام سیشنوں کو لاگ آؤٹ کریں"
+    version_checks: "ورژن اپ ڈیٹ کیلئے ڈِسکورس ہَب کو پِنگ کریں اور /admin ڈیش بورڈ پر نئے ورژن کا پیغام دکھائیں"
+    new_version_emails: "جب ڈِسکورس کا نیا ورژن دستیاب ہو تو contact_email ایڈریس پر ایک ای میل بھیجیں۔"
+    invite_expiry_days: "دنوں میں، کتنے عرصے تک صارف دعوت نامہ کلیدیں درست رہیں"
+    invite_passthrough_hours: "گھنٹوں میں، کتنے عرصے تک ایک صارف لاگ اِن کرنے کیلئے قبل از استعمال شدہ دعوتی کلید استعمال کرسکتا ہے"
+    invite_only: "عوامی رجسٹریشن غیر فعال ہے، تمام نئے صارفین کو واضح طور پر سٹاف کی طرف سے مدعو کیا جانا لاذمی ہے۔"
+    login_required: "اِس سائٹ پر مواد پڑھنے کیلئے اکاؤنٹ کی توثیق ہونا ضروری بنائیں، گمنام صارفین تک رسائی کو مسترد کریں۔"
+    min_username_length: "حروف میں صارف نام کی کم از کم لمبائی۔ انتباہ: اگر کوئی موجودہ صارفین یا گروپوں کے نام اِس سے چھوٹے ہیں، تو آپ کی سائٹ ٹوٹ جائے گی!"
+    max_username_length: "حروف میں صارف نام کی زیادہ سے زیادہ لمبائی۔ انتباہ: اگر کوئی موجودہ صارفین یا گروپوں کے نام اِس سے زیادہ لمبے ہیں، تو آپ کی سائٹ ٹوٹ جائے گی!"
+    reserved_usernames: "صارف نام جن کیلئے سائن اَپ کی اجازت نہیں ہے۔ وائلڈ کارڈ علامت * کسی بھی حرف کو صفر یا اِس سے زیادہ بار میچ کرنے کیلئے استعمال کیا جا سکتا ہے۔"
+    min_password_length: "پاسورڈ کی کم از کم لمبائی۔"
+    min_admin_password_length: "اَیڈمن کیلئے پاسورڈ کی کم از کم لمبائی۔"
+    password_unique_characters: "منفرد حروف کی کم از کم تعداد جو پاسورڈ میں ہونا لاذمی ہے۔"
+    block_common_passwords: "ایسا پاسورڈ جو 10،000 سب سے زیادہ عام پاسورڈز میںشامل ہو، اۃسے رکھنے کی اجازت نہ دیں۔"
+    enable_sso: "بیرونی سائٹ کے ذریعہ واحد سائن اَن کو فعال کریں (انتباہ: صارفین کے ای میل ایڈریس بیرونی سائٹ کی طرف سے توثیق کیے جانا *لازمی* ہے!)"
+    verbose_sso_logging: "بہت زیادہ تفصیلی SSO سے متعلقہ تشخیص /logs میں ریکارڈ کریں"
+    enable_sso_provider: "/session/sso_provider کے اینڈپوائنٹ پر ڈِسکورس SSO پرووَائیڈر پروٹوکول کو نافذ کریں، sso_secret کو مقرر کیا جانا ضروری ہے"
+    sso_url: "URL واحد سائن اَن اینڈپوائنٹ کا (اhttp:// یا https:// کا شامل ہونا لاذمی ہے)"
+    sso_secret: "خفیہ سٹرنگ جو کرِیپٹَوگرافی کے زریعہ SSO معلومات کی توثیق کرنے کیلئے استعمال کیا جاتا ہے، یقینی بنائیں کہ یہ 10 یا اُس سے زیادہ حروف لمبا ہے"
+    sso_overrides_bio: "صارف پروفائل میں صارف کی بائیو کی جگہ لے لیتا ہے اور اِس کو تبدیل کرنے سے صارف کو روک دیتا ہے"
+    sso_overrides_email: "ہر لاگ اِن پر SSO پے لوڈ سے بیرونی ویب سائٹ ای میل مقامی ای میل کی جگہ لے لیتا ہے، اور مقامی تبدیلیوں کو روک دیتا ہے۔ (انتباہ: مقامی ای میلز کو معمول پر لانے کی وجہ سے اختلافات ہوسکتے ہیں)"
+    sso_overrides_username: "ہر لاگ اِن پر SSO پے لوڈ سے بیرونی ویب سائٹ صارف نام مقامی صارف نام کی جگہ لے لیتا ہے، اور مقامی تبدیلیوں کو روک دیتا ہے۔ (انتباہ: صارف نام کی لمبائی/ضروریات کے فرق کی وجہ سے اختلافات ہوسکتے ہیں)"
+    sso_overrides_name: "ہر لاگ اِن پر SSO پے لوڈ سے بیرونی ویب سائٹ پورا نام مقامی پورا نام کی جگہ لے لیتا ہے، اور مقامی تبدیلیوں کو روک دیتا ہے۔"
+    sso_overrides_avatar: "SSO پے لوڈ سے بیرونی ویب سائٹ اوتار صارف اوتار کی جگہ لے لیتا ہے۔ اگر فعال ہو تو، allow_uploaded_avatars کو غیر فعال کر دینا تجویز کیا جاتا ہے"
+    sso_not_approved_url: "غیر منظور شدہ SSO اکاؤنٹس کو اِس URL پر ریڈائرَیکٹ کریں"
+    sso_allows_all_return_paths: "SSO کے ذریعہ فراہم کردہ return_paths کیلئے ڈَومین کو محدود نہ کریں (ڈِیفالٹ کے طور پر ریٹرن پاتھ کا موجودہ سائٹ پر ہونا لاذمی ہے)"
+    enable_local_logins: "مقامی صارف نام اور پاسورڈ لاگ اِن کی بنیاد پر اکاؤنٹس فعال کریں۔ (نوٹ: دعوتیں کام کرنے کیلئے اِسے فعال ہونا لاذمی ہے)"
+    enable_local_logins_via_email: "صارفین کو بذریعہ ای میل بھیجے جانے والے ایک کلِک لاگ اِن لِنک کی درخواست کرنے کی اجازت دیں۔"
+    allow_new_registrations: "نئے صارف رجسٹریشنوں کی اجازت دیں۔ کسی کو نیا اکاؤنٹ بنانے سے روکنے کیلئے اس کو غیر چیک شدہ کریں۔"
+    enable_signup_cta: "واپس آنے والے گمنام صارفین کو ایک نوٹس دکھائیں جو اُنہیں اکاؤنٹ بنانے کیلۓ قائل کرے۔"
+    enable_yahoo_logins: "یاہُو توثیق کو فعال کریں"
+    enable_google_oauth2_logins: "گُوگل Oauth2 توثیق کو فعال کریں۔ گُوگل فی الحال اِس توثیق کے طریقہ کی اجازت دیتا ہے۔ کلید اور سیکرٹ کی ضرورت ہے۔"
+    google_oauth2_client_id: "آپ کی گُوگل ایپلی کیشن کی کلائنٹ آئی ڈی."
+    google_oauth2_client_secret: "آپ کی گُوگل ایپلی کیشن کا کلائنٹ سیکرٹ."
+    google_oauth2_prompt: "خالی جگہ سے علیحدہ کردہ سٹرنگ وَیلِیوز کی فہرست جو اِس بات کی وضاحت کرتی ہے کہ اَوتھرائزیشن سرور صارف کو دوبارہ تصدیق اور رضامندی کیلئے پوچھتا ہے کہ نہیں۔ ممکنہ اقدار کیلئے https://developers.google.com/identity/protocols/OpenIDConnect#prompt دیکھیں۔"
+    google_oauth2_hd: "گُوگل اَیپس ہوسٹِڈ ڈومَین جس تک کہ سائن اِن محدود ہو گا۔ مزید تفصیلات کیلئے https://developers.google.com/identity/protocols/OpenIDConnect#hd-param ملاحظہ کریں۔"
+    enable_twitter_logins: "ٹویٹر توثیق کو فعال کریں، twitter_consumer_key اور twitter_consumer_secret کی ضرورت ہے"
+    twitter_consumer_key: "ٹویٹر توثیق کیلئے کنزِیُومر کلید، https://apps.twitter.com/ پر رجسٹر کردہ"
+    twitter_consumer_secret: "ٹویٹر توثیق کیلئے کنزِیُومر سیکرٹ، https://apps.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 کی ضرورت ہے"
+    facebook_app_id: "فَیس بُک توثیق کیلئے اَیپ آئی ڈی، https://developers.facebook.com/apps پر رجسٹر کردہ"
+    facebook_app_secret: "فَیس بُک توثیق کیلئے اَیپ سیکرٹ، https://developers.facebook.com/apps پر رجسٹر کردہ"
+    facebook_request_extra_profile_details: "فَیس بُک سے میرے بارے میں، میرا محل وقوع اور میری ویب سائٹ کی درخواست کریں۔ (آپ کی توثیق اَیپلیکیشن، فَیس بُک سے منظور شدہ ہونے کی ضرورت ہوتی ہے)"
+    enable_github_logins: "گِٹ ہَب توثیق کو فعال کریں، github_client_id اور github_client_secret کی ضرورت ہے"
+    github_client_id: "گِٹ ہَب توثیق کیلئے کلائنٹ آئی ڈی، https://github.com/settings/applications پر رجسٹر کردہ"
+    github_client_secret: "گِٹ ہَب توثیق کیلئے کلائنٹ سیکرٹ، https://github.com/settings/applications پر رجسٹر کردہ"
+    readonly_mode_during_backup: "بیک اَپ کرتے وقت صرف پڑھنے کا مَوڈ فعال کریں"
+    enable_backups: "ایڈمِنِسٹریٹروں کو فورم کے بیک اَپ بنانے کی اجازت دیں"
+    allow_restore: "رِیسٹور کی اجازت دیں، جو سائٹ کا تمام ڈیٹا تبدیل کر سکتا ہے! فالس چھوڑ دیں جب تک کہ آپ بیک اَپ بحال نہ کرنے لگیں"
+    maximum_backups: "ڈِسک پر رکھے جانے بیک اَپس کی زیادہ سے زیادہ تعداد۔ پرانے بیک اَپس خود کار طریقے سے حذف کر دیے جاتے ہیں"
+    automatic_backups_enabled: "خودکار بیک اَپس چلائیں جیسا کہ بیک اَپ فریکوئنسی میں بیان کیا گیا ہے"
+    backup_frequency: "بَیک اَپس کے درمیان دنوں کی تعداد۔"
+    enable_s3_backups: "مکمل ہونے پر S3 پر بیک اَپس اَپلوڈ کریں۔ اہم: فائل ترتیبات میں درست S3 اسناد کا درج ہونا ضروری ہے۔"
+    s3_backup_bucket: "بیک اَپس رکھنے کیلئے ریمَوٹ بَکِّٹ۔ انتباہ: یقینی بنائیں کہ یہ ایک زاتی بَکِّٹ ہے۔"
+    s3_disable_cleanup: "جب مقامی طور پر بیک اَپ ہٹا دیا جائے اُس کے ساتھ S3 پر سے بھی ہٹا دینا غیر فعال کریں۔"
+    backup_time_of_day: "دن کا وقت UTC جب بیک اَپ ہونا چاہئے۔"
+    backup_with_uploads: "شیڈول کردہ بیک اَپس میں اپلوڈز شامل کریں۔ اِس کو غیر فعال کرنے پر صرف ڈَیٹا بَیس بیک اَپ کیا جائے گا۔"
+    active_user_rate_limit_secs: "سیکنڈوں میں، 'last_seen_at' فیلڈ کو ہم کتنی بار اَپ ڈیٹ کریں"
+    verbose_localization: "UI میں توسیعی لَوکلائزَیشن کی تجاویز دکھائیں"
+    previous_visit_timeout_hours: "ایک وِزٹ کتنا لمبا ہونا چاہئے جس کے بعد ہم اُسے 'پچھلا' وِزٹ سمجھنا شروع کر دیں، گھنٹوں میں"
+    top_topics_formula_log_views_multiplier: "ٹاپ ٹاپکس کے فارمولے میں لاگ وِیوز کے مَلٹیپلائر (ن) کی عدد: `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: "ٹاپ ٹاپکس کے فارمولے میں پہلی پوسٹ لائیکس کے مَلٹیپلائر (ن) کی عدد: `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: "ٹاپ ٹاپکس کے فارمولے میں فی پوسٹ کم از کم لائیکس کے مَلٹیپلائر (ن) کی عدد: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    rebake_old_posts_count: "ہر 15 منٹ پر رِیبَیک کرنے والی پرانی پوسٹس کی تعداد۔"
+    rate_limit_create_topic: "ایک ٹاپک بنانے کے بعد، کوئی دوسرا ٹاپک بنانے سے پہلے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
+    rate_limit_create_post: "ایک پوسٹ شائع کرنے کے بعد، دوسری پوسٹ بنانے سے پہلے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
+    rate_limit_new_user_create_topic: "ایک ٹاپک بنانے کے بعد، کوئی دوسرا ٹاپک بنانے سے پہلے نئے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
+    rate_limit_new_user_create_post: "ایک پوسٹ شائع کرنے کے بعد، دوسری پوسٹ بنانے سے پہلے نئے صارفین کو (ن) سیکنڈوں کیلئے انتظار کرنا ہوگا۔"
+    max_likes_per_day: "فی صارف ایک دن کے لائیکس کی زیادہ سے زیادہ تعداد۔"
+    max_flags_per_day: "فی صارف ایک دن کے فلَیگز کی زیادہ سے زیادہ تعداد۔"
+    max_bookmarks_per_day: "فی صارف ایک دن کے بُکمارکس کی زیادہ سے زیادہ تعداد۔"
+    max_edits_per_day: "فی صارف ایک دن کے ترامیم کی زیادہ سے زیادہ تعداد۔"
+    max_topics_per_day: "ایک صارف کے فی دن بنائے گئے ٹاپکس کی زیادہ سے زیادہ تعداد۔"
+    max_personal_messages_per_day: "صارفین کے فی دن بنائے گئے پیغامات کی زیادہ سے زیادہ تعداد۔"
+    max_invites_per_day: "ایک صارف کے فی دن بھیجی گئی دعوتوں کی زیادہ سے زیادہ تعداد۔"
+    max_topic_invitations_per_day: "ایک صارف کے فی دن بھیجی گئی ٹاپک دعوتوں کی زیادہ سے زیادہ تعداد۔"
+    max_logins_per_ip_per_hour: "ایک IP ایڈریس سے فی گھنٹہ لاگ اِنوں کی زیادہ سے زیادہ تعداد"
+    max_logins_per_ip_per_minute: "ایک IP ایڈریس سے فی منٹ لاگ اِنوں کی زیادہ سے زیادہ تعداد"
+    alert_admins_if_errors_per_minute: "اِیڈمن الرٹ کو متحرک کرنے کیلئے فی منٹ خرابیوں کی تعداد۔ 0 کی وَیلِیو اِس خصوصیت کو غیر فعال کردیتی ہے۔ نوٹ: رِیسٹارٹ ضروری ہے۔"
+    alert_admins_if_errors_per_hour: "اِیڈمن الرٹ کو متحرک کرنے کیلئے فی گھنٹہ خرابیوں کی تعداد۔ 0 کی وَیلِیو اِس خصوصیت کو غیر فعال کردیتی ہے۔ نوٹ: رِیسٹارٹ ضروری ہے۔"
+    categories_topics: "/categories صفحے پر دکھائے جانے والے ٹاپکس کی تعداد۔"
+    suggested_topics: "ٹاپک کے نچلے حصے پر دکھائے گئے تجویز کردہ ٹاپکس کی تعداد۔"
+    limit_suggested_to_category: "تجویز کردہ ٹاپکس میں صرف موجودہ زُمرہ سے ٹاپکس دکھائیں۔"
+    suggested_topics_max_days_old: "تجویز کردہ ٹاپکس ن دنوں سے زیادہ پرانے نہیں ہونے چاہئیں۔"
+    clean_up_uploads: "غیر قانونی ہوسٹنگ کو روکنے کیلئے یتیم غیر حوالہ دیے گئے اَپ لوڈ ہٹائیں۔ انتباہ: آپ اِس ترتیب کو فعال کرنے سے پہلے آپ شاید /uploads ڈائریکٹری کو بیک اَپ کرنا چاہیں گے۔"
+    clean_orphan_uploads_grace_period_hours: "یتیم اَپ لوڈ ہٹانے سے پہلے رعایتی مدت (گھنٹوں میں)۔"
+    purge_deleted_uploads_grace_period_days: "حذف کردہ اَپ لوڈ مٹا دینے سے پہلے رعایتی مدت (دنوں میں)۔"
+    purge_unactivated_users_grace_period_days: "صارف کی طرف سے اکاؤنٹ اَیکٹیوَیٹ نہ کرنے کی رعایتی مدت (دنوں میں)، جس کے بعد اکاؤنٹ حذف کر دیا جائے گا۔ غیر اَیکٹیوَیٹ کردہ صارفین کو کبھی نہ ہٹانے کیلئے 0 مقرر کریں۔"
+    enable_s3_uploads: "اَیمَیزَون S3 سٹوریج پر اَپ لوڈز رکھیں۔ اہم: درست S3 اسناد ضروری ہیں (دونوں ایکسَیس قی آئی ڈی اور سیکرٹ ایکسَیس قی دونوں کا ہونا ضروری ہو)۔"
+    s3_use_iam_profile: 'S3 بَکِّٹ تک رسائی فراہم کرنے کیلئے <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 اِنسٹَنس پرَوفائل</a> کا استعمال کریں۔ نوٹ: اِس کو فعال کرنے کیلئے ڈِسکورس کو مناسب طریقے سے ترتیب کردہ ایک EC2 اِنسٹَنس کے اندر چلانے کی ضرورت ہوتی ہے، اور "s3 ایکسَیس کلید آئی ڈی" اور "s3 سیکرٹ ایکسَیس کلید" کی ترتیبات کی جگہ لے لیتا ہے۔'
+    s3_upload_bucket: "اَیمَیزَون S3 بَکِّٹ کا نام جس میں فائلیں اَپ لوڈ کی جائیں گی۔ انتباہ: لوئر کَیس، کسی قسم کے پیریڈ، یا انڈر سکور لازمی طور پر نہیں ہونے چاہئیں۔"
+    s3_access_key_id: "اَیمَیزَون S3 ایکسَیس کلید آئی ڈی جو تصاویر کو اَپ لوڈ کرنے کیلئے استعمال کیا جائے گی۔"
+    s3_secret_access_key: "اَیمَیزَون S3 سیکرٹ ایکسَیس کلید جو تصاویر کو اَپ لوڈ کرنے کیلئے استعمال کیا جائے گی۔"
+    s3_region: "اَیمَیزَون S3 خطے کا نام جو تصاویر کو اَپ لوڈ کرنے کیلئے استعمال کیا جائے گی۔"
+    s3_cdn_url: "تمام s3 اثاثوں کیلئے استعمال ہونے والا CDN URL (مثال: https://cdn.somewhere.com)۔ انتباہ: اِس ترتیب کو تبدیل کرنے کے بعد آپ کو تمام پرانی پوسٹس کو رِیبَیک کرنا ہوگا۔"
+    avatar_sizes: "خود کار طریقے سے تیار کردہ اوتار کے سائزوں کی فہرست۔"
+    external_system_avatars_enabled: "بیرونی سسٹم کی اوتار سروس کا استعمال کریں۔"
+    external_system_avatars_url: "بیرونی سسٹم کی اوتار سروس کا URL۔ اجازت شدہ متبادلات {username} {first_letter} {color} {size} ہیں"
+    default_opengraph_image_url: "ڈِیفالٹ اَوپَن٘گراف تصویر کا URL۔"
+    twitter_summary_large_image_url: "ٹویٹر خلاصہ کارڈ کی ڈِیفالٹ تصویر کا URL (کم از کم 280px چوڑائی، اور کم از کم 150px اونچائی کے سائز میں ہونا چاہئے)۔"
+    allow_all_attachments_for_group_messages: "گروپ کے پیغامات کیلئے تمام ای میل منسلکات کی اجازت دیں۔"
+    png_to_jpg_quality: "تبدیل شدہ JPG فائل کا معیار (1 سب سے کم معیار ہے، 99 بہترین معیار ہے، 100 غیر فعال)۔"
+    allow_staff_to_upload_any_file_in_pm: "سٹاف ارکان کو PM میں کوئی بھی فائل اَپ لوڈ کرنے کی اجازت دیں۔"
+    strip_image_metadata: "تصویر مَیٹا ڈَیٹا کو ہٹائیں۔"
+    enable_flash_video_onebox: "وَن باکس میں swf اور flv (اَیڈَوبِ فلَیش) لِنکس کو اَیمبَیڈ کرنے کی اجازت دیں۔ انتباہ: یہ سیکورٹی خطروں کو متعارف کرا سکتا ہے۔"
+    default_invitee_trust_level: "مدعو صارفین کیلئے ڈِیفالٹ ٹرسٹ لَیول (0-4)۔"
+    default_trust_level: "تمام نئے صارفین کیلئے ڈِیفالٹ ٹرسٹ لَیول (0-4)۔ انتباہ! اِسے تبدیل کرنے سے آپ کو سپَیم کیلئے سنگین خطرہ لاہک ہو جائے گا۔"
+    tl1_requires_topics_entered: "ٹرسٹ لَیول 1 پر ترقی ملنے سے قبل کتنے ٹاپکس میں ایک نئے صارف کا داخل ہونا ضروری ہے۔"
+    tl1_requires_read_posts: "ٹرسٹ لَیول 1 پر ترقی ملنے سے قبل کتنی پوسٹس کو ایک نئے صارف کا پڑھنا ضروری ہے۔"
+    tl1_requires_time_spent_mins: "ٹرسٹ لَیول 1 پر ترقی ملنے سے قبل کتنے منٹوں تک پوسٹس کا پڑھنا ایک نئے صارف کیلئے ضروری ہے۔"
+    tl2_requires_topics_entered: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے ٹاپکس میں ایک صارف کا داخل ہونا ضروری ہے۔"
+    tl2_requires_read_posts: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنی پوسٹس کو ایک صارف کا پڑھنا ضروری ہے۔"
+    tl2_requires_time_spent_mins: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے منٹوں تک پوسٹس کا پڑھنا ایک صارف کیلئے ضروری ہے۔"
+    tl2_requires_days_visited: "ٹرسٹ لَیول 2 پر ترقی ملنے سے قبل کتنے دنوں تک ایک صارف کا سائٹ وزٹ کرنا ضروری ہے۔"
+    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 پر ترقی کیلئے کوالیفائی کرنے کیلئے کسی صارف کی طرف سے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں سائٹ کے دوروں کی کم از کم تعداد۔ ٹ.ل.3 پر ترقی غیر فعال کرنے کیلئے ٹ.ل.3 وقت کی مدت سے زیادہ سَیٹ کریں۔ (0 یا اُس سے زیادہ)"
+    tl3_requires_topics_replied_to: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے کسی صارف کی طرف سے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں جواب دیے گئے ٹاپکس کی کم از کم تعداد۔ (0 یا اُس سے زیادہ)"
+    tl3_requires_topics_viewed: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں تخلیق کردہ نئے ٹاپکس میں سے کتنے فیصد ایک صارف کی طرف سے دیکھے گئے ہونے چاہئیں۔ (0 سے 100)"
+    tl3_requires_topics_viewed_cap: "گزشتہ (ٹ.ل.3 وقت کی مدت) دنوں میں دیکھے گئے ٹاپکس کی زیادہ سے زیادہ مطلوبہ تعداد۔"
+    tl3_requires_posts_read: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں تخلیق کردہ نئی پوسٹس میں سے کتنے فیصد ایک صارف کی طرف سے دیکھی گئی ہونی چاہئیں۔ (0 سے 100)"
+    tl3_requires_posts_read_cap: "گزشتہ (ٹ.ل.3 وقت کی مدت) دنوں میں دیکھے گئی پوسٹس کی زیادہ سے زیادہ مطلوبہ تعداد۔"
+    tl3_requires_topics_viewed_all_time: "ٹرسٹ لَیول 3 کیلئے کوالیفائی کرنے کیلئے صارف کی طرف سے کُل دیکھے گئے ٹاپکس کی کم از کم تعداد۔"
+    tl3_requires_posts_read_all_time: "ٹرسٹ لَیول 3 کیلئے کوالیفائی کرنے کیلئے صارف کی طرف سے کُل پڑھی گئی پوسٹس کی کم از کم تعداد۔"
+    tl3_requires_max_flagged: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں صارف کی x سے زیادہ پوسٹس x مختلف صارفین کی طرف سے فلَیگ نہیں کی گئی ہونی چاہئیں، جہاں x اِس ترتیب کی قدر ہے۔ (0 یا اُس سے زیادہ)"
+    tl3_promotion_min_duration: "دنوں کی کم از کم تعداد جب تک ٹرسٹ لَیول 3 پر ترقی قائم رہتی ہے اِس سے پہلے کہ ایک صارف کو ٹرسٹ لَیول 2 پر واپس تنزلی کی جا سکے۔"
+    tl3_requires_likes_given: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں دیے گئے لائیکس کی کم از کم تعداد۔"
+    tl3_requires_likes_received: "ٹرسٹ لَیول 3 پر ترقی کیلئے کوالیفائی کرنے کیلئے آخری (ٹ.ل.3 وقت کی مدت) دنوں میں موصول ہوئے لائیکس کی کم از کم تعداد۔"
+    tl3_links_no_follow: "ٹرسٹ سطح 3 صارفین کی طرف سے پوسٹ کردہ لنکس سے rel=nofollow نہ ہٹائیں۔"
+    trusted_users_can_edit_others: "اعلیٰ ٹرسٹ لَیول والے صارفین کو دیگر صارفین کے مواد میں ترمیم کرنے کی اجازت دیں"
+    min_trust_to_create_topic: "نئے ٹاپک بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    allow_flagging_staff: "اگر فعال ہو، تو صارف سٹاف اکاؤنٹس کی طرف سے پوسٹس کو فلَیگ کرسکتے ہیں۔"
+    min_trust_to_edit_wiki_post: "وِیکی کے طور پر نشان زدہ پوسٹ میں ترمیم کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_edit_post: "پوسٹس میں ترمیم کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_allow_self_wiki: "صارف کی طرف سے اپنی پوسٹ وِیکی بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_send_messages: "نئے ذاتی پیغامات بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_send_email_messages: "ای میل کے ذریعہ نئے ذاتی پیغامات (سٹَیجڈ صارفین کو) بھیجنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_flag_posts: "پوسٹس فلَیگ کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول"
+    min_trust_to_post_links: "پوسٹس میں لِنکس شامل کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    min_trust_to_post_images: "ایک پوسٹ میں تصاویر شامل کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    newuser_max_links: "ایک نیا صارف ایک پوسٹ میں کتنے لِنکس شامل کر سکتا ہے۔"
+    newuser_max_images: "ایک نیا صارف ایک پوسٹ میں کتنے کتنی تصاویر شامل کر سکتا ہے۔"
+    newuser_max_attachments: "ایک نیا صارف ایک پوسٹ میں کتنی اٹیچمنٹس شامل کر سکتا ہے۔"
+    newuser_max_mentions_per_post: "@نام اطلاعات کی زیادہ سے زیادہ تعداد جو ایک نیا صارف ایک پوسٹ میں استعمال کر سکتا ہے۔"
+    newuser_max_replies_per_topic: "ایک ٹاپک میں ایک نئے صارف کی طرف سے دیے جانے والے جوابات کی زیادہ سے زیادہ تعداد جب تک کہ کوئی اُن کو جواب نہ دے۔"
+    max_mentions_per_post: "@نام اطلاعات کی زیادہ سے زیادہ تعداد جو کوئی ایک پوسٹ میں استعمال کر سکتا ہے۔"
+    max_users_notified_per_group_mention: "ایک گروپ کے ذکر پر نوٹیفکیشن موصول ہونے والے صارفین کی زیادہ سے زیادہ تعداد (اگر حد کراس ہو جائے تو کوئی اطلاع نہیں بھیجی جائے گی)"
+    enable_mentions: "صارفین کو دوسرے صارفین کا ذکر کرنے کی اجازت دیں۔"
+    create_thumbnails: "تصاویر جو پوسٹ میں فِٹ ہونے کیلئے بہت بڑی ہوں، اُن کے تھَمب نَیل اور لائیٹ باکس تصاویر تخلیق کریں۔"
+    email_time_window_mins: "صارفین کو اپنی پوسٹس میں ترمیم اور اُن کو حتمی شکل دینے کا موقع دینے کیلئے، کوئی بھی نوٹیفکیشن ای میل بھیجنے سے قبل (ن) منٹوں تک انتظار کریں۔"
+    personal_email_time_window_seconds: "صارفین کو اپنے پیغامات میں ترمیم اور اُن کو حتمی شکل دینے کا موقع دینے کیلئے، کوئی بھی ذاتی پیغام نوٹیفکیشن ای میل بھیجنے سے قبل (ن) منٹوں تک انتظار کریں۔"
+    email_posts_context: "نوٹیفکیشن ای میل میں سیاق و سباق کے طور پر کتنے پچھلے جوابات شامل کیے جائیں۔"
+    flush_timings_secs: "ہم سرور پر ٹائمنگ ڈَیٹا کتنی دفعہ فَلَش کرتے ہیں، سَیکنڈوں میں۔"
+    title_max_word_length: "ایک ٹاپک کے عنوان میں الفاظ کی زیادہ سے زیادہ لمبائی، حروف میں۔"
+    title_min_entropy: "ایک ٹاپک کے عنوان میں کم از کم مطلوبہ اَینٹراپی (منفرد حروف، مزید کیلئے غیر انگریزی حروف)۔"
+    body_min_entropy: "ایک پوسٹ کے متن میں کم از کم مطلوبہ اَینٹراپی (منفرد حروف، مزید کیلئے غیر انگریزی حروف)۔"
+    allow_uppercase_posts: "ایک ٹاپک عنوان یا پوسٹ متن میں تمام کَیپس کی اجازت دیں۔"
+    title_fancy_entities: "ٹاپک عنوانات میں عام ASCII حروف کو شوخ HTML اشیاء میں تبدیل کریں، بذریعہ SmartyPants http://daringfireball.net/projects/smartypants/"
+    min_title_similar_length: "عنوان کی کم از کم لمبائی، اِس سے پہلے کہاُس کو اُسی طرح کے دوسرے ٹاپکس کیلئے چیک کیا جائے گا۔"
+    min_body_similar_length: "پوسٹ متن کی کم از کم لمبائی، اِس سے پہلے کہاُس کو اُسی طرح کے دوسرے ٹاپکس کیلئے چیک کیا جائے گا۔"
+    desktop_category_page_style: " /categories صفحے کیلئے بصری سٹائل۔"
+    category_colors: "زُمرہ جات کیلئے ہیکسا ڈَیسیمل رنگوں کے اقدار کی ایک فہرست۔"
+    category_style: "زُمرہ بیَجوں کیلئے بصری سٹائل۔"
+    max_image_size_kb: "kB میں تصویر اَپ لوڈ کا زیادہ سے زیادہ سائز۔ یہ اِنجَن٘ اَیکس (client_max_body_size) / اَپَیچی یا پراکسی میں بھی ترتیب دیا جانا لازمی ہے۔"
+    max_attachment_size_kb: "kB میں اٹیچمنٹ فائل اَپ لوڈ کا زیادہ سے زیادہ سائز۔ یہ اِنجَن٘ اَیکس (client_max_body_size) / اَپَیچی یا پراکسی میں بھی ترتیب دیا جانا لازمی ہے۔"
+    authorized_extensions: "اپ لوڈ کیلئے اجازت یافتہ فائل اَیکسٹَینشَنز کی فہرست (تمام فائل اقسام کی اجازت دینے کیلئے '*' کا استعمال کریں)"
+    authorized_extensions_for_staff: "سٹاف صارفین کیلئے `authorized_extensions` سائٹ ترتیب میں بیان کردہ فہرست کے علاوہ اَپ لوڈ کیلئے اجازت یافتہ فائل اَیکسٹَینشَنز کی فہرست۔ (تمام فائل اقسام کی اجازت دینے کیلئے '*' کا استعمال کریں)"
+    theme_authorized_extensions: "تھِیم اپ لوڈز کیلئے اجازت یافتہ فائل اَیکسٹَینشَنز کی فہرست (تمام فائل اقسام کی اجازت دینے کیلئے '*' کا استعمال کریں)"
+    max_similar_results: "ایک نیا ٹاپک کمپوز کرتے وقت کتنے اُسی جیسے دوسرے ٹاپک اَیڈیٹر کے اوپر دکھائے جائیں۔ موازنہ عنوان اور متن پر مبنی ہے۔"
+    max_image_megapixels: "ایک تصویر کیلئے مَیگا پِکسل کی زیادہ سے زیادہ عدد۔"
+    title_prettify: "عام عنوان ٹائپینگ کی غلطیوں کو روکیں، بشمول تمام کَیپس، سب سے پہلے حرف کا لوئر کََیس ہونا، کئی! اور؟، آخر میں اضافی ۔، وغیرہ"
+    topic_views_heat_low: "اتنے وِیوز کے بعد، وِیوز فیلڈ ذرا سی اُجاگر کر دی جاتی ہے۔"
+    topic_views_heat_medium: "اتنے وِیوز کے بعد، وِیوز فیلڈ درمیانی سی اُجاگر کر دی جاتی ہے۔"
+    topic_views_heat_high: "اتنے وِیوز کے بعد، وِیوز فیلڈ زور کے ساتھ اُجاگر کر دی جاتی ہے۔"
+    cold_age_days_low: "گفتگو کے اتنے دنوں کے بعد، آخری سرگرمی کی تاریخ ذرا سی مدھم کر دی جاتی ہے۔"
+    cold_age_days_medium: "گفتگو کے اتنے دنوں کے بعد، آخری سرگرمی کی تاریخ درمیانی سی مدھم کر دی جاتی ہے۔"
+    cold_age_days_high: "گفتگو کے اتنے دنوں کے بعد، آخری سرگرمی کی تاریخ زور سے مدھم کر دی جاتی ہے۔"
+    history_hours_low: "اتنے گھنٹوں میں ترمیم کردہ ایک پوسٹ کا ترمیم اشارہ ذرا سا اُجاگر کر دیا جاتا ہے۔"
+    history_hours_medium: "اتنے گھنٹوں میں ترمیم کردہ ایک پوسٹ کا ترمیم اشارہ درمیانا سا اُجاگر کر دیا جاتا ہے۔"
+    history_hours_high: "اتنے گھنٹوں میں ترمیم کردہ ایک پوسٹ کا ترمیم اشارہ زور کے ساتھ اُجاگر کر دیا جاتا ہے۔"
+    topic_post_like_heat_low: "جب لائیکس:پوسٹ تناسب اِس تناسب سے زیادہ ہو جاتا ہے، تو پوسٹ شمار فیلڈ ذرا سی اُجاگر کر دی جاتی ہے۔"
+    topic_post_like_heat_medium: "جب لائیکس:پوسٹ تناسب اِس تناسب سے زیادہ ہو جاتا ہے، تو پوسٹ شمار فیلڈ درمیانی سی اُجاگر کر دی جاتی ہے۔"
+    topic_post_like_heat_high: "جب لائیکس:پوسٹ تناسب اِس تناسب سے زیادہ ہو جاتا ہے، تو پوسٹ شمار فیلڈ زور کے ساتھ اُجاگر کر دی جاتی ہے۔"
+    faq_url: "اگر آپ کے پاس ایک FAQ کسی اور جگہ پر ہَوسٹ کیا ہوا ہے جو آپ استعمال کرنا چاہتے ہیں، تو یہاں مکمل URL فراہم کریں۔"
+    tos_url: "اگر آپ کے پاس ایک سروس کی شرائط کی دستاویز کسی اور جگہ پر ہَوسٹ کی ہوئی ہے جو آپ استعمال کرنا چاہتے ہیں، تو یہاں مکمل URL فراہم کریں۔"
+    privacy_policy_url: "اگر آپ کے پاس ایک نجی معلومات کی حفاظتی پالیسی کی دستاویز کسی اور جگہ پر ہَوسٹ کی ہوئی ہے جو آپ استعمال کرنا چاہتے ہیں، تو یہاں مکمل URL فراہم کریں۔"
+    log_anonymizer_details: "کیا آیک صارف کو گمنام بنانے کے بعد اُس کی تفصیلات رکھی جائیں کہ نہیں۔ GDPR کے ساتھ تعمیل کرتے وقت آپ کو اِسے بند کر دینے کی ضرورت ہوگی۔"
+    newuser_spam_host_threshold: "ایک نیا صارف کتنی دفعہ ایک ہی ہَوسٹ کا لِنک اپنی `newuser_spam_host_threshold` پوسٹس کے اندر شائع کر سکتا ہے، اِس سے پہلے کہ وہ سپَیم سمجھا جائے۔"
+    white_listed_spam_host_domains: "ڈومَینز کی فہرست جو سپیم ہَوسٹ کی جانچ پڑتال سے خارج ہے۔ نئے صارفین کو اِن ڈومینز کے لِنکس کے ساتھ پوسٹ بنانے سے کبھی روکا نہیں جائے گا۔"
+    staff_like_weight: "سٹاف کے لائیکس کو کتنا اضافی وزن کا عنصر دیں۔"
+    topic_view_duration_hours: "ہر ن گھنٹوں پر فی IP/صارف ایک نیا ٹاپک وِیو شمار کریں"
+    user_profile_view_duration_hours: "ہر ن گھنٹوں پر فی IP/صارف ایک نیا صارف پروفائل وِیو شمار کریں"
+    levenshtein_distance_spammer_emails: "سپَیمر ای میل کو مَیچ کرتے وقت، فرق حروف کی تعداد جس پر بھی ایک فزِّی میچ ہو سکے گا۔"
+    max_new_accounts_per_registration_ip: "اگر اِس IP کی طرف سے پہلے سے ہی (ن) ٹرسٹ لَیول 0 اکاؤنٹس موجود ہیں (اور کوئی بھی سٹاف کا رکن یا ٹ.ل.2 یا اُس سے زیادہ نہیں ہے)، اُس IP سے نئے سائن اَپ کو قبول کرنا روک دیں۔"
+    min_ban_entries_for_roll_up: "رول اَپ بٹن پر کلک کرتے وقت اگر کم از کم (ن) اندراج موجود ہوں، تو ایک نیا ذیلی نیٹ بَین اندراج تخلیق ہو جائے گا۔"
+    max_age_unmatched_emails: "غیر مَیچ شدہ سکرین کردہ ای میل اندراجات (ن) دنوں کے بعد حذف کر دیں۔"
+    max_age_unmatched_ips: "غیر مَیچ شدہ سکرین کردہ IP اندراجات (ن) دنوں کے بعد حذف کر دیں۔"
+    num_flaggers_to_close_topic: "ٹاپک کو مداخلت کیلئے خود کار طریقے سے روک دینے کیلئے فلَیگ کرنے والوں کی کم از کم تعداد"
+    num_flags_to_close_topic: "ٹاپک کو مداخلت کیلئے خود کار طریقے سے روک دینے کیلئے فعال فلَیگز کی کم از کم تعداد"
+    num_hours_to_close_topic: "مداخلت کیلئے ٹاپک کو روک دینے کیلئے گھنٹوں کی تعداد۔"
+    auto_respond_to_flag_actions: "ایک فلَیگ کو ڈراپ کرتے وقت خودکار جوابات فعال کریں۔"
+    min_first_post_typing_time: "ایک صارف پہلی پوسٹ کے دوران ملی سیکنڈوں میں کم از کم کتنا وقت ٹائپ کرے، اگر حد پوری نہ ہو تو پوسٹ خود بخود منظوری کی ضرورت کی قطار میں داخل کر دی جائے گی۔ غیر فعال کرنے کیلئے 0 سَیٹ کریں (غیر تجویز کردہ)"
+    auto_silence_fast_typers_on_first_post: "صارفین کو خود بخود خاموش کر دیں جو min_first_post_typing_time کو پورا نہیں کرتے"
+    auto_silence_fast_typers_max_trust_level: "تیز رفتار ٹائپرز کو خود بخود خاموش کرنے کیلئے زیادہ سے زیادہ ٹرسٹ لَیول"
+    auto_silence_first_post_regex: "کَیس کے حساب سے غیر حساس رَیج اَیکس جو اگر مَیچ کر جائے تو صارف کی طرف سے پہلی پوسٹ خاموش کر دی جائے گی اور منظوری کی قطار میں بھیج دی جائے گی۔ مثال: raging|a[bc]a تمام raging یا aba یا aca پر مشتمل پوسٹس کو پہلے پر خاموش کر دیے جانے کا سبب بن جائے گا۔ صرف پہلی پوسٹ پر لاگو ہوتا ہے۔"
+    flags_default_topics: "فلَیگ کردہ ٹاپکس ڈیفالٹ کے طور پر اَیڈمن سیکشن میں دکھائیں"
+    reply_by_email_enabled: "بذریعہ ای میل، ٹاپکس کا جواب دینا فعال کریں۔"
+    reply_by_email_address: "جواب بذریعہ ای میل کا آنے والا ای میل ایڈریس کیلئے ٹَیمپلیٹ، مثال کے طور پر: %{reply_key}@reply.example.com یا replies+%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "جواب بذریعہ ای میل کے آنے والا ای میل ایڈریس کیلئے متبادل ٹیمپلیٹس، مثال: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "آنے والے ای میل کیلئے ٹیکسٹ کے بجائے HTML کا استعمال کریں۔"
+    disable_emails: "ڈِسکورس کو کسی بھی قسم کے ای میل بھیجنے سے روکیں"
+    strip_images_from_short_emails: "2800 بائٹس سے کم سائز والے ای میلز سے تصاویر ہٹا دیں"
+    short_email_length: "بائٹس میں مختصر ای میل کی لمبائی"
+    display_name_on_email_from: "ای میل کی \"سے\" فیلڈ پر مکمل نام دکھائیں"
+    unsubscribe_via_email: "صارفین کو ای میل کے موضوع یا متن میں 'غیر سَبسکرائب' کا لِنک بھیج کر ای میلز سے غیر سَبسکرائب ہو جانے کی اجازت دیں"
+    unsubscribe_via_email_footer: "بھیجی گئی ای میلز کے فُوٹر میں غیر سَبسکرائب بذریعہ ای میل mailto: کا لِنک منسلک کریں"
+    delete_email_logs_after_days: "(ن) دنوں کے بعد ای میل لاگز حذف کریں۔ غیر متعینہ مدت تک رکھنے کیلئے 0"
+    max_emails_per_day_per_user: "صارفین کو فی دن بھیجی گئی ای میلز کی زیادہ سے زیادہ تعداد۔ حد کو غیر فعال کرنے کیلئے 0"
+    enable_staged_users: "آنے والی ای میلز سے نمٹتے وقت خود کار طریقے سے سٹَیجڈ صارفین بنائیں۔"
+    maximum_staged_users_per_email: "آنے والی ایک ای میل سے نمٹتے وقت تشکیل کردہ سٹَیجڈ صارفین کی زیادہ سے زیادہ تعداد۔"
+    auto_generated_whitelist: "ای میل پتوں کی فہرست جو خود کار طریقہ سے تخلیق شدہ مواد کیلئے چیک نہیں کیے جائیں گے۔ مثال: foo@bar.com|discourse@bar.com"
+    block_auto_generated_emails: "آنے والی ای میلز جو خود کار طریقہ سے تخلیق شدہ کے طور پر شناخت کی گئی ہوں، اُن کو خود بخود بلاک کریں۔"
+    ignore_by_title: "اُن کے عنوان کی بَیس پر آنے والی ای میلز کو نظر انداز کریں۔"
+    mailgun_api_key: "وَیب ھُوک٘ پیغامات کی توثیق کیلئے استعمال ہونے والی مَیلگَن سیکرٹ API کلید۔"
+    soft_bounce_score: "عارضی بائونس ہونے پر صارف کے ساتھ بائونس سکور شامل کر دیا جائے۔"
+    hard_bounce_score: "مستقل بائونس ہونے پر صارف کے ساتھ بائونس سکور شامل کر دیا جائے۔"
+    bounce_score_threshold: "زیادہ سے زیادہ بائونس سکور اِس سے پہلے کہ ہم صارف کو ای میل کرنا روک دیں۔"
+    bounce_score_threshold_deactivate: "زیادہ سے زیادہ بائونس سکور اِس سے پہلے کہ ہم صارف کو غیر فعال کر دیں۔"
+    reset_bounce_score_after_days: "X دنوں بعد بائونس سکور خود بخود رِی سَیٹ کریں۔"
+    attachment_content_type_blacklist: "مطلوبہ الفاظ کی فہرست جو مواد قِسم کی بنیاد پر منسلک اٹیچمنٹس کو بلَیک لِسٹ کرنے کیلئے استعمال ہوتی ہے۔"
+    attachment_filename_blacklist: "مطلوبہ الفاظ کی فہرست جو فائل نام کی بنیاد پر منسلک اٹیچمنٹس کو بلَیک لِسٹ کرنے کیلئے استعمال ہوتی ہے۔"
+    enable_forwarded_emails: "[BETA] صارفین کو ایک ای میل فارورڈ کر کہ ٹاپک بنائے کی اجازت دیں۔"
+    always_show_trimmed_content: "ہمیشہ آنے والی ای میلز کا حصے دکھائیں۔ انتباہ: ای میل پتوں کو افشاں کر سکتا ہے۔"
+    private_email: "مزید رازداری کیلئے ای میلز میں پوسٹس یا ٹاپکس سے مواد شامل نہ کریں۔"
+    manual_polling_enabled: "ای میل جوابات کیلئے API کا استعمال کرتے ہوئے ای میلز پُش کریں۔"
+    pop3_polling_enabled: "ای میل جوابات کیلئے پَول بذریعہ POP3 کریں۔"
+    pop3_polling_ssl: "POP3 سرور سے کنیکٹ کرتے وقت SSL کا استعمال کریں۔ (تجویز کردہ)"
+    pop3_polling_openssl_verify: "TLS سرور سرٹیفکیٹ کی تصدیق کریں (ڈِیفالٹ: فعال کردہ)"
+    pop3_polling_period_mins: "ای میل کیلئے POP3 اکاؤنٹ چیک کرنے کے درمیان منٹوں میں مدت۔ نوٹ: رِیسٹارٹ ضروری ہے۔"
+    pop3_polling_port: "پَورٹ جس پر POP3 اکاؤنٹ پَول کیا جائے۔"
+    pop3_polling_host: "جس ہَوسٹ کیلئے پَول کیا جائے بذریعہ POP3۔"
+    pop3_polling_username: "ای میل کیلئے پَول کرنے کیلئے POP3 اکاؤنٹ کا صارف نام۔"
+    pop3_polling_password: "ای میل کیلئے پَول کرنے کیلئے POP3 اکاؤنٹ کا پاسورڈ۔"
+    log_mail_processing_failures: "تمام ای میل سے نمٹتے پر پیش آنء والی خرابیوں کو http://yoursitename.com/logs پر لاگ کریں"
+    email_in: "صارفین کو بذریعہ ای میل نئے ٹاپکس شائع کرنے کی اجازت دیں (دستی یا pop3 پَولنگ کی ضرورت ہے)۔ ہر قِسم کیلئے \"ترتیبات\" ٹَیب میں پتوں کو ترتیب دیں۔"
+    email_in_min_trust: "نئے ٹاپک بذریعہ ای میل شائع کرنے کیلئے کم از کم ٹرسٹ لَیول جس کی صارف کو ضرورت ہے۔"
+    email_prefix: "ای میلز کے موضوع میں استعمال کیا جانے والا [لیبل]۔ یہ سَیٹ کردہ نہ ہو تو 'عنوان' پر ڈِیفالٹ ہو جائے گا۔"
+    email_site_title: "سائٹ سے ای میلز کے \"بھیجنے والا\" کے طور پر استعمال ہونے والا سائٹ کا عنوان۔ یہ سَیٹ نہ ہو تو 'عنوان' پر ڈِیفالٹ ہو جائے گا۔ اگر آپ کے 'عنوان' میں ایسے حروف شامل ہیں جن کی ای میل \"بھیجنے والا\" سٹرِنگ میں اجازت نہیں ہے، تو اِس ترتیب کو استعمال کریں۔"
+    find_related_post_with_key: "جواب دی گئی پوسٹ کو تلاش کرنے کیلئے صرف 'جواب کلید' استعمال کریں۔ انتباہ: اِس کو غیر فعال کرنے سے ای میل ایڈریس پر مبنی صارف نقالی ممکن ہو جاتی ہے۔"
+    minimum_topics_similar: "نئے ٹاپک تشکیل کرتے وقت اُسی طرح کے دوسرے ٹاپکس پیش کیے جانے سے پہلے کتنے ٹاپکس کے موجود ہونے کی ضرورت ہے۔"
+    relative_date_duration: "اشاعت کے بعد دنوں کی تعداد جب پوسٹ تاریخیں مطلق (20 فروری) کی بجائے رَیلَیٹِو (7 دن) کے طور پر دکھائی جائیں گی۔"
+    delete_user_max_post_age: "اُن صارفین کو حذف کرنے کی اجازت نہ دیں جن کی پہلی اشاعت (x) دنوں سے زیادہ پرانی ہو۔"
+    delete_all_posts_max: "تمام پوسٹس حذف کریں والے بٹن سے ایک وقت میں حذف کیے جانے والی پوسٹس کی زیادہ سے زیادہ تعداد۔ اگر ایک صارف کی اِس سے زیادہ پوسٹس ہیں ، تو سبھی پوسٹس ایک ہی وقت میں حذف نہیں ہوسکتیں اور صارف کو حذف نہیں کیا جا سکتا۔"
+    username_change_period: "رجسٹریشن کے بعد دنوں کی زیادہ سے زیادہ تعداد جب تک کہ اکاؤنٹس اپنا صارف نام تبدیل کرسکتے ہیں (صارف نام کی تبدیلی کو غیر فعال کرنے کیلئے 0)۔"
+    email_editable: "رجسٹریشن کے بعد صارفین کو اپنا ای میل ایڈریس تبدیل کرنے کی اجازت دیں۔"
+    logout_redirect: "لاگ آؤٹ کے بعد براؤزر کو ریڈائرَیکٹ کرنے کا مقام (مثال: http://somesite.com/logout)"
+    allow_uploaded_avatars: "صارفین کو اپنی مرضی کی پروفائل تصاویر اَپ لوڈ کرنے کی اجازت دیں۔"
+    allow_animated_avatars: "صارفین کو اَینیمَیٹِڈ GIF پروفائل تصاویر استعمال کرنے کی اجازت دیں۔ انتباہ: اِس ترتیب کو تبدیل کرنے کے بعد avatars:refresh رَیک ٹاسک چلائیں۔"
+    allow_animated_thumbnails: "اَینیمَیٹِڈ GIFs کے اَینیمَیٹِڈ تھَمب نَیل پیدا کریں۔"
+    default_avatars: "URL اوتار کے، جو نئے صارفین کے لئے ڈِیفالٹ کی طور پر استعمال کیے جائیں گے جب تک کہ وہ اُن کو تبدیل نہ کر لیں۔"
+    automatically_download_gravatars: "اکاؤنٹ تخلیق یا ای میل کی تبدیلی پر صارفین کے لئے گَرِیوَّٹار ڈاؤن لوڈ کریں۔"
+    digest_topics: "ای میل خلاصہ میں شامل کرنے کیلئے مقبول ترین ٹاپکس کی زیادہ سے زیادہ تعداد۔"
+    digest_posts: "ای میل خلاصہ میں شامل کرنے کیلئے مقبول ترین پوسٹس کی زیادہ سے زیادہ تعداد۔"
+    digest_other_topics: "ای میل خلاصہ کے \"آپ کو پیروی کردہ ٹاپکس اور زُمرہ جات\" سیکشن میں دکھائے گئے ٹاپکس کی زیادہ سے زیادہ تعداد۔"
+    digest_min_excerpt_length: "ای میل خلاصہ میں پوسٹ اقتباس کی کم از کم لمبائی، حروف میں۔"
+    suppress_digest_email_after_days: "صارفین کیلئے خلاصہ ای میلز کو روک دیں جو (ن) دنوں سے زیادہ کیلئے سائٹ پر نہیں دیکھے گئے۔"
+    digest_suppress_categories: "خلاصہ ای میلز سے یہ زُمرہ جات دبائیں۔"
+    disable_digest_emails: "تمام صارفین کیلئے خلاصہ ای میلز غیر فعال کریں۔"
+    email_accent_bg_color: "اَیکسنٹ رنگ جو HTML ای میلز میں کچھ عناصر کے پسِ منظر کے طور پر استعمال کیا جائے گا۔ رنگ کا نام درج کریں ('red') یا ہَیکس قدر ('#FF0000')۔"
+    email_accent_fg_color: "رنگ ٹَیکسٹ کا جو HTML ای میلز میں ای میل کے پسِ منظر رنگ کے اوپر ظاہر ہوتا ہے۔ رنگ کا نام درج کریں ('white') یا ہَیکس قدر ('#FFFFFF')۔"
+    email_link_color: "HTML ای میلز میں لِنکس کا رنگ۔ رنگ کا نام درج کریں ('blue') یا ہَیکس قدر ('#0000FF')۔"
+    detect_custom_avatars: "چیک کیا جائے یا نہ کیا جائے کہ صارفین نے اپنی مرضی کی پروفائل تصاویر اَپ لوڈ کی ہیں کہ نہیں۔"
+    max_daily_gravatar_crawls: "ایک دن میں زیادہ سے زیادہ کتنی دفعہ ڈِسکورس گَرِیوَّٹار کو اپنی مرضی کے اوتار کیلئے چیک کرے گا"
+    public_user_custom_fields: "ایک صارف کیلئے اپنی مرضی کے فیلڈز کی وائٹ لِسٹ جو عوامی سطح پر دکھائی جا سکتی ہے۔"
+    staff_user_custom_fields: "ایک صارف کیلئے اپنی مرضی کے فیلڈز کی وائٹ لِسٹ جو سٹاف کو دکھائی جا سکتی ہے۔"
+    enable_user_directory: "براؤزِنگ کیلئے صارفین کی ایک ڈائرِکٹری فراہم کریں"
+    enable_group_directory: "براؤزِنگ کیلئے گروپوں کی ایک ڈائرِکٹری فراہم کریں"
+    group_in_subject: "ای میل کے موضوع میں %{optional_pm} کو ذاتی پیغام میں پہلے گروپ کے نام پر سَیٹ کریں، ملاحظہ کریں: https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    allow_anonymous_posting: "صارفین کو گمنام مَوڈ میں تبدیل ہونے کی اجازت دیں"
+    anonymous_posting_min_trust_level: "گمنام پوسٹنگ کو فعال کرنے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول"
+    anonymous_account_duration_minutes: "صارف کی گمنامی کی حفاظت کیلئے ہر صارف کیلئے ہر ن منٹ بعد ایک نیا گمنام اکاؤنٹ بنائیں۔ مثال: اگر 600 پر سَیٹ کیا جائے، تو جیسے ہی آخری پوسٹ سے 600 منٹ گزر چکے ہوں گے اور صارف گمنام مَوڈ پر تبدیل ہو گا، تو ایک نیا گمنام اکاؤنٹ پیدا کر دیا جائے گا۔"
+    hide_user_profiles_from_public: "گمنام صارفین کیلئے صارف کارڈ، صارف پروفائلز اور صارف ڈائرِکٹری غیر فعال کریں۔"
+    show_inactive_accounts: "لاگ اِن ہوے صارفین کو غیر فعال اکاؤنٹس کی پروفائلز کو براؤز کرنے کی اجازت دیں۔"
+    hide_suspension_reasons: "صارف پروفائلز پر عوامی طور پر معطلی کی وجوہات ظاہر نہ کریں۔"
+    log_personal_messages_views: "دیگر صارفین/گروپوں کیلئے ایڈمن کی طرف سے ذاتی پیغام وِیوز کو لاگ کریں۔"
+    user_website_domains_whitelist: "اِن ڈومینز کے ساتھ صارف ویب سائٹ کی تصدیق کی جائے گی۔ پائپ کے ساتھ الگ کی گئی فہرست۔"
+    allow_profile_backgrounds: "صارفین کو پروفائل پسِ منظر اَپ لوڈ کرنے کی اجازت دیں۔"
+    sequential_replies_threshold: "ایک ہی ٹاپک میں لگاتار کتنی پوسٹس ایک صارف شائع کرے اِس سے پہلے کہ اُسے بہت زیادہ لگاتار جوابات ہونے کی یاد دہانی کرائی جائے۔"
+    get_a_room_threshold: "انتباہ کرا دینے سے پہلے صارف ایک ہی ٹاپک میں ایک ہی شخص کیلئے کتنی پوسٹس شائع کرے۔"
+    enable_mobile_theme: "موبائل ڈِیوائیسِز ایک موبائل دوستانہ تھِیم کا استعمال کرتی ہیں، مکمل سائٹ پر تبدیل ہو جانے کی صلاحیت کے ساتھ۔ اگر آپ اپنی مرضی کی سٹائل شیٹ، جو کہ مکمل طور پر رِسپَونسِو ہو، استعمال کرنا چاہتے ہیں تو اِس کو غیر فعال کریں۔"
+    dominating_topic_minimum_percent: "ایک ٹاپک میں ایک ہی صارف کی طرف سے کتنے فیصد پوسٹس ہونی چاہئیں، اِس سے پہلے کہ اُسے ٹاپک پر حد سے زیادہ غالب ہو جانے کی یاد دہانی کرائی جائے۔"
+    disable_avatar_education_message: "اوتار تبدیل کرنے کیلئے تعلیمی پیغام کو غیر فعال کریں۔"
+    suppress_uncategorized_badge: "ٹاپک فہرستوں میں غیر زُمرہ جات والے ٹاپکس کیلئے بَیج نہ دکھائیں۔"
+    permalink_normalizations: "دائمی لِنکس میچ کرنے سے پہلے درج ذیل رَیج اَیکس کا اطلاق کریں، مثال کے طور پر: /(topic.*)\\?.*/\\1 ٹاپک روٹس میں سے قُوَیری سٹرِنگ کو نکال دے گا۔ فارمیٹ regex+string ہے، میچ کردہ کو ایکسَیس کرنے کیلئے \\1 وغیرہ کا استعمال کریں"
+    global_notice: "تمام زائرین کو فوری،اَیمرجنسی گلوبل بَینر نوٹس دکھائیں، اِسے چھپانے کیلئے خالی جگہ میں تبدیل کریں (HTML کی اجازت ہے)۔"
+    disable_edit_notifications: "سِسٹم صارف کی طرف سے ترمیم اطلاعات کو غیر فعال کریں جب 'download_remote_images_to_local' فعال ہو۔"
+    automatically_unpin_topics: "صارفین جب ٹاپک کے آخر تک پہنچ جائیں تو خود بخود ٹاپکس پر سے پِن ہٹا دیں۔"
+    read_time_word_count: "متوقع پڑھنے کے وقت کا حساب لگانے کیلئے فی منٹ الفاظ کی تعداد۔"
+    topic_page_title_includes_category: "ٹاپک صفحہ کے عنوان میں زُمرہ کا نام شامل ہے۔"
+    native_app_install_banner: "بار بار آنے والوں کو ڈِسکورس مقامی ایَپ اِنسٹال کرنے کیلئے پوچھا جائے۔"
+    share_anonymized_statistics: "گمنام استعمال کے اعداد و شمار کا اشتراک کریں۔"
+    auto_handle_queued_age: "اُن ریکارڈز کو خود کار طریقہ سے ہَینڈل کریں جو اتنے دنوں کے بعد نظر ثانی کے منتظر ہیں۔ فلَیگز کو نظر انداز کیا جائے گا۔ قطار شدہ پوسٹس اور صارفین کو مسترد کردیا جائے گا۔ اِس خصوصیت کو غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
+    max_prints_per_hour_per_user: "/print صفحہ نقوش کی زیادہ سے زیادہ تعداد (غیر فعال کرنے کیلئے 0 پر سَیٹ کریں)"
+    full_name_required: "مکمل نام ایک صارف کے پروفائل کا لازمی فیلڈ ہے۔"
+    enable_names: "صارف کا مکمل نام اُن کے پروفائل، صارف کارڈ، اور ای میل پر دکھائیں۔ ہر جگہ مکمل نام چھپانے کیلئے غیر فعال کریں۔"
+    display_name_on_posts: "اپنے @username کے علاوہ صارف کی پوسٹس پر اُن کا مکمل نام بھی دکھائیں۔"
+    show_time_gap_days: "اگر دو پوسٹس اتنے دنوں بعد شائع کی گئے ہوں، تو ٹاپک میں وقت کا فرق دکھائیں۔"
+    short_progress_text_threshold: "اگر ٹاپک میں پوسٹس کی تعداد اِس نمبر سے اوپر چلے جاتی ہے، تو پراگرَیس بار صرف موجودہ پوسٹ نمبر دکھائے گا۔ اگر آپ پراگرَیس بار کی چوڑائی کو تبدیل کریں گے، تو آپ کو اِس قدر کو تبدیل کرنے کی ضرورت پر سکتی ہے۔"
+    default_code_lang: "گِٹ ہَب کَوڈ بلاکس پر لاگو ڈِیفالٹ پروگرامِنگ زبان سِنٹیکس ہائلائیٹِنگ (lang-auto، ruby، python وغیرہ)"
+    warn_reviving_old_topic_age: "جب کوئی ایسے ٹاپک پر جواب دینا شروع کرے جہاں پچھلا آخری جواب اتنے دنوں سے زیادہ پرانا ہو، تو ایک انتباہ ظاہر کی جائے گی۔ 0 پر سَیٹ کر کہ غیر فعال کریں۔"
+    autohighlight_all_code: "تمام پہلے سے فارمَیٹ کردہ کَوڈ بلاکس پر ذبردستی کَوڈ ہائلائیٹِنگ لاگو کریں، یہاں تک کہ جب زبان بھی خاص طور پر واضح نہ کی گئی ہو۔"
+    highlighted_languages: "سِنٹیکس ہائلائیٹِنگ کے قوانین شامل کریں۔ (انتباہ: بہت زیادہ زبانوں کو شامل کرنے سے کارکردگی پر اثر ہو سکتا ہے) ڈَیمو کیلئے ملاحظہ کریں: https://highlightjs.org/static/demo/"
+    embed_truncate: "اَیمبَیڈ کی گئی پوسٹس کو تراشیں۔"
+    embed_support_markdown: "اَیمبَیڈ کردہ پوسٹس کیلئے مارکڈائون کی اجازت دیں۔"
+    allowed_href_schemes: "http اور https کے علاوہ لِنکس میں اجازت دی گئی اسکیمز۔"
+    embed_post_limit: "اَیمبَیڈ کیے جانے والی پوسٹس کی زیادہ سے زیادہ تعداد۔"
+    embed_username_required: "ٹاپک کی تخلیق کیلئے صارف نام ضروری ہے۔"
+    notify_about_flags_after: "اگر ایسے فلَیگ موجود ہیں جن پر اتنے گھنٹوں کے بعد بھی کام نہیں کیا جا سکا، تو سٹاف کو ذاتی پیغام بھیجیں۔ غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
+    show_create_topics_notice: "اگر سائٹ میں 5 سے کم عوامی ٹاپک موجود ہیں، تو کچھ ٹاپک تخلیق کرنے کیلئے منتظمین کو ایک نوٹس دکھائیں۔"
+    delete_drafts_older_than_n_days: (ن) دنوں سے پرانے ڈرافٹ حذف کریں۔
+    bootstrap_mode_min_users: "بُوٹسٹرَیپ مَوڈ غیر فعال کرنے کیلئے درکار صارفین کی کم از کم تعداد (غیر فعال کرنے کیلئے 0 پر سَیٹ کریں)"
+    prevent_anons_from_downloading_files: "گمنام صارفین کو اٹَیچمنٹس ڈاؤن لوڈ کرنے سے روکیں۔ انتباہ: ایسا کرنے سے کوئی بھی غیر تصویر سائٹ کے اثاثہ جات، جو اٹَیچمنٹ کے طور پرشائع کیے گئے ہوں، بھی کام کرنا چھوڑ دیں گے۔"
+    slug_generation_method: "سلَگ تخلیق کا طریقہ منتخب کریں۔ 'انکوڈ کردہ' فیصد انکوڈِنگ سٹرِنگ تخلیق کرے گ۔. 'کوئی بھی نہیں' سلَگ کو غیر فعال کر دے گا۔"
+    enable_emoji: "اِیمَوجی فعال کریں"
+    enable_emoji_shortcuts: "عام سمائلی ٹیکسٹ جیسا کہ :) :p :(  اِیمَوجیوں میں تبدیل کر دیا جائے گا"
+    emoji_set: "آپ اپنا اِیمَوجی کیسا پسند کریں گے؟"
+    enforce_square_emoji: "تمام اِیمَوجیوں کو ایک مربع اَیسپَیکٹ رَیشو پر مجبور کریں۔"
+    approve_post_count: "ایک نئے یا بَیسِک صارف کی طرف سے پوسٹس کی تعداد جن کا منظور کیے جانا لاذمی ہے "
+    approve_unless_trust_level: "اِس ٹرسٹ لَیول سے نیچے کے صارفین کیلئے پوسٹس کا منظور شدہ ہونا لازمی ہے"
+    approve_new_topics_unless_trust_level: "اِس ٹرسٹ لَیول سے نیچے کے صارفین کیلئے نئے ٹاپکس کا منظور شدہ ہونا لازمی ہے"
+    approve_unless_staged: "سٹَیجڈ صارفین کیلئے نئے ٹاپکس اور پوسٹس کا منظور شدہ ہونا لازمی ہے"
+    notify_about_queued_posts_after: "اگر ایسی پوسٹس موجود ہیں جو اتنے گھنٹوں کے بعد بھی جائزہ لیے جانے کی منتظر ہیں، تو تمام ماڈریٹرز کو اطلاع بھیجیں۔ اِن اطلاعات کو غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
+    auto_close_messages_post_count: "خود کار طریقہ سے بند کیے جانے سے پہلے ایک پیغام میں پوسٹس کی زیادہ سے زیادہ تعداد (غیر فعال کرنے کیلئے 0)"
+    auto_close_topics_post_count: "خود کار طریقہ سے بند کیے جانے سے پہلے ایک ٹاپک میں پوسٹس کی زیادہ سے زیادہ تعداد (غیر فعال کرنے کیلئے 0)"
+    code_formatting_style: "کمپَوزر میں کَوڈ بٹن اِس کوڈ فارمَیٹِنگ سٹائل پر ڈِیفالٹ کرے گا"
+    max_allowed_message_recipients: "ایک پیغام میں وصول کنندگان کی زیادہ سے زیادہ تعداد۔"
+    watched_words_regular_expressions: "دیکھے گئے الفاظ رَیگولر اَیکسپرَیشَن ہیں۔"
+    default_email_digest_frequency: "صارفین کو ڈِیفالٹ کے طور پر خلاصہ ای میل کتنی بار ملتی ہیں۔"
+    default_include_tl0_in_digests: "ڈِیفالٹ کے طور پر خلاصہ ای میلز میں نئے صارفین کی طرف سے پوسٹس شامل کریں۔ صارفین اسے اپنی ترجیحات میں تبدیل کرسکتے ہیں۔"
+    default_email_personal_messages: "ڈِیفالٹ کے طور پر ایک ای میل بھیجیں جب کوئی صارف کو پیغام بھیجتا ہے۔"
+    default_email_direct: "ڈِیفالٹ کے طور پر ایک ای میل بھیجیں جب کوئی صارف، کا اقتباس/ کو جواب/ ذکر یا کو مدعو کرتا ہے۔"
+    default_email_mailing_list_mode: "ڈِیفالٹ کے طور ہر نئی پوسٹ پر ایک ای میل بھیجیں"
+    default_email_mailing_list_mode_frequency: "صارفین جو مَیلنگ لِسٹ مَوڈ فعال کرتے ہیں اُن کو ڈِیفالٹ کے طور پر اِس کثرت سے ای میلز ملیں گی۔"
+    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_notification_level_when_replying: " گلوبل ڈیفالٹ اطلاعات کا لَیول جب صارف کسی ٹاپک پر جواب دے۔"
+    default_other_external_links_in_new_tab: "ڈِیفالٹ کے طور پر تمام بیرونی ویب سائٹ کے لنکس ایک نئے ٹیب میں کھولیں۔"
+    default_other_enable_quoting: "ڈِیفالٹ کے طور پر روشنی ڈالے گئے ٹَیکسٹ کے لئے اقتباسی جواب فعال کریں۔"
+    default_other_dynamic_favicon: "ڈِیفالٹ کے طور پر براؤزر آئکن پر نئے / اَپ ڈیٹ کردہ ٹاپکس کی گنتی دکھائیں۔"
+    default_other_disable_jump_reply: "ڈِیفالٹ کے طور پر صارف کے جواب دینے کے بعد اُن کی پوسٹ پر نہ جائیں۔"
+    default_other_like_notification_frequency: "ڈِیفالٹ کے طور پر صارفین کو لائیکس پر اطلاع دیں"
+    default_topics_automatic_unpin: "ڈِیفالٹ کے طور پر صارفین جب ٹاپک کے آخر تک پہنچ جائیں تو خود بخود ٹاپکس پر سے پِن ہٹا دیں۔"
+    default_categories_watching: "زُمرہ جات کی فہرست جو ڈِیفالٹ کے طور پر دیکھے گئے ہوں۔"
+    default_categories_tracking: "زُمرہ جات کی فہرست جو ڈِیفالٹ کے طور پر ٹرَیک کردہ ہوں۔"
+    default_categories_muted: "زُمرہ جات کی فہرست جو ڈِیفالٹ کے طور پر خاموش کردہ ہوں۔"
+    default_categories_watching_first_post: "زُمرہ جات کی فہرست جس میں ڈِیفالٹ کے طور پر ہر نئے ٹاپک میں پہلی پوسٹ دیکھی جائے گی۔"
+    retain_web_hook_events_period_days: "ویب ہک اِیونٹ ریکارڈ برقرار رکھنے کیلئے دنوں کی تعداد۔"
+    allow_user_api_keys: "صارف API کلیدیں تخلیق کرنے کی اجازت دیں"
+    allow_user_api_key_scopes: "صارف API کلیدوں کیلئے اجازت دی جانے والی سکَوپس کی فہرست"
+    max_api_keys_per_user: "فی صارف، صارف API کلیدوں کی زیادہ سے زیادہ تعداد"
+    min_trust_level_for_user_api_key: "API کلیدوں کی تخلیق کیلئے مطلوبہ ٹرسٹ لَیول"
+    allowed_user_api_auth_redirects: "صارف API کلیدوں کیلئے توثیقی ریڈائرَیکٹ کیلئے اجازت یافتہ URL"
+    allowed_user_api_push_urls: "صارف API پر سرور پُش کیلئے اجازت یافتہ URL"
+    tagging_enabled: "ٹاپکس پر ٹیگز فعال کریں؟"
+    min_trust_to_create_tag: "ٹَیگ بنانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول۔"
+    max_tags_per_topic: "ایک ٹاپک پر لگائے جانے والے ٹَیگز کی زیادہ سے زیادہ تعداد۔"
+    max_tag_length: "ایک ٹَیگ میں استعمال ہونے والے حروف کی زیادہ سے زیادہ تعداد۔"
+    max_tag_search_results: "ٹَیگز سرچ کرتے وقت، ظاہر کردہ نتائج کی زیادہ سے زیادہ تعداد۔"
+    show_filter_by_tag: "ٹیگ کی بنیاد پر ایک ٹاپک فہرست کو فلٹر کرنے کیلئے ڈراپ ڈاؤن دکھائیں۔"
+    max_tags_in_filter_list: "فلٹر ڈراپ ڈاؤن میں دکھانے گئے ٹَیگز کی زیادہ سے زیادہ تعداد۔ سب سے زیادہ استعمال شدہ ٹَیگز دکھائے جائیں گے۔"
+    tags_sort_alphabetically: "ٹَیگز کو حروف تہجی کی ترتیب میں دکھائیں۔ ڈِیفالٹ کے طور پر مقبولیت کے مطابق دکھائے جائیں گے۔"
+    tags_listed_by_group: "ٹَیگز صفحے پر ٹَیگ گروپ کی بنیاد پر ٹَیگز کی فہرست بنائیں (/tags)۔"
+    tag_style: "ٹَیگ بیَجوں کیلئے بصری سٹائل۔"
+    staff_tags: "ٹَیگز کی ایک فہرست جو صرف سٹاف ممبران لگا سکتے ہیں"
+    allow_staff_to_tag_pms: "سٹاف ممبران کو کسی بھی ذاتی پیغام پر ٹَیگ لگانے کی اجازت دیں"
+    min_trust_level_to_tag_topics: "ٹاپکس پر ٹَیگ لگانے کیلئے کم از کم مطلوبہ ٹرسٹ لَیول"
+    suppress_overlapping_tags_in_list: "اگر ٹَیگز ٹاپک عنوانات میں موجود مکمل الفاظ سے مَیچ کرتے ہوں، تو ٹَیگ مت دکھائیں"
+    remove_muted_tags_from_latest: "تازہ ترین ٹاپک فہرست میں خاموش شدہ ٹَیگز کے ساتھ ٹَیگ کردہ ٹاپکس مت دکھائیں۔"
+    company_short_name: "کمپنی نام (مختصر)"
+    company_full_name: "کمپنی نام (مکمل)"
+    company_domain: "کمپنی ڈَومَین"
+    shared_drafts_category: "ٹاپک ڈرافٹس کیلئے ایک زُمرَہ کو مقرر کر کہ مشترکہ ڈرافٹس کی صلاحیت کو فعال کریں۔"
+    errors:
+      invalid_email: "غلط ای میل ایڈریس۔"
+      invalid_username: "اِس صارف نام والا کوئی صارف نہیں ہے۔"
+      invalid_integer_min_max: "قدر کا %{min} اور %{max} کے درمیان ہونا ضروری ہے۔"
+      invalid_integer_min: "قدر کا %{min} یا زیادہ ہونا ضروری ہے۔"
+      invalid_integer_max: "قدر %{max} سے زیادہ نہیں ہوسکتی۔"
+      invalid_integer: "وَیلِیو کا اِنٹیجَر ہونا لازمی ہے۔"
+      regex_mismatch: "وَیلِیو مطلوبہ فارمَیٹ سے مَیچ نہیں کرتی۔"
+      must_include_latest: "سب سے اوپر والے مَینِیو میں 'تازہ ترین' ٹَیب کا شامل ہونا لازمی ہے۔"
+      invalid_string: "غلط وَیلِیو۔"
+      invalid_string_min_max: "%{min} اور %{max} حروف کے درمیان ہونا ضروری ہے۔"
+      invalid_string_min: "کم از کم %{min} حروف کا ہونا ضروری ہے۔"
+      invalid_string_max: "%{max} حروف سے زیادہ نہ ہونا ضروری ہے۔"
+      invalid_reply_by_email_address: "وَیلِیو میں '%{reply_key}' موجود ہونا اور اُس کا نوٹیفکیشن ای میل سے مختلف ہونا ضروری ہے۔"
+      invalid_alternative_reply_by_email_addresses: "تمام وَیلِیوز میں '%{reply_key}' موجود ہونا اور اُس کا نوٹیفکیشن ای میل سے مختلف ہونا ضروری ہے۔"
+      pop3_polling_host_is_empty: "POP3 پولِنگ فعال کرنے سے پہلے آپ کو 'pop3 پولِنگ ہوَسٹ' سَیٹ کرنا ہوگا۔"
+      pop3_polling_username_is_empty: "POP3 پولِنگ فعال کرنے سے پہلے آپ کو 'pop3 پولِنگ صارف نام' سَیٹ کرنا ہوگا۔"
+      pop3_polling_password_is_empty: "POP3 پولِنگ فعال کرنے سے پہلے آپ کو 'pop3 پولِنگ پاسورڈ' سَیٹ کرنا ہوگا۔"
+      pop3_polling_authentication_failed: "POP3 کی توثیق ناکام ہوگئی۔ براہ مہربانی اپنے pop3 اسناد کی تصدیق کریں۔"
+      reply_by_email_address_is_empty: "بذریعہ ای میل جواب فعال کرنے سے پہلے آپ کی طرف سے ایک 'جواب بذریعہ ای میل ایڈریس' سَیٹ کرنا ضروری ہے۔"
+      email_polling_disabled: "بذریعہ ای میل جواب فعال کرنے سے پہلے آپ کا دستی یا POP3 پولِنگ فعال کرنا ضروری ہے۔"
+      user_locale_not_enabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'صارف مقامیت کی اجازت' فعال کرنا ضروری ہے۔"
+      invalid_regex: "رَیج اَیکس غلط یا اجازت یافتہ نہیں ہے۔"
+      email_editable_enabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'قابل ترمیم بذریعہ ای میل' غیر فعال کرنا ضروری ہے۔"
+      enable_sso_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'sso فعال کریں' فعال کرنا ضروری ہے۔"
+      staged_users_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'سٹَیجڈ صارفین' فعال کرنا ضروری ہے۔"
+      reply_by_email_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'جواب بذریعہ ای میل' فعال کرنا ضروری ہے۔"
+      sso_url_is_empty: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'sso url' مقرر کرنا ضروری ہے۔"
+      enable_local_logins_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'مقامی لاگ اِن' فعال کرنا ضروری ہے۔"
+  search:
+    within_post: "%{username} کی طرف سے #%{post_number}"
+    types:
+      category: 'زُمرَہ جات'
+      topic: 'نتائج'
+      user: 'صارفین'
+    results_page: "'%{term}' کیلئے سرچ کے نتائج"
+  sso:
+    login_error: "لاگ اِن خرابی"
+    not_found: "آپ کا اکاؤنٹ نہیں مل سکا۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+    account_not_approved: "آپ کے اکاؤنٹ کی منظوری زیر التواء ہے۔ منظوری ملنے پر آپ کو ایک ای میل اطلاع موصول ہو گی۔"
+    unknown_error: "آپ کے اکاؤنٹ کے ساتھ ایک مسئلہ درپیش ہے۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+    timeout_expired: "اکاؤنٹ لاگ اِن کا وقت ختم ہوگیا، براہ مہربانی دوبارہ لاگ اِن کرنے کی کوشش کریں۔"
+    no_email: "کوئی ای میل پتہ فراہم نہیں گیا تھا۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+    email_error: "%{email} ای میل ایڈریس کے ساتھ اکاؤنٹ رجسٹر نہیں کیا جا سکا ۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
+  original_poster: "اصل پوسٹ کرنے والا"
+  most_posts: "سب سے زیادہ پوسٹس"
+  most_recent_poster: "سب سے حالیہ پوسٹ کرنے والا"
+  frequent_poster: "اکثر پوسٹ کرنے والا"
+  redirected_to_top_reasons:
+    new_user: "ہماری کمیونٹی میں خوش آمدید! یہ سب سے زیادہ مقبول ترین حالیہ ٹاپک ہیں۔"
+    not_seen_in_a_month: "واپسی کی خوش آمدید! ہم نے کچھ دیر سے آپ کو یہاں نہیں دیکھا۔ جب سے آپ دور رہے ہیں، یہ اُس دورانیہ کے سب سے زیادہ مقبول ترین ٹاپک ہیں۔"
+  merge_posts:
+    edit_reason:
+      one: "ایک پوسٹ کو %{username} کی طرف سے ضم کیا گیا تھا"
+      other: "%{count} پوسٹس کو %{username} کی طرف سے ضم کیا گیا تھا"
+    errors:
+      different_topics: "مختلف ٹاپکس کی پوسٹس کو ضم نہیں کیا جا سکتا۔"
+      different_users: "مختلف صارفین کی پوسٹس کو ضم نہیں کیا جا سکتا۔"
+  move_posts:
+    new_topic_moderator_post:
+      one: "پوسٹ کو ایک نئے ٹاپک پر تقسیم کر دیا گیا تھا: %{topic_link}"
+      other: "%{count} پوسٹس کو ایک نئے ٹاپک پر تقسیم کر دیا گیا تھا: %{topic_link}"
+    existing_topic_moderator_post:
+      one: "پوسٹ کو ایک موجودہ ٹاپک میں ضم کر دیا گیا تھا: %{topic_link}"
+      other: "%{count} پوسٹس کو ایک موجودہ ٹاپک میں ضم کر دیا گیا تھا: %{topic_link}"
+  change_owner:
+    post_revision_text: "%{old_user} سے %{new_user} کو مالکیت منتقل کر دی گئی"
+    deleted_user: "ایک حذف شدہ صارف"
+  topic_statuses:
+    archived_enabled: "یہ ٹاپک اب آرکائیو کیا ہوا ہے۔ یہ منجمد ہے اور کسی طرح سے بھی تبدیل نہیں کیا جاسکتا۔"
+    archived_disabled: "یہ ٹاپک اب غیر آرکائیو شدہ ہے۔ یہ اب منجمد نہیں اور تبدیل کیا جاسکتا ہے۔"
+    closed_enabled: "یہ ٹاپک اب بند کر دیا گیا ہے۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+    closed_disabled: "یہ ٹاپک اب کھول دیا گیا ہے. نئے جوابات کی اجازت ہے۔"
+    autoclosed_message_max_posts:
+      one: "1 جواب کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ پیغام خود کار طریقہ سے بند کر دیا گیا تھا۔"
+      other: "%{count} جوابات کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ پیغام خود کار طریقہ سے بند کر دیا گیا تھا۔"
+    autoclosed_topic_max_posts:
+      one: "1 جواب کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ ٹاپک خود کار طریقہ سے بند کر دیا گیا تھا۔"
+      other: "%{count} جوابات کی زیادہ سے زیادہ حد تک پہنچنے کے بعد یہ ٹاپک خود کار طریقہ سے بند کر دیا گیا تھا۔"
+    autoclosed_enabled_days:
+      one: "یہ ٹاپک خود کار طریقہ سے 1 دن کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+      other: "یہ ٹاپک خود کار طریقہ سے %{count} دنوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+    autoclosed_enabled_hours:
+      one: "یہ ٹاپک خود کار طریقہ سے 1 گھنٹے کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+      other: "یہ ٹاپک خود کار طریقہ سے %{count} گھنٹوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+    autoclosed_enabled_minutes:
+      one: "یہ ٹاپک خود کار طریقہ سے 1 منٹ کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+      other: "یہ ٹاپک خود کار طریقہ سے %{count} منٹوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+    autoclosed_enabled_lastpost_days:
+      one: "یہ ٹاپک آخری جواب کے 1 دن بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+      other: "یہ ٹاپک آخری جواب کے %{count} دنوں بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+    autoclosed_enabled_lastpost_hours:
+      one: "یہ ٹاپک آخری جواب کے 1 گھنٹے بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+      other: "یہ ٹاپک آخری جواب کے %{count} گھنٹوں بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+    autoclosed_enabled_lastpost_minutes:
+      one: "یہ ٹاپک آخری جواب کے 1 منٹ بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+      other: "یہ ٹاپک آخری جواب کے %{count} منٹوں بعد خود کار طریقہ سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت نہیں ہے۔"
+    autoclosed_disabled_days:
+      one: "یہ ٹاپک خود کار طریقہ سے 1 دن کے بعد کھول دیا گیا تھا۔"
+      other: "یہ ٹاپک خود کار طریقہ سے %{count} دنوں کے بعد کھول دیا گیا تھا۔"
+    autoclosed_disabled_hours:
+      one: "یہ ٹاپک خود کار طریقہ سے 1 گھنٹے کے بعد کھول دیا گیا تھا۔"
+      other: "یہ ٹاپک خود کار طریقہ سے %{count} گھنٹوں کے بعد کھول دیا گیا تھا۔"
+    autoclosed_disabled_minutes:
+      one: "یہ ٹاپک خود کار طریقہ سے 1 منٹ کے بعد کھول دیا گیا تھا۔"
+      other: "یہ ٹاپک خود کار طریقہ سے %{count} منٹوں کے بعد کھول دیا گیا تھا۔"
+    autoclosed_disabled_lastpost_days:
+      one: "یہ ٹاپک آخری جواب کے 1 دن بعد خود کار طریقہ سے کھول دیا گیا تھا۔"
+      other: "یہ ٹاپک آخری جواب کے %{count} دنوں بعد خود کار طریقہ سے کھول دیا گیا تھا۔"
+    autoclosed_disabled_lastpost_hours:
+      one: "یہ ٹاپک آخری جواب کے 1 گھنٹے بعد خود کار طریقہ سے کھول دیا گیا تھا۔"
+      other: "یہ ٹاپک آخری جواب کے %{count} گھنٹوں بعد خود کار طریقہ سے کھول دیا گیا تھا۔"
+    autoclosed_disabled_lastpost_minutes:
+      one: "یہ ٹاپک آخری جواب کے 1 منٹ بعد خود کار طریقہ سے کھول دیا گیا تھا۔"
+      other: "یہ ٹاپک آخری جواب کے %{count} منٹوں بعد خود کار طریقہ سے کھول دیا گیا تھا۔"
+    autoclosed_disabled: "یہ ٹاپک اب کھول دیا گیا ہے. نئے جوابات کی اجازت ہے۔"
+    autoclosed_disabled_lastpost: "یہ ٹاپک اب کھول دیا گیا ہے. نئے جوابات کی اجازت ہے۔"
+    pinned_enabled: "یہ ٹاپک اب پِن کیا یوا ہے۔ یہ اپنے زُمرہ میں سب سے اوپر ظاہر ہو گا جب تک کہ سٹاف کی طرف سے سب کیلئے یہ پِن ہٹا دی نہ جائے یا صارفین کی طرف سے انفرادی طور پر صرف اپنے آپ کیلئے۔"
+    pinned_disabled: "اِس ٹاپک پر سے اب پِن ہٹا دی گئی ہے۔ یہ اب اپنے زُمرہ کے سب سے اوپر ظاہر نہیں ہو گا۔"
+    pinned_globally_enabled: "یہ ٹاپک اب عالمی سطح پر پِن کیا یوا ہے۔ یہ اپنے زُمرہ میں اور سبھی ٹاپک فہرستوں پر سب سے اوپر ظاہر ہو گا جب تک کہ سٹاف کی طرف سے سب کیلئے یہ پِن ہٹا دی نہ جائے یا صارفین کی طرف سے انفرادی طور پر صرف اپنے آپ کیلئے۔"
+    pinned_globally_disabled: "اِس ٹاپک پر سے اب پِن ہٹا دی گئی ہے۔ یہ اب اپنے زُمرہ کے سب سے اوپر ظاہر نہیں ہو گا۔"
+    visible_enabled: "یہ ٹاپک اب فہرست شدہ ہے۔ یہ ٹاپک فہرستوں میں ظاہر ہو گا۔"
+    visible_disabled: "یہ ٹاپک اب غیر فہرست شد ہے۔ یہ اب کسی ٹاپک فہرستوں میں ظاہر نہیں ہو گا۔ اِس ٹاپک تک رسائی کا واحد طریقہ براہ راست لِنک کے ذریعہ ہے۔"
+    auto_deleted_by_timer: "ٹائمر کی طرف سے خود بخود حذف کر دیا گیا۔"
+  login:
+    not_approved: "آپ کا اکاؤنٹ ابھی تک منظور نہیں کیا گیا ہے۔ جب آپ لاگ اِن کر سکیں گے تو آپ کو بذریعہ اِی میل مطلع کر دیا جائے گا۔"
+    incorrect_username_email_or_password: "غلط صارف نام، ای میل یا پاسوَرڈ"
+    incorrect_password: "غلط پاسوَرڈ"
+    wait_approval: "سائن اَپ ہونے کیلئے شکریہ۔ جب آپ کا اکاؤنٹ منظور ہو جائے گا تو ہم آپ کو مطلع کر دیں گے۔"
+    active: "آپ کا اکاؤنٹ چالو کر دیا گیا ہے اور استعمال کیلئے تیار ہے۔"
+    activate_email: "<p>آپ تقریباً کام مکمل کر چکے ہیں! ہم نے <b>%{email}</b> پر ایک ایکٹیویشن میل بھیج دی ہے۔ براہ مہربانی اپنے اکاؤنٹ کو چالو کرنے کیلئے میل میں دی گئی ہدایات پر عمل کریں۔</p> <p>اگر یہ آپ کو موصول نہ ہو، تو اپنا سپَیم فولڈر چیک کریں۔</p>"
+    not_activated: "ابھی آپ لاگ اِن نہیں کر سکتے۔ ہم نے آپ کو ایک ایکٹیویشن اِی میل بھیجی ہے۔ براہ مہربانی، اپنے اکاؤنٹ کو چالو کرنے کیلئے ای میل میں دی گئی ہدایات پر عمل کریں۔"
+    not_allowed_from_ip_address: "آپ %{username} کے طور پر اِس IP ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
+    admin_not_allowed_from_ip_address: "آپ ایڈمن کے طور پر اِس IP ایڈریس سے لاگ اِن نہیں ہو سکتے۔"
+    suspended: "آپ %{date} تک لاگ اِن نہیں کر سکتے ہیں۔"
+    suspended_with_reason: "اکاؤنٹ %{date} تک معطل کر دیا گیا: %{reason}"
+    errors: "%{errors}"
+    not_available: "دستیاب نہیں۔ اِستعمال کریں %{suggestion}؟"
+    something_already_taken: "کچھ غلط ہو گیا، شاید صارف نام یا ای میل پہلے یہ سے رجسٹرڈ ہے۔ پاسورڈ بھول گیا والا لنک اِستعمال کر کے دیکھیں۔"
+    omniauth_error: "معذرت، آپ کا اکاؤنٹ اَوتھرائز کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ شاید آپ نے اَوتھرائز کرنے کی اجازت نہیں دی؟"
+    omniauth_error_unknown: "آپ کے لاگ اِن سے نمٹنے میں کچھ خراب ہو گیا، براہ مہربانی دوبارہ کوشش کریں۔"
+    authenticator_error_no_valid_email: "%{account} سے وابستہ کسی ای میل پتہ کی اجازت نہیں ہے۔ آپ کو اپنے اکاؤنٹ کو کسی مختلف ای میل ایڈریس کے ساتھ ترتیب دینے کی ضرورت ہوسکتی ہے۔"
+    new_registrations_disabled: "اِس وقت کسی بھی نئے اکاؤنٹ کی رجسٹریشن کی اجازت نہیں ہے۔"
+    password_too_long: "پاسورڈ 200 حروف تک محدود ہیں۔"
+    email_too_long: "آپ کا فراہم کردہ ای میل بہت طویل ہے۔ میل باکس نام 254 حروف سے زیادہ نہیں ہونے چاہئیں، اور ڈَومین نام 253 حروف سے زیادہ نہیں ہونے چاہئیں۔"
+    reserved_username: "اُس صارف نام کی اجازت نہیں ہے۔"
+    missing_user_field: "آپ نے تمام صارف فیلڈز مکمل نہیں کی ہیں"
+    auth_complete: "تصدیق مکمل ہوگئی ہے۔"
+    click_to_continue: "جاری رکھنے کیلئے یہاں کلِک کریں۔"
+    already_logged_in: "افوہ، لگتا ہے کہ آپ کسی اور صارف کیلئے دعوت نامے کو قبول کرنے کی کوشش کر رہے ہیں۔ اگر آپ %{current_user} نہیں ہیں تو، براہ مہربانی لاگ آُوٹ کریں اور دوبارہ کوشش کریں۔"
+    second_factor_title: "دو فیکٹر توثیق"
+    second_factor_description: "براہ مہربانی اپنی اَیپ میں سے مطلوبہ توثیقی کَوڈ درج کریں:"
+    invalid_second_factor_code: "غلط توثیقی کَوڈ"
+  user:
+    no_accounts_associated: "کوئی اکاؤنٹس وابستہ نہیں"
+    deactivated: "بہت سے '%{email}' پر باؤنسِ ہوئے ای میل کی وجہ سے غیر فعال کر دیا گیا تھا۔"
+    deactivated_by_staff: "سٹاف نے غیر فعال کیا"
+    activated_by_staff: "سٹاف نے فعال کیا"
+    new_user_typed_too_fast: "نئے صارف نے بہت تیزی سے ٹائپ کیا"
+    content_matches_auto_block_regex: "مواد خود کار طریقہ سے بلاک کردہ رَیج اَیکس سے مَیچ کرتا ہے"
+    username:
+      short: "کم از کم %{min} حروف کا ہونا لازمی ہے"
+      long: "%{max} حروف سے زیادہ نہ ہونا لازمی ہے"
+      characters: "صرف نمبر، حروف، ڈَیشِز، اور انڈر سکَور کا شامل ہونا لازمی ہے"
+      unique: "منفرد ہونا لازمی ہے"
+      blank: "موجود ہونا لازمی ہے"
+      must_begin_with_alphanumeric_or_underscore: "ایک حرف، ایک نمبر یا ایک انڈر سکَور کے ساتھ شروع ہونا لازمی ہے"
+      must_end_with_alphanumeric: "ایک حرف یا ایک نمبر کے ساتھ ختم ہونا لازمی ہے"
+      must_not_contain_two_special_chars_in_seq: "2 یا اُس سے زیادہ خاص حروف (.-_) ایک سلسلہ میں شامل نہ ہونا لازمی ہے"
+      must_not_end_with_confusing_suffix: "عجیب لاحقہ جیسا کہ .json یا .png وغیرہ کے ساتھ ختم نہ ہونا لازمی ہے"
+    email:
+      not_allowed: "اِس ای میل پرووَائیڈر سے اجازت نہیں ہے۔ براہ مہربانی ایک اور ای میل پتہ استعمال کریں۔"
+      blocked: "کی اجازت نہیں ہے۔"
+      revoked: "%{date} تک '%{email}' کو ای میل نہیں بھیجیں گے۔"
+    ip_address:
+      blocked: "آپ کے آئی پی ایڈریس سے نئی رجسٹریشنوں کی اجازت نہیں ہے۔"
+      max_new_accounts_per_registration_ip: "آپ کے آئی پی ایڈریس سے نئی رجسٹریشنوں کی اجازت نہیں ہے (زیادہ سے زیادہ حد تک پہنچ گئے)۔ ایک سٹاف ممبر سے رابطہ کریں۔"
+    website:
+      domain_not_allowed: "ویب سائٹ غلط ہے۔ اجازت یافتہ ڈومَینز ہیں: %{domains}"
+    auto_rejected: "عمر کی وجہ سے خود کار طریقہ سے رد کر دیا گیا۔ دیکھیے auto_handle_queued_age سائٹ ترتیب۔"
+    destroy_reasons:
+      unused_staged_user: "غیر استعمال شدہ سٹَیجڈ صارف"
+      fixed_primary_email: "سٹَیجڈ صارف کیلئے بنیادی ای میل مقرر کر دیا گیا"
+      same_ip_address: "دوسرے صارفین کی طرح ایک ہی IP ایڈریس (%{ip_address})"
+  flags_reminder:
+    flags_were_submitted:
+      one: "فلَیگز 1 گھنٹے سے پہلے جمع کیے گئے تھے۔ [براہ مہربانی ان کا جائزہ لیں](/admin/flags)۔"
+      other: "فلَیگز %{count} گھنٹوں سے پہلے جمع کیے گئے تھے۔ [براہ مہربانی ان کا جائزہ لیں](/admin/flags)۔"
+    subject_template:
+      one: "نمٹائے جانے کا منتظر 1 فلَیگ"
+      other: "نمٹائے جانے کے منتظر %{count} فلَیگز"
+  unsubscribe_mailer:
+    title: "مَیلر غیر سَبسکرائب کریں"
+    subject_template: "تصدیق کریں کہ اب آپ %{site_title} سے ای میل اَپ ڈیٹس حاصل نہیں کرنا چاہتے ہیں"
+    text_body_template: |
+      کسی (ممکنہ طور پر آپ؟) نے %{site_domain_name} سے اِس ایڈریس پر ای میل اَپ ڈیٹس کو مزید نہ بھیجنے کا مطالبہ کیا۔
+      اگر آپ اس کی تصدیق کرنا چاہتے ہیں، تو براہ مہربانی اِس لنک پر کلِک کریں:
+
+      %{confirm_unsubscribe_link}
+
+
+      اگر آپ ای میل اَپ ڈیٹس موصول ہونا جاری رکھنا چاہتے ہیں، تو آپ اِس ای میل کو نظر انداز کر سکتے ہیں۔
+  invite_mailer:
+    title: "دعوتی مَیلر"
+    subject_template: "%{inviter_name} نے آپ کو %{site_domain_name} پر '%{topic_title}' پر دعوت دی"
+    text_body_template: |
+      %{inviter_name}  نے آپ کو ایک بحث پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+      اگر آپ دلچسپی رکھتے ہیں، تو نیچے دیے گئے لِنک پر کلِک کریں:
+
+      %{invite_link}
+  custom_invite_mailer:
+    title: "اپنی مرضی کا دعوتی مَیلر"
+    subject_template: "%{inviter_name} نے آپ کو %{site_domain_name} پر '%{topic_title}' پر دعوت دی"
+    text_body_template: |
+      %{inviter_name}  نے آپ کو ایک بحث پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+
+      اِس نوٹ کے ساتھ
+
+      > %{user_custom_message}
+
+      اگر آپ دلچسپی رکھتے ہیں، تو نیچے دیے گئے لِنک پر کلِک کریں:
+
+      %{invite_link}
+  invite_forum_mailer:
+    title: "دعوتی فورَم مَیلر"
+    subject_template: "%{inviter_name} نے آپ کو %{site_domain_name} میں شمولیت کیلئے دعوت دی"
+    text_body_template: |
+      %{inviter_name}  نے آپ کو شمولیت کیلئے دعوت دی
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      اگر آپ دلچسپی رکھتے ہیں، تو نیچے دیے گئے لِنک پر کلِک کریں:
+
+      %{invite_link}
+  custom_invite_forum_mailer:
+    title: "اپنی مرضی کا دعوتی فورَم مَیلر"
+    subject_template: "%{inviter_name} نے آپ کو %{site_domain_name} میں شمولیت کیلئے دعوت دی"
+    text_body_template: |
+      %{inviter_name} نے آپ کو شمولیت کیلئے دعوت دی
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      اِس نوٹ کے ساتھ
+
+      > %{user_custom_message}
+
+      اگر آپ دلچسپی رکھتے ہیں، تو نیچے دیے گئے لِنک پر کلِک کریں:
+
+      %{invite_link}
+  invite_password_instructions:
+    title: "دعوت پاسوَرڈ ہدایات"
+    subject_template: "اپنے %{site_name} اکاؤنٹ کیلئے پاسوَرڈ مقرر کریں"
+    text_body_template: |
+      %{site_name} کیلئے اپنا دعوت نامہ قبول کرنے کا شکریہ -- خوش آمدید!
+
+      ابھی پاسوَرڈ مقرر کرنے کیلئے اِس لِنک پر کلِک کریں:
+      %{base_url}/u/password-reset/%{email_token}
+
+      (اگر اوپر والے لِنک کی میعاد ختم ہو چکی ہو، تو اپنے ای میل پتہ سے لاگ اِن کرتے وقت "میں اپنا پاسوَرڈ بھول گیا" منتخب کریں۔)
+  download_backup_mailer:
+    title: "بَیک اَپ مَیلر ڈاؤن لوڈ کریں"
+    subject_template: "[%{email_prefix}] سائٹ بَیک اَپ ڈاؤن لوڈ"
+    text_body_template: |
+      یہ آپ کی طرف سے درخواست کردہ [سائٹ بَیک اَپ ڈاؤن لوڈ](%{backup_file_path}) ہے۔
+
+      ہم نے یہ ڈاؤن لوڈ لِنک سیکیورٹی وجوہات کی بناہ پر آپ کے تصدیق کردہ ای میل ایڈریس پر بھیجا ہے۔
+      مصدقہ
+      (اگر آپ نے اِس ڈاؤن لوڈ کی درخواست *نہیں* کی، تو آپ کو سنجیدگی سے فکرمند ہونا چاہئے -- کسی کے پاس آپ کی سائٹ تک اَیڈمِن رسائی حاصل ہے۔)
+    no_token: |
+      معذرت، یہ بَیک اَپ ڈاؤن لوڈ لِنک پہلے سے ہی استعمال کیا جا چکا یا اِس کی میعاد ختم ہو چکی ہے۔
+  admin_confirmation_mailer:
+    title: "ایڈمن کی توثیق"
+    subject_template: "[%{email_prefix}] نئے ایڈمن اکاؤنٹ کی توثیق کریں"
+    text_body_template: |
+      براہ مہربانی تصدیق کریں کہ آپ **%{target_username}** کو اپنے فورَم کے ایڈمِنِسٹریٹر کے طور پر شامل کرنا چاہتے ہیں۔
+
+      [ایڈمِنِسٹریٹر اکاؤنٹ کی تصدیق کریں](%{admin_confirm_url})
+  test_mailer:
+    title: "مَیلر ٹیسٹ کریں"
+    subject_template: "[%{email_prefix}] ای میل قابل ترسیل ہونے کا ٹیسٹ"
+    text_body_template: |
+      یہ اِس سے ایک ٹیسٹ ای میل ہے
+
+      [**%{base_url}**][0]
+
+      ای میل کا قابل ترسیل ہونا ترسیل پیچیدہ ہے۔ یہ چند اہم چیزیں ہیں جنہیں آپ کو پہلے چیک کرنا چاہیئے:
+
+      - اپنی سائٹ ترتیبات میں درست طریقے سے `نوٹیفکیشن ای میل` کیلئے from: ایڈریس مقرر کرنے کا *یقین* کر لیں۔ ** آپ کے بھیجے جانے والے ای میلز کے "from" ایڈریس میں درج کردہ ڈَومین وہ ڈَومین ہے جس کی بنیاد پر آپ کی ای میل کی تصدیق کی جائے گی**۔
+
+      - اپنے میل کلائنٹ میں ای میل کی رَا سورس دیکھنے کا طریقہ معلوم کر لیں، تاکہ آپ اہم سراگوں کیلئے ای میل ہیڈرز کی جانچ پڑتال کر سکیں۔ Gmail میں، ہر میل کے سب سے اوپر دائیں جانب ڈراپ-ڈاؤن مَینِیو میں یہ "show original" کی آپشن ہے۔
+
+      - **اہم:** کیا آپ کے ISP کے پاس، جن ڈومین ناموں اور IP ایڈریسوں سے آپ ای میل بھیجتے ہیں، اُن کے ساتھ منسلک کرنے کیلئے ریوَرس DNS ریکارڈ درج ہے؟ یہاں [اپنا ریوَرس PTR ریکارڈ ٹیسٹ کریں][2]۔ اگر آپ کا ISP مناسب ریورس DNS پوائنٹر ریکارڈ درج نہیں کرتا، تو اِس کا بہت کم امکان ہے کہ آپ کا کوئی بھی ای میل ارسال کیا جا سکے گا۔
+
+      - کیا آپ کے ڈومَین کا [SPF ریکارڈ][8] درست ہے؟ یہاں [اپنا SPF ریکارڈ چیک کریں][1]۔ نوٹ کریں کہ SPF ریکارڈ کی درست آفیشل ریکارڈ ٹائپ TXT ہے۔
+
+      - کیا آپ کے ڈومَین کا [DKIM ریکارڈ][3] درست ہے؟ یہ ای میل کے قابلِ ترسیل ہونے کو نمایاں طور پر بہتر بنائے گا۔ یہاں [اپنا DKIM ریکارڈ چیک کریں][7]۔
+
+      اگر آپ اپنا میل سرور چلاتے ہیں، تو اِس بات کا یقین کرنے کیلئے چیک کریں کہ آپ کے میل سرور کے IP [کسی بھی ای میل بلَیک لِسٹ پر موکود نہیں ہیں][4]۔ اِس بات کی بھی تصدیق کر لیں کہ یہ یقینی طور پر پوری طرح سے قوالیفائڈ ہَوسٹ نام بھیج رہا ہے جو اپنے HELO پیغام میں DNS پر ریزَولو ہوتا ہے۔ اگر ایسا نہ ہو، تو یہ آپ کا ای میل بہت سی میل سروِسوں کی طرف سے رد کیے جانے کا بائث بنے گا۔
+
+      - ہم آپ کو ذور کے ساتھ تجویز دیتے ہیں کہ آپ **[mail-tester.com][mt] پر ایک میل بھیجیں** اِس بات کا یقین کرنے کیلئے کہ اوپر سب صحیح طریقے سے کام کر رہا ہے۔
+
+      (*آسان* راستہ ہے کہ [SendGrid][sg]، [SparkPost][sp]، [Mailgun][mg] یا [Mailjet][mj]، پر ایک مفت اکاؤنٹ بنائیں جن پر سخی مفت میلنگ پلَین ہوتے ہیں اور چھوٹی کمیونٹیوں کیلئے ٹھیک ہیں۔ اگرچہ! آپ کو ابھی بھی اپنے DNS میں SPF اور DKIM ریکارڈ مقرر کرنے کی ضرورت ہوگی)
+
+      ہمیں امید ہے کہ آپ کو ای میل کے قابلِ ترسیل ہونے کا ٹیسٹ ٹھیک سے موصول ہو گیا ہو گا!
+
+      قسمت کامیاب کرے،
+
+      آپ کے [ڈِسکورس](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]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: http://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing
+      [mt]: http://www.mail-tester.com/
+  new_version_mailer:
+    title: "نیا ورژن مَیلر"
+    subject_template: "[%{email_prefix}] نیا ڈِسکورس ورژن، اَپ ڈیٹ دستیاب ہے"
+    text_body_template: |
+      ہُرے، [ڈِسکورس](http://www.discourse.org) کا ایک نیا ورژن دستیاب ہے!
+
+      آپ کا ورژن: %{installed_version}
+      نیا ورژن: **%{new_version}**
+
+      - ہمارے آسان ** [ایک-کلِک براؤزر اَپ گریڈ](%{base_url}/admin/upgrade)** کا استعمال کرتے ہوئے اَپ گریڈ کریں
+
+      - [ریلیز نوٹس](https://meta.discourse.org/tags/release-notes) میں ملاحظہ کریں کہ نیا کیا ہے یا [رَا گِٹ ہَب تبدیلیوں کا لاگ](https://github.com/discourse/discourse/commits/master) دیکھیں
+
+      ڈِسکورس کی خبر، بحث، اور مدد کیلئے [meta.discourse.org](https://meta.discourse.org) وِزِٹ کریں
+  new_version_mailer_with_notes:
+    title: "نوٹس کے ساتھ نیا ورژن مَیلر"
+    subject_template: "[%{email_prefix}] اَپ ڈیٹ دستیاب ہے"
+    text_body_template: |
+      ہُرے، [ڈِسکورس](http://www.discourse.org) کا ایک نیا ورژن دستیاب ہے!
+
+      آپ کا ورژن: %{installed_version}
+      نیا ورژن: **%{new_version}**
+
+      - ہمارے آسان ** [ایک-کلِک براؤزر اَپ گریڈ](%{base_url}/admin/upgrade)** کا استعمال کرتے ہوئے اَپ گریڈ کریں
+
+      - [ریلیز نوٹس](https://meta.discourse.org/tags/release-notes) میں ملاحظہ کریں کہ نیا کیا ہے یا [رَا گِٹ ہَب تبدیلیوں کا لاگ](https://github.com/discourse/discourse/commits/master) دیکھیں
+
+      ڈِسکورس کی خبر، بحث، اور مدد کیلئے [meta.discourse.org](https://meta.discourse.org) وِزِٹ کریں
+
+      ### ریلیز نوٹس
+
+      %{notes}
+  flag_reasons:
+    off_topic: "آپ کی پوسٹ کو **موضوع سے ہٹ کر** کے طور پر فلَیگ کیا گیا تھا: کمیونٹی سمجھتی ہے کہ یہ ٹاپک کیلئے اچھی فِٹ نہیں ہے، جیسا کہ عنوان اور پہلی پوسٹ کی طرف سے فی الحال بیان کیا گیا ہے۔"
+    inappropriate: "آپ کی پوسٹ کو **نامناسب** کے طور پر فلَیگ کیا گیا تھا: کمیونٹی سمجھتی ہے کہ یہ توہین آمیز، بدسلوکی، یا [ہماری کمیونٹی کے قواعد و ضوابط]() کی خلاف ورزی ہے۔"
+    spam: "آپ کی پوسٹ کو **سپَیم** کے طور پر فلَیگ کیا گیا تھا: کمیونٹی سمجھتی ہے کہ یہ ایک اشتہار ہے، ایسی چیز جو کہ بجائے توقع کے مطابق مفید یا موضوع سے متعلقہ ہونے، کے فطرت میں زیادہ تر پرَومَوشنل ہے۔"
+    notify_moderators: "آپ کی پوسٹ کو **ماڈریٹر کی توجہ کیلئے** فلَیگ کیا گیا تھا: کمیونٹی سمجھتی ہے کہ اِس پوسٹ میں کچھ ایسا ہے جس کیلئے سٹاف ممبر کی طرد سے دستی مداخلت کی ضرورت ہے۔"
+  flags_dispositions:
+    agreed: "ہمیں بتانے کیلئے شکریہ۔ ہم اتفاق کرتے ہیں کہ ایک مسئلہ موجود ہے اور ہم اِس سے نمٹ رہے ہیں۔"
+    agreed_and_deleted: "ہمیں بتانے کیلئے شکریہ۔ ہم اتفاق کرتے ہیں کہ ایک مسئلہ موجود ہے اور ہم نے پوسٹ ہٹا دی ہے۔"
+    disagreed: "ہمیں بتانے کیلئے شکریہ۔ ہم اِس سے نمٹ رہے ہیں۔"
+    deferred: "ہمیں بتانے کیلئے شکریہ۔ ہم اِس سے نمٹ رہے ہیں۔"
+    deferred_and_deleted: "ہمیں بتانے کیلئے شکریہ۔ ہم نے پوسٹ ہٹا دی ہے۔"
+  temporarily_closed_due_to_flags:
+    one: "یہ ٹاپک کمیونٹی فلَیگز کی بڑی تعداد کی وجہ سے 1 گھنٹے کیلئے عارضی طور پر بند کردیا گیا ہے۔"
+    other: "یہ ٹاپک کمیونٹی فلَیگز کی بڑی تعداد کی وجہ سے %{count} گھنٹوں کیلئے عارضی طور پر بند کردیا گیا ہے۔"
+  system_messages:
+    private_topic_title: "ٹاپک #%{id}"
+    contents_hidden: "اِس کے مواد کو دیکھنے کیلئے براہ کرم پوسٹ پر جائیں۔"
+    post_hidden:
+      title: "پوسٹ چھاپی دی گئی"
+      subject_template: "کمیونٹی فلَیگز کی وجہ سے پوسٹ چھاپی دی گئی"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ آپ کی پوسٹ چھپا دی گئی تھی۔
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        اِس پوسٹ کو چھپانے سے پہلے ایک سے زیادہ کمیونٹی ممبران نے اِسے فلَیگ کیا تھا، لہٰذا غور کریں کہ آپ اپنی پوسٹ میں کس طرح سے ترمیم کر سکتے ہیں کہ اُن کی رائے کی عکاسی ہو سکے۔ **آپ %{edit_delay} منٹ کے بعد اپنی پوسٹ میں ترمیم کرسکتے ہیں، اور یہ خود بخود غیر چھپی ہوئی ہو جائے گی۔**
+
+        تاہم، اگر پوسٹ ایک دوسری دفعہ کمیونٹی کی طرف سے چھپا دی جائے، تو سٹاف کی طرف سے اِس سے نمٹنے تک اِس کی پوشیدگی برقرار رہے گی۔
+
+        اضافی رہنمائی کیلئے، براہ کرم ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    post_hidden_again:
+      title: "پوسٹ دوبارہ چھاپی دی گئی"
+    usage_tips:
+      text_body_template: |
+        نئے صارف کے طور پر شروعات کرنے پر چند فوری تجاویز کیلئے، [اِس بلاگ پوسٹ کو دیکھیں](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)۔
+
+        جیسے جیسے کہ آپ یہاں شرکت کریں گے، ہم آپ کو جان پائیں گے، اور نئے صارف پر عارضی پابندیاں اٹھا دی جائیں گی۔ وقت کے ساتھ ساتھ آپ [ٹرسٹ لَیول](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) حاصل کر سکیں گے، جن میں اِس کمیونٹی کو مل کر مینیج کرنے کیلئے خصوصی صلاحیتیں شامل ہوں گی۔
+    welcome_user:
+      title: "خوش آمدید صارف"
+      subject_template: "%{site_name} پر خوش آمدید!"
+      text_body_template: |
+        %{site_name} میں شمولیت اختیار کرنے کیلئے شکریہ، اور خوش آمدید!
+
+        %{new_user_tips}
+
+        ہم ہر وقت [مہذب کمیونٹی رویہ](%{base_url}/guidelines) پر یقین رکھتے ہیں۔
+
+        اپنے قیام کا لطف اٹھائیں!
+    welcome_invite:
+      title: "خوش آمدید دعوت"
+      subject_template: "%{site_name} پر خوش آمدید!"
+      text_body_template: |
+        %{site_name} پر اپنے دعوت نامہ کو قبول کرنے کا شکریہ -- خوش آمدید!
+
+        - ہم نے آپ کیلئے یہ نیا اکاؤنٹ **%{username}** بنایا ہے۔ [اپنی صارف پروفائل][prefs] پر جا کر اپنا نام یا پاسوَرڈ تبدیل کریں۔
+
+        جب آپ لاگ اِن کریں، تو براہ کرم **اپنے اصل دعوت نامے والے ای میل ایڈریس کو استعمال کریں** — ورنہ ہم بتانے کے قابل نہیں ہوں گے کہ یہ آپ ہی ہیں!
+
+        %{new_user_tips}
+
+        ہم ہر وقت [مہذب کمیونٹی رویہ](%{base_url}/guidelines) پر یقین رکھتے ہیں۔
+
+        اپنے قیام کا لطف اٹھائیں!
+
+        [prefs]: %{user_preferences_url}
+    backup_succeeded:
+      title: "بیک اَپ کامیاب"
+      subject_template: "بیک اَپ کامیابی سے مکمل کر لیا گیا"
+      text_body_template: |
+        بیک اَپ کامیاب ہو گیا تھا۔
+
+        اپنا نیا بیک اَپ ڈاؤن لوڈ کرنے کیلئے [ایڈمن > بیک اَپ سیکشن](%{base_url}/admin/backups) ملاحظہ کریں۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    backup_failed:
+      title: "بیک اَپ ناکام"
+      subject_template: "بیک اَپ ناکام ہو گیا"
+      text_body_template: |
+        بیک اَپ ناکام ہو گیا ہے۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    restore_succeeded:
+      title: "رِیسٹور کامیاب"
+      subject_template: "رِیسٹور کامیابی سے مکمل ہو گیا"
+      text_body_template: |
+        رِیسٹور کامیاب ہو گیا تھا۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    restore_failed:
+      title: "رِیسٹور ناکام"
+      subject_template: "رِیسٹور ناکام ہو گیا"
+      text_body_template: |
+        رِیسٹور ناکام ہو گیا ہے۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    bulk_invite_succeeded:
+      title: "بَلک مدعو کامیاب"
+      subject_template: "بَلک صارف دعوت ناموں پر کامیابی سے عملدرآمد ہو گیا"
+      text_body_template: "آپ کے بَلک صارف دعوت نامے فائل پر عملدرآمد کر دیا گیا، %{sent} دعوتیں میل کر دی گئیں۔"
+    bulk_invite_failed:
+      title: "بَلک مدعو ناکام"
+      subject_template: "بَلک صارف دعوت ناموں پر خرابں کے ساتھ عملدرآمد ہو گیا"
+      text_body_template: |
+        آپ کے بَلک صارف دعوت نامے فائل پر عملدرآمد کر دیا گیا، %{sent} دعوتیں میل کر دی گئیں اور %{failed} خرابی(وں) کا سامنا کرنا پڑا۔
+
+        یہ لاگ ہے:
+
+        ```text
+        %{logs}
+        ```
+    csv_export_succeeded:
+      title: "CSV ایکسپورٹ کامیاب"
+      subject_template: "ڈَیٹا ایکسپورٹ مکمل"
+      text_body_template: |
+        آپ کا ڈَیٹا ایکسپورٹ کامیاب ہو گیا! :dvd:
+
+        <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
+
+        درجہ بالا ڈاؤن لوڈ لِنک 48 گھنٹے تک درست رہے گا۔
+
+        ڈَیٹا gzip آرکائیو کے طور پر کمپرَیسڈ کیا گیا ہے۔ اگر آپ کے کھولنے پر آرکائیو خود کو ایکسٹریکٹ نہیں کی لیتی، تو یہاں تجویز کردہ ٹولز استعمال کریں: http://www.gzip.org/#faq4
+    csv_export_failed:
+      title: "CSV ایکسپورٹ ناکام"
+      subject_template: "ڈَیٹا ایکسپورٹ ناکام ہو گئی"
+      text_body_template: "ہمیں افسوس ہے، لیکن آپ کا ڈَیٹا ایکسپورٹ ناکام ہوگیا ہے۔ برائے مہربانی لاگز چیک کریں یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔"
+    email_reject_insufficient_trust_level:
+      title: "ای میل مسترد ناکافی ٹرسٹ لَیول"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- ناکافی ٹرسٹ لَیول"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        اِس ای میل ایڈریس پر نئے ٹاپک شائع کرنے کیلئے آپ کے اکاؤنٹ کے پاس مطلوبہ ٹرسٹ لَیول نہیں ہے۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_user_not_found:
+      title: "ای میل مسترد صارف نہیں ملا"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- صارف نہیں ملا"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کا جواب ایک نامعلوم ای میل ایڈریس سے بھیجا گیا تھا۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_screened_email:
+      title: "ای میل مسترد سکرین کردہ ای میل"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- بلاک کردہ ای میل"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کا جواب ایک بلاک شدہ ای میل ایڈریس سے بھیجا گیا تھا۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_not_allowed_email:
+      title: "ای میل مسترد غیر اجازت یافتہ ای میل"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- بلاک کردہ ای میل"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کا جواب ایک بلاک شدہ ای میل ایڈریس سے بھیجا گیا تھا۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_inactive_user:
+      title: "ای میل مسترد غیر فعال صارف"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غیر فعال صارف"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        اِس ای میل ایڈریس سے منسلک آپ کا اکاؤنٹ چالو نہیں ہے۔ ای میل بھیجنے سے پہلے اپنے اکاؤنٹ کو فعال کریں۔
+    email_reject_silenced_user:
+      title: "ای میل مسترد خاموش کردہ صارف"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- خاموش کردہ صارف"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        اِس ای میل ایڈریس سے منسلک آپ کا اکاؤنٹ خاموش کر دیا گیا ہے۔
+    email_reject_reply_user_not_matching:
+      title: "ای میل مسترد صارف مَیچ نہیں کرتا"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غیر متوقع ایڈریس سے جواب"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کا جواب ہماری طرف سے متوقع ای میل ایڈریس کے علاوہ سے بھیجا گیا تھا، لہٰذا ہمیں یقین نہیں ہے کہ یہ وہی شخص ہے۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_no_account:
+      title: "ای میل مسترد اکاؤنٹ نہیں"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم اکاؤنٹ"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        ہم آپ کے ای میل ایڈریس سے مَیچ کردہ کسی بھی اکاؤنٹ کو تلاش نہ کر سکے۔ کسی دوسرے ای میل ایڈریس سے بھیجنے کی کوشش کریں، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_empty:
+      title: "ای میل مسترد خالی"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- مواد نہیں"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        ہم آپ کے ای میل میں جواب کا کوئی بھی مواد تلاش نہ کر سکے۔
+
+        اگر آپ کو یہ موصول ہو رہا ہے اور آپ _نے_ جواب شامل کیا تھا، تو مزید سادہ فارمَیٹِنگ کے ساتھ دوبارہ کوشش کریں۔
+    email_reject_parsing:
+      title: "ای میل مسترد پارسِنگ"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- مواد نہیں سمجھا"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        ای میل میں ہم آپ کا جواب تلاش نہ کر سکے۔ **یقینی بنائیں کہ آپ کا جواب ای میل کے سب سے اوپر ہے** -- ہم اِن لائن جوابات پر عمل درامد نہیں کرسکتے ہیں۔
+    email_reject_invalid_access:
+      title: "ای میل مسترد غلط رسائی"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غلط رسائی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کے اکاؤنٹ کے پاس اس زُمرہ پر نئے ٹاپک شائع کرنے کی اجازت نہیں ہے۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_strangers_not_allowed:
+      title: "ای میل مسترد اجنبیوں کو اجازت نہیں"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غلط رسائی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        جس زُمرہ پر آپ نے یہ ای میل بھیجا ہے، وہ صرف درست اکاؤنٹ اور معلوم ای میل ایڈریس والے صارفین کے جوابات کی اجازت دیتا ہے۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_invalid_post:
+      title: "ای میل مسترد غلط پوسٹ"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- پوسٹ اشاعت میں خرابی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        چند ممکنہ وجوہات ہیں: پیچیدہ فارمَیٹِنگ، پیغام بہت بڑا، پیغام بہت چھوٹا۔ براہ کرم دوبارہ کوشش کریں، یا اگر یہ جاری رہے تو ویب سائٹ کے ذریعہ شائع کریں۔
+    email_reject_invalid_post_specified:
+      title: "ای میل مسترد غلط پوسٹ متعین کردہ"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- پوسٹ اشاعت میں خرابی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        وجہ:
+
+        %{post_error}
+
+        اگر آپ مسئلہ کو درست کر سکتے ہیں، تو براہ کرم دوبارہ کوشش کریں۔
+    email_reject_invalid_post_action:
+      title: "ای میل مسترد غلط پوسٹ اَیکشن"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- غلط پوسٹ اَیکشن"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        پوسٹ اَیکشن نامعلوم ہے۔ براہ کرم دوبارہ کوشش کریں، یا اگر یہ جاری رہے تو ویب سائٹ کے ذریعہ شائع کریں۔
+    email_reject_reply_key:
+      title: "ای میل مسترد جواب کلید"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم جواب کلید"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        ای میل میں جواب کی کلید غلط یا نامعلوم ہے، لہٰذا ہم اِس بات کا تعین نہیں کر سکتے کہ یہ ای میل کس کے جواب میں ہے۔ [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_bad_destination_address:
+      title: "ای میل مسترد غلط منزل ایڈریس"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم کیلئے ایڈریس"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        کوئی بھی منزل ای میل ایڈریس معلوم نہیں، یا ای میل میں Message-ID کے ہیڈر میں ترمیم کی گئی ہے۔ براہ کرم یقینی بنائیں کہ سٹاف کی طرف سے فراہم کردہ صحیح ای میل ایڈریس پر آپ بھیج رہے ہیں۔
+    email_reject_topic_not_found:
+      title: "ای میل مسترد ٹاپک نہیں ملا"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- ٹاپک نہیں ملا"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        جس ٹاپک پر آپ جواب دے رہے ہیں وہ اب موجود نہیں ہیں -- شاید یہ حذف کر دیا گیا تھا؟ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_topic_closed:
+      title: "ای میل مسترد ٹاپک بند"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- ٹاپک بند"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        جس ٹاپک پر آپ جواب دے رہے ہیں وہ فی الحال بند ہے اور اَب جوابات قبول نہیں کر رہا۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_auto_generated:
+      title: "ای میل مسترد خود بخود تخلیق کردہ"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- خود بخود تخلیق کردہ جواب"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کی ای میل "خود بخود تخلیق کردہ" کے طور پر نشان زد کی گئی تھی، جس کا مطلب یہ ہے کہ کسی انسان کی طرف سے ٹائپ ہونے کی بجائے اِسے کمپیوٹر کے ذریعہ خود کار طریقہ سے بنایا گیا ہے؛ ہم ایسی قِسم کی ای میلز کو قبول نہیں کرسکتے ہیں۔ اگر آپ سمجھتے ہیں کہ یہ ایک غلطی ہے، تو [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_reject_unrecognized_error:
+      title: "ای میل مسترد نامعلوم خرابی"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- نامعلوم خرابی"
+      text_body_template: |
+        ہمیں افسوس ہے، لیکن آپ کا %{destination} پر ای میل پیغام (عنوان %{former_title}) کام نہیں کیا۔
+
+        آپ کی ای میل پر عمل درامد کے دوران ایک نامعلوم خرابی کا سامنا کرنا پڑا اور وہ شائع نہیں ہوئی۔ آپ کو دوبارہ کوشش کرنی چاہئے، یا [ایک سٹاف ممبر سے رابطہ کریں](%{base_url}/about)۔
+    email_error_notification:
+      title: "ای میل مسترد اطلاع"
+      subject_template: "[%{email_prefix}] ای میل مسئلہ -- POP توثیق خرابی"
+      text_body_template: |
+        بدقسمتی سے، POP سرور سے میلز پولِنگ کرنے کے دوران ایک توثیقی خرابی کا سامنا کرنا پڑا۔
+
+        براہ مہربانی یقینی بنائیں کہ آپ نے [سائٹ ترتیبات](%{base_url}/admin/site_settings/category/email) میں POP اسناد کو ٹھیک طریقے سے ترتیب دیا ہے۔
+
+        اگر POP ای میل اکاؤنٹ کیلئے ویب UI موجود ہے، تو آپ کو ویب پر لاگ اِن کرنے اور اپنی ترتیبات کو وہاں چیک کرنے کی ضرورت پڑ سکتی ہے۔
+    too_many_spam_flags:
+      title: "بہت زیادہ سپَیم فلَیگز"
+      subject_template: "نیا اکاؤنٹ ہَولڈ پر"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ آپ کی پوسٹس عارضی طور پر چھپا دیا گیا ہے کیونکہ وہ کمیونٹی کی طرف سے فلَیگ کی گئی تھیں۔
+
+        احتیاطی تدابیر کے طور پر، آپ کا نیا اکاؤنٹ نئے جوابات یا ٹاپک تخلیق کرنے سے خاموش کر دیا گیا ہے جب تک کہ ایک سٹاف ممبر آپ کے اکاؤنٹ کا جائزہ لے سکے۔ ہم تکلیف کے لیے معذرت خواہ ہیں۔
+
+        اضافی رہنمائی کیلئے، براہ کرم ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    too_many_tl3_flags:
+      title: "بہت زیادہ ٹ.ل.3 فلَیگز"
+      subject_template: "نیا اکاؤنٹ ہَولڈ پر"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ بڑی تعداد میں کمیونٹی فلَیگز کی وجہ سے آپ کا اکاؤنٹ ہَولڈ پر رکھ دیا گیا ہے۔
+
+        احتیاطی تدابیر کے طور پر، آپ کا نیا اکاؤنٹ نئے جوابات یا ٹاپک تخلیق کرنے سے خاموش کر دیا گیا ہے جب تک کہ ایک سٹاف ممبر آپ کے اکاؤنٹ کا جائزہ لے سکے۔ ہم تکلیف کے لیے معذرت خواہ ہیں۔
+
+        اضافی رہنمائی کیلئے، براہ کرم ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    silenced_by_staff:
+      title: "سٹاف نے خاموش کیا"
+      subject_template: "اکاؤنٹ عارضی طور پر ہَولڈ پر"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے تاکہ آپ کو بتایا جاسکے کہ احتیاطی تدابیر کے طور پر آپ کا اکاؤنٹ عارضی طور پر ہَولڈ پر رکھ دیا گیا ہے۔
+
+        براہ مہربانی براؤز کرنا جاری رکھیں، لیکن آپ جواب یا ٹاپک تخلیق نہیں کر سکیں گے جب تک کوئی [سٹاف ممبر](%{base_url}/about) آپ کی سب سے حالیہ اشاعتوں کا جائزہ نہ لیلے۔ ہم تکلیف کے لیے معذرت خواہ ہیں۔
+
+        اضافی رہنمائی کیلئے، ہماری [کمیونٹی کی رہنما ہدایات](%{base_url}/guidelines) دیکھیے۔
+    user_automatically_silenced:
+      title: "صارف خود بخود خاموش کردہ"
+      subject_template: "نیا صارف %{username} کمیونٹی فلَیگز کے ذریعہ خاموش کر دیا گیا"
+      text_body_template: |
+        یہ ایک خودکار پیغام ہے۔
+
+        نیا صارف [%{username}](%{user_url}) خود کار طریقہ سے خاموش کر دیا گیا تھا کیونکہ کئی صارفین نے %{username} کی پوسٹ(س) کو فلَیگ کیا تھا۔
+
+        براہ مہربانی [فلَیگز کا جائزہ لیں](%{base_url}/admin/flags)۔ اگر %{username} کو اشاعت سے غلط خاموش کیا گیا تھا، تو اِس صارف کیلئے [ایڈمن صفحہ](%{user_url}) پر خاموشی ختم کر دینے والے بٹن پر کلِک کریں۔
+
+        اس حد کو بذریعہ `silence_new_user` سائٹ ترتیب کے تبدیل کیا جاسکتا ہے۔
+    spam_post_blocked:
+      title: "سپَیم پوسٹ بلاک کر دی گئی"
+      subject_template: "بار بار لِنکس کی وجہ سے نئے صارف %{username} کی پوسٹس کو بلاک کردیا گیا"
+      text_body_template: |
+        یہ ایک خودکار پیغام ہے۔
+
+        نئے صارف [%{username}](%{user_url}) نے %{domains} کے ساتھ لِنکس والی کئی پوسٹس بنانے کی کوشش کی، لیکن سپَیم سے بچنے کے لئے اُن پوسٹس کو بلاک کر دیا گیا تھا۔ صارف اب بھی نئی پوسٹس بنا سکتا ہے جو %{domains} پر لِنک نہ کریں۔
+
+        براہ مہربانی [صارف کا جائزہ لیں](%{user_url})۔
+
+        یہ `newuser_spam_host_threshold` اور `white_listed_spam_host_domains` سائٹ ترتیب کے ذریعے تبدیل کیا جا سکتا ہے۔
+    unsilenced:
+      title: "خاموشی ختم"
+      subject_template: "اکاؤنٹ اَب ہولڈ پر نہیں ہے"
+      text_body_template: |
+        ہیلو،
+
+        یہ %{site_name} کی طرف سے ایک خود کار پیغام ہے آپ کو مطلع کرنے کیلئے کہ سٹاف کے جائزہ لینے کے بعد آپ کا اکاؤنٹ مزید ہَولڈ پر نہیں ہے۔
+
+        اَب آپ دوبارہ نئے جوابات اور ٹاپک بنا سکتے ہیں۔ آپ کے صبر کا شکریہ۔
+    pending_users_reminder:
+      title: "زیرِ اِلتواء صارفین کیلئے یاد دہانی"
+      subject_template:
+        one: "1 صارف منظوری کا منتظر ہے"
+        other: "%{count} صارفین منظوری کے منتظر ہیں"
+      text_body_template: |
+        اِس فورم تک رسائی حاصل کرنے سے پہلے نئے صارف سائن اَپ منظور (یا مسترد) ہونے کے منتظر ہیں۔
+        [براہ مہربانی اَیڈمن سیکشن میں اُن کا جائزہ لیں](%{base_url}/admin/users/list/pending)۔
+    download_remote_images_disabled:
+      title: "ریمَوٹ تصاویر کے ڈاؤن لوڈ غیر فعال"
+      subject_template: "ریمَوٹ تصاویر کے ڈاؤن لوڈ کو غیر فعال کر دیا گیا ہے"
+      text_body_template: "`download_remote_images_to_local` ترتیب غیر فعال کر دی گئی تھی کیونکہ` download_remote_images_threshold` پر ڈِسک میں جگہ کی حد تک پہنچ گئے تھے۔"
+    dashboard_problems:
+      title: "ڈَیش بورڈ مسائل"
+      subject_template: "مسائل پائے گئے ہیں"
+      text_body_template: |
+        آپ کے اَیڈمن ڈَیش بورڈ پر کچھ مسائل کی اطلاع دی جا رہی ہے۔
+
+        [براہ مہربانی اُن کا جائزہ لیں اور اُنہیں حل کریں](%{base_url}/admin)۔
+    new_user_of_the_month:
+      title: "مہینہ کے سب سے زیادہ قابل قدر نئے صارف!"
+      subject_template: "آپ مہینہ کے سب سے زیادہ قابل قدر نئے صارف ہیں!"
+      text_body_template: |
+        مبارک ہو، آپ نے **%{month_year} کیلئے مہینہ کے سب سے زیادہ قابل قدر نئے صارف ایوارڈ** حاصل کر لیا ہے۔ :trophy:
+
+        یہ اعزاز صرف ایک ماہ میں دو نئے صارفین کو دیا جاتا ہے، اور یہ [بَیجز صفحہ](%{url}) پر مستقل طور پر نظر آئے گا۔
+
+        آپ تیزی سے ہماری کمیونٹی کے قابل قدر رکن بن گئے ہیں۔ شامل ہونے کیلئے شکریہ، اور اپنا اچھا کام جاری رکھیں!
+    queued_posts_reminder:
+      title: "قطار شدہ پوسٹس یاد دہانی"
+      subject_template:
+        one: "جائزہ لیے جانے کی منتظر 1 پوسٹ"
+        other: "جائزہ لیے جانے کی منتظر %{count} پوسٹس"
+      text_body_template: |
+        ہیلو،
+
+        نئے صارفین کی پوسٹس کو ماڈرَیشَن کیلئے ہَولڈ پر رکھا گیا اور فی الحال جائزہ لیے جانے کے انتظار میں ہیں۔ [اُن کو منظور یا مسترد یہاں کریں](%{base_url}/queued-posts)۔
+  unsubscribe_link: |
+    اِن ای میلز سے غیر سَبسکرائب کرنے کیلئے، [یہاں کلِک کریں](%{unsubscribe_url})۔
+  unsubscribe_link_and_mail: |
+    اِن ای میلز سے غیر سَبسکرائب کرنے کیلئے، [یہاں کلِک کریں](%{unsubscribe_url})۔
+  unsubscribe_mailing_list: |
+    آپ کو یہ موصول ہو رہا ہے کیونکہ آپ نے مَیلنگ لِسٹ مَوڈ فعال کیا ہوا ہے۔
+
+    اِن ای میلز سے غیر سَبسکرائب کرنے کیلئے، [یہاں کلِک کریں](%{unsubscribe_url})۔
+  subject_re: "جواب:"
+  subject_pm: "[PM]"
+  user_notifications:
+    previous_discussion: "پچھلے جوابات"
+    reached_limit:
+      one: "جان لیں کہ: ہم روزانہ کی 1 ای میل بھیجتے ہیں۔ جو ممکنی روک دی گئی ہوں، اُن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور ہاں، مقبول ہونے کیلئے شکریہ!"
+      other: "جان لیں کہ: ہم روزانہ کی %{count} ای میل بھیجتے ہیں۔ جو ممکنی روک دی گئی ہوں، اُن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور ہاں، مقبول ہونے کیلئے شکریہ!"
+    in_reply_to: "کے جواب میں"
+    unsubscribe:
+      title: "غیر سَبسکرائب"
+      description: "اِن ای میلز کو موصول کرنے میں دلچسپی نہیں ہے؟ کوئی مسئلہ نہیں! فوری طور پر غیر سَبسکرائب کرنے کیلئے ذیل میں کلِک کریں:"
+    reply_by_email: "[ٹاپک وِزِٹ کریں](%{base_url}%{url}) یا جواب دینے کیلئے اس ای میل کا جواب دیں۔"
+    reply_by_email_pm: "[پیغام وِزِٹ کریں](%{base_url}%{url}) یا جواب دینے کیلئے اس ای میل کا جواب دیں۔"
+    only_reply_by_email: "جواب دینے کیلئے اس ای میل کا جواب دیں۔"
+    visit_link_to_respond: "جواب دینے کیلئے [ٹاپک وِزِٹ کریں](%{base_url}%{url})۔"
+    visit_link_to_respond_pm: "جواب دینے کیلئے [پیغام وِزِٹ کریں](%{base_url}%{url})۔"
+    posted_by: "%{post_date} کو %{username} نے پوسٹ کیا"
+    invited_group_to_private_message_body: |
+      %{inviter_name}  نے %{group_name} کو ایک پیغام پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+    invited_to_private_message_body: |
+      %{inviter_name}  نے آپ کو ایک پیغام پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+    invited_to_topic_body: |
+      %{inviter_name}  نے آپ کو ایک بحث پر مدعو کیا
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      پر
+
+      > %{site_title}-- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "صارف نے گروپ ذاتی پیغام میں مدعو کیا"
+      subject_template: "[%{email_prefix}]%{username} نے @%{group_name} کو پیغام '%{topic_title}' میں مدعو کیا"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm:
+      title: "صارف ذاتی پیغام میں مدعو"
+      subject_template: "[%{email_prefix}]%{username} نے آپ کو پیغام '%{topic_title}' میں مدعو کیا"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      title: "صارف ذاتی پیغام سٹَیجڈ میں مدعو"
+      subject_template: "[%{email_prefix}]%{username} نے آپ کو پیغام '%{topic_title}' میں مدعو کیا"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      title: "صارف ٹاپک میں مدعو"
+      subject_template: "[%{email_prefix}]%{username} نے آپ کو '%{topic_title}' میں مدعو کیا"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      title: "صارف کی طرف سے جواب دیا گیا"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      title: "صارف کی طرف سے جواب دیا گیا ذاتی پیغام"
+      subject_template: "[%{email_prefix}] [ذاتی پیغام] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_quoted:
+      title: "صارف کی طرف سے اقتباس کردہ"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_linked:
+      title: "صارف کی طرف سے لِنک کردہ"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned:
+      title: "صارف ذکر کیا گیا"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_group_mentioned:
+      title: "صارف گروپ ذکر کیا گیا"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted:
+      title: "صارف نے شائع کیا"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_watching_first_post:
+      title: "صارف نے پہلی پوسٹ پر نظر رکھی ہوئی ہے"
+      subject_template: "[%{email_prefix}]%{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      title: "صارف نے ذاتی پیغام شائع کیا"
+      subject_template: "[%{email_prefix}] [ذاتی پیغام] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      title: "صارف نے ذاتی پیغام سٹَیجڈ شائع کیا"
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+          %{message}
+    account_suspended:
+      title: "اکاؤنٹ معطل"
+      subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ معطل کر دیا گیا ہے"
+      text_body_template: |
+        آپ کو %{suspended_till} تک فورَم سے معطل کر دیا گیا ہے۔
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "اکاؤنٹ خاموش"
+      subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ خاموش کر دیا گیا ہے"
+      text_body_template: |
+        آپ کو %{silenced_till} تک فورَم سے خاموش کر دیا گیا ہے۔
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "اکاؤنٹ پہلے سے موجود"
+      subject_template: "[%{email_prefix}] اکاؤنٹ پہلے سے ہی موجود ہے"
+      text_body_template: |
+        آپ نے ابھی %{site_name} پر ایک اکاؤنٹ بنانے کی کوشش کی، یا ایک اکاؤنٹ کی ای میل کو %{email} پر تبدیل کرنے کی کوشش کی۔ تاہم، %{email} کیلئے ایک اکاؤنٹ پہلے سے ہی موجود ہے۔
+
+        اگر آپ کو اپنا پاسوَرڈ بھول گیا، تو [ابھی دوبارہ رِی سَیٹ کریں](%{base_url}/password-reset)۔
+
+        اگر آپ نے %{email} کیلئے اکاؤنٹ بنانے کی کوشش نہیں کی یا اپنا ای میل ایڈریس تبدیل کرنے کی، تو فکر مت کریں - آپ اِس پیغام کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        اگر آپ کے پاس کوئی سوال ہیں، تو [ہمارے دوستانہ سٹاف سے رابطہ کریں](%{base_url}/about)۔
+    account_second_factor_disabled:
+      title: "دو فیکٹر توثیق غیر فعال"
+      subject_template: "[%{email_prefix}] دو فیکٹر توثیق غیر فعال کردی گئی"
+      text_body_template: |
+        %{site_name} پر آپ کے اکاؤنٹ کیلئے دو فیکٹر توثیق غیر فعال کردی گئی ہے۔ اب آپ صرف اپنے پاسوَرڈ کے ساتھ لاگ اِن کرسکتے ہیں۔ ایک اضافی توثیقی کوڈ کی مزید ضرورت نہیں ہے۔
+
+        اگر آپ نے دو فیکٹر توثیق کو غیر فعال کرنے کا انتخاب نہیں کیا، تو کسی نے آپ کے اکاؤنٹ تک غیر مجاز رسائی حاصل کر لی ہے۔
+
+        اگر آپ کے پاس کوئی سوال ہیں، تو [ہمارے دوستانہ سٹاف سے رابطہ کریں](%{base_url}/about)۔
+    digest:
+      why: "آپ کے %{last_seen_at} کو آخری وِزِٹ کے بعد سے %{site_link} کا ایک مختصر خلاصہ"
+      since_last_visit: "آپ کے کو آخری وِزِٹ کے بعد سے"
+      new_topics: "نئے ٹاپک"
+      unread_messages: "غیر پڑھے پیغامات"
+      unread_notifications: "غیر پڑھی اطلاعات"
+      liked_received: "لائیکس موصول ہوے"
+      new_posts: "نئی پوسٹس"
+      new_users: "نئے صارفین"
+      popular_topics: "مقبول ٹاپک"
+      follow_topic: "اِس ٹاپک کی پیروی کریں"
+      join_the_discussion: "مزید پڑھیں "
+      popular_posts: "مقبول پوسٹس"
+      more_new: "آپ کیلئے نیا"
+      subject_template: "[%{email_prefix}] خلاصہ"
+      unsubscribe: "یہ خلاصہ %{site_link} کی طرف سے بھیجا جاتا ہے جب ہم نے کچھ دیر سے آپ کو نہیں دیکھا ہو۔ %{email_preferences_link} کو تبدیل کریں، یا غیر سَبسکرائب کرنے کیلئے %{unsubscribe_link}۔"
+      your_email_settings: "آپ کی ای میل ترتیبات"
+      click_here: "یہاں کلِک کریں"
+      from: "%{site_name} خلاصہ"
+      preheader: "آپ کے %{last_seen_at} کو آخری وِزِٹ کے بعد سے ایک مختصر خلاصہ"
+    forgot_password:
+      title: "پاسوَرڈ بھول گیا"
+      subject_template: "[%{email_prefix}] پاسوَرڈ ری سَیٹ"
+      text_body_template: |
+        کسی نے پر آپ کا پاسوَرڈ [%{site_name}](%{base_url}) رِی سَیٹ کرنے کیلئے کہا۔
+
+        اگر یہ آپ نہیں تھے، تو آپ اِس ای میل کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        نیا پاسوَرڈ منتخب کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "بذریعہ لِنک لاگ اِن کریں"
+      subject_template: "[%{email_prefix}] بذریعہ لِنک لاگ اِن کریں"
+      text_body_template: |
+        [%{site_name}](%{base_url}) پر لاگ اِن کرنے کیلئے آپ کا لِنک یہ ہے۔
+
+        اگر آپ نے اِس لِنک کی درخواست نہیں کی، تو آپ اِس ای میل کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        لاگ اِن کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/session/email-login/%{email_token}
+    set_password:
+      title: "پاسوَرڈ مقرر"
+      subject_template: "[%{email_prefix}] پاسوَرڈ مقرر کریں"
+      text_body_template: |
+        کسی نے [%{site_name}](%{base_url}) پر آپ کے اکاؤنٹ پر پاسوَرڈ مقرر کرنے کیلئے کہا۔ متبادل طور پر، آپ اِس تصدیق کردہ ای میل ایڈریس سے منسلک کسی بھی قابل آن لائن سروس (گُوگل، فَیس بُک، وغیرہ) کا استعمال کرتے ہوئے لاگ اِن کرسکتے ہیں۔
+
+        اگر آپ نے یہ درخواست نہیں کی، تو آپ اِس ای میل کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        پاسوَرڈ منتخب کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/password-reset/%{email_token}
+    admin_login:
+      title: "ایڈمن لاگ اِن"
+      subject_template: "[%{email_prefix}] لاگ اِن"
+      text_body_template: |
+        کسی نے [%{site_name}](%{base_url}) پر آپ کے اکاؤنٹ میں لاگ اِن کرنے کیلئے کہا۔
+
+        اگر آپ نے یہ درخواست نہیں کی، تو آپ اِس ای میل کو آرام سے نظر انداز کر سکتے ہیں۔
+
+        لاگ اِن کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/admin-login/%{email_token}
+    account_created:
+      title: "اکاؤنٹ تشکیل"
+      subject_template: "[%{email_prefix}] آپ کا نیا اکاؤنٹ"
+      text_body_template: |
+        %{site_name} پر آپ کیلئے ایک نیا اکاؤنٹ بنایا گیا تھا
+
+        نیا پاسوَرڈ منتخب کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/password-reset/%{email_token}
+    confirm_new_email:
+      title: "نئے ای میل کی تصدیق کریں"
+      subject_template: "[%{email_prefix}] اپنے نئے ای میل ایڈریس کی تصدیق کریں"
+      text_body_template: |
+        %{site_name} پر اپنے نئے ای میل ایڈریس کی تصدیق کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      title: "پرانی ای میل تصدیق"
+      subject_template: "[%{email_prefix}] اپنا موجودہ ای میل ایڈریس تصدیق کریں"
+      text_body_template: |
+        اِس سے پہلے کہ ہم آپ کا ای میل ایڈریس تبدیل کر سکیں، ہمیں آپ کے اِس بات کی تصدیق کرنے کی ضرورت ہے کہ آپ کنٹرول کرتے ہیں
+        موجودہ ای میل اکاؤنٹ۔ آپ کا یہ قدم مکمل کرنے کے بعد، ہم آپ کی طرف سے تصدیق کروائئں گے
+        نئے ای میل ایڈریس کی۔
+
+        %{site_name} پر اپنے موجودہ ای میل ایڈریس کی تصدیق کرنے کیلئے مندرجہ ذیل لِنک پر کلک کریں:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    notify_old_email:
+      title: "پرانا ای میل مطلع"
+      subject_template: "[%{email_prefix}] آپ کا ای میل ایڈریس تبدیل ہوگیا ہے"
+      text_body_template: |
+        یہ خود کار پیغام ہے کہ آپ کا ای میل ایڈریس
+        %{site_name} کیلئے تبدیل کر دیا گیا ہے۔ اگر یہ غلطی سے کیا گیا، تو براہ مہربانی رابطہ کریں
+        ایک سائٹ ایڈمِنِسٹریٹر سے۔
+
+        آپ کا ای میل ایڈریس جس پر تبدیل کردیا گیا ہے:
+
+        %{new_email}
+    signup_after_approval:
+      title: "سائن اَپ بعد از منظوری "
+      subject_template: "آپ کو %{site_name} پر منظور کر دیا گیا ہے!"
+      text_body_template: |
+        %{site_name} میں خوش آمدید!
+
+        ایک سٹاف ممبر نے %{site_name} پر آپ کے اکاؤنٹ کو منظور کیا۔
+
+        اَب آپ لاگ اِن کرکے اپنے نئے اکاؤنٹ تک رسائی حاصل کرسکتے ہیں:
+        %{base_url}
+
+        اگر اوپر والا لِنک کلک نہیں ہوتا ہو، تو اپنے ویب براؤزر کے ایڈریس بار میں کاپی اور پَیسٹ کرنے کی کوشش کریں۔
+
+        %{new_user_tips}
+
+        ہم ہر وقت [مہذب کمیونٹی رویہ](%{base_url}/guidelines) پر یقین رکھتے ہیں۔
+
+        اپنے قیام کا لطف اٹھائیں!
+    signup:
+      title: "سائن اَپ"
+      subject_template: "[%{email_prefix}] اپنے نئے اکاؤنٹ کی تصدیق کریں"
+      text_body_template: |
+        %{site_name} میں خوش آمدید!
+
+        اپنے نئے اکاؤنٹ کی تصدیق اور اُسے چالو کرنے کیلئے مندرجہ ذیل لِنک پر کلِک کریں:
+        %{base_url}/u/activate-account/%{email_token}
+
+        اگر اوپر والا لِنک کلک نہیں ہوتا ہو، تو اپنے ویب براؤزر کے ایڈریس بار میں کاپی اور پَیسٹ کرنے کی کوشش کریں۔
+  page_not_found:
+    title: "افوہ! وہ صفحہ موجود نہیں یا ذاتی ہے۔"
+    popular_topics: "مقبول"
+    recent_topics: "حالیہ"
+    see_more: "مذید"
+    search_title: "اِس سائٹ میں تلاش کریں"
+    search_google: "گُوگَل"
+  offline:
+    title: "اَیپ کو لوڈ نہیں کیا جا سکا"
+    offline_page_message: "لگتا ہے کہ آپ آف لائن ہیں! براہ مہربانی اپنا نیٹ وَرک کنکشن چیک کریں اور دوبارہ کوشش کیجیے۔"
+  login_required:
+    welcome_message: |
+      ## [%{title} پر خوش آمدید](#welcome)
+      ایک اکاؤنٹ کی ضرورت ہے۔ برائے مہربانی جاری رکھنے کیلئے ایک اکاؤنٹ بنائیں یا لاگ اِن کریں۔
+  terms_of_service:
+    title: "سروس کی شرائط"
+    signup_form_message: 'میں نے <a href="/tos" target="_blank">سروس کی شرائط</a> کو پڑھا اور قبول کر لیا ہے۔'
+  deleted: 'حذف کردہ'
+  image: "تصویر"
+  upload:
+    edit_reason: "تصاویر کی مقامی کاپیاں ڈاؤن لوڈ کریں"
+    unauthorized: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں اُس کی اجازت نہیں ہے (اجازت یافتہ ایکسٹینشنز: %{authorized_extensions})۔"
+    pasted_image_filename: "پَیسٹ کردہ تصویر"
+    store_failure: "صارف #%{user_id} کیلئے اَپ لوڈ #%{upload_id} سٹور کرنے میں ناکامی"
+    file_missing: "معذرت، اَپ لوڈ کرنے کیلئے آپ کو ایک فائل فراہم کرنا ضروری ہے۔"
+    empty: "معذرت، لیکن آپ کی فراہم کردہ فائل خالی ہے۔"
+    png_to_jpg_conversion_failure_message: "PNG سے JPG پر تبدیل کرتے وقت ایک خرابی کا سامنا کرنا پڑا۔"
+    attachments:
+      too_large: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں وہ بہت بڑی ہے (زیادہ سے زیادہ سائز %{max_size_kb} KB ہے)۔"
+    images:
+      too_large: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں وہ بہت بڑی ہے (زیادہ سے زیادہ سائز %{max_size_kb} KB ہے)، براہ کرم اِس کا سائز تبدیل کریں اور دوبارہ کوشش کریں۔"
+      larger_than_x_megapixels: "معذرت، جو فائل آپ اَپ لوڈ کرنے کے کوشش کر رہے ہیں وہ بہت بڑی ہے (زیادہ سے زیادہ طول و عرض %{max_image_megapixels}-مَیگا پِکسل ہے)، براہ کرم اِس کا سائز تبدیل کریں اور دوبارہ کوشش کریں۔"
+      size_not_found: "معذرت، لیکن ہم تصویر کا سائز جان نہیں سکے۔ شاید آپ کی تصویر خراب ہے؟"
+    placeholders:
+      too_large: "(%{max_size_kb}KB سے بڑی تصویر)"
+  avatar:
+    missing: "معذرت، ہم اس ای میل ایڈریس سے منسلک کوئی اوتار تلاش نہیں کر سکے۔ کیا آپ اُسے دوبارہ اَپ لوڈ کرنے کی کوشش کر سکتے ہیں؟"
+  flag_reason:
+    sockpuppet: "ایک نئے صارف نے ایک ٹاپک بنایا، اور اُسی IP ایڈریس (%{ip_address}) پر ایک نئے صارف نے جواب دیا۔ `flag_sockpuppets` سائٹ ترتیب دیکھیے۔"
+    spam_hosts: "اِس نئے صارف ایک ہی ڈومَین (%{domain}) کے لِنکس کے ساتھ کئی پوسٹس تخلیق کرنے کی کوشش کی۔ <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> سائٹ کی ترتیب دیکھیے۔"
+  email_log:
+    post_user_deleted: "پوسٹ کا صارف حذف کردیا گیا ہے۔"
+    no_user: "آئی ڈی %{user_id} کے ساتھ صارف کو تلاش نہیں کیا جا سکا"
+    anonymous_user: "صارف گمنام ہے"
+    suspended_not_pm: "صارف معطل ہے، پیغام نہیں ہے"
+    seen_recently: "صارف کو حال ہی میں دیکھا گیا تھا"
+    post_not_found: "آئی ڈی %{post_id} کے ساتھ پوسٹ کو تلاش نہیں کیا جا سکا"
+    notification_already_read: "یہ ای میل جس اطلاع کے بارے میں ہے، وہ پہلے ہی پڑھ لی گئی ہے"
+    topic_nil: "پوسٹ.ٹاپک نِل ہے"
+    post_deleted: "پوسٹ مصنف کی طرف سے حذف کر دی گئی"
+    user_suspended: "صارف معطل کردیا گیا تھا"
+    already_read: "صارف نے اِس پوسٹ کو پہلے ہی پڑھ لیا ہے"
+    exceeded_emails_limit: "max_emails_per_day_per_user سے تجاوز کر گیا"
+    exceeded_bounces_limit: "bounce_score_threshold سے تجاوز کر گیا"
+    message_blank: "پیغام خالی ہے"
+    message_to_blank: "پیغام.کیلئے خالی ہے"
+    text_part_body_blank: "text_part.body خالی ہے"
+    body_blank: "متن خالی ہے"
+    no_echo_mailing_list_mode: "صارف کی اپنے پوسٹس کیلئے مَیلنگ لِسٹ اطلاعات غیر فعال ہیں"
+  color_schemes:
+    base_theme_name: "بَیس"
+    default: "لائٹ سکیم"
+    dark: "ڈارک سکیم"
+    default_theme_name: "ڈِیفالٹ"
+    dark_theme_name: "ڈارک"
+    light_theme_name: "لائٹ"
+  about: "بارے میں"
+  guidelines: "ہدایات"
+  privacy: "پرائیوِیسی"
+  edit_this_page: " اِس صفحہ میں ترمیم کریں"
+  csv_export:
+    boolean_yes: "جی ہاں"
+    boolean_no: "نہیں "
+  static_topic_first_reply: |
+    %{page_name} صفحے کے مواد کو تبدیل کرنے کیلئے اس ٹاپک میں پہلی پوسٹ میں ترمیم کریں۔
+  guidelines_topic:
+    title: "عمومی سوالات کے جوابات / ہدایات"
+    body: |
+      <a name="civilized"></a>
+
+      ## [یہ عوامی بحث مباحثے کیلئے ایک مہذب جگہ ہے](#civilized)
+
+      براہ مہربانی اِس مبابحثے کے فورم پر اُسی احترام سے پیش آئیں جس سے آپ ایک پبلک پارک میں پیش آتے ہیں۔ ہم، بھی، ایک مشترکہ کمیونٹی وسائل ہیں &mdash; اور جاری گفتگو کے ذریعہ مہارتیں، علم اور دلچسپیوں کے اشتراک کی ایک جگہ۔
+
+      یہ پتھر میں لکھے گئے قواعد نہیں ہیں، صرف ہماری کمیونٹی میں کیے جانے والے انسانی فیصلوں کو مدد دینے کیلئے ہدایات اور یہاں مہذب عوامی گفتگو کیلئے ایک صاف اور اچھی طرح سے روشن جگہ محفوض رکھنے کیلئے۔
+
+      <a name="improve"></a>
+
+      ## [بحث کو بہتر بنایے](#improve)
+
+      بحثوں میں بہتری لانے کیلئے ہمیشہ کام، چاہے وہ کتنا ہی چھوٹا کیوں نہ ہو، کر کے ہمیں اِسے مباحثوں کیلئے ایک عظیم جگہ بنانے میں مدد دیں۔ اگر آپ کو یقین نہیں ہے کہ آپ کای اشاعت گفتگو میں کچھ اضافہ کرتی ہے، تو اِس پر غور کریں کہ آپ کیا کہنا چاہتے ہیں اور بعد میں دوبارہ کوشش کیجیے۔
+
+      یہاں پر بحث کیے گئے موضوعات ہمارے لیے اہم ہیں، اور ہم چاہتے ہیں کہ وہ آپ کیلئے بھی اہم ہوں۔ اِن موضوعات اور ان پر بحث کرنے والوں کا احترام کیجیے، یہاں تک کہ اگر جو کچھ کہا جا رہا ہے آپ اُس سے اتفاق نہ بھی کرتے ہوں، تب بھی۔
+
+      بحث کو بہتر بنانے کا ایک طریقہ یہ ہے کہ پہلے سے ہوئے جانے والے مباحثوں کو دریافت کریں۔ اپنا جواب دینے یا نیا ٹاپک شروع کرنے سے پہلے یہاں کے ٹاپکس کا ایک جائیزہ لیں، اور پھر آپ کو اپنے آپ سے ملتی جلتی دلچسپی والوں سے ملنے کا بہتر موقع ملے گا۔
+
+      <a name="agreeable"></a>
+
+      ## [خوشگواررہیں، جب آپ متفق نہ بھی ہوں، تب بھی](#agreeable)
+
+      آپ کسی چیز کا جواب اپنے غیر متفق ہونے کا اظہار کر کے دینا چاہ سکتے ہیں۔ یہ ٹھیک ہے۔ لیکن _خیالات پر تنقید، نہ کہ لوگوں پر_ کرنا یاد رکھیے گا۔ براہ مہربانی بچیں:
+
+      * نام پکارنا
+      * ذات پر حملے
+      * کسی اشاعت کے اصلی مواد کے بجائے اُس کے لب و لہجه کا جواب دینا
+      * جَلد جذباتی تضاد
+
+      اس کے بجائے، معقول جوابی دلائل فراہم کریں جو گفتگو کو بہتر بنائے۔
+
+      <a name="participate"></a>
+
+      ## [آپ کی شرکت سے فرق پڑتا ہے](#participate)
+
+      ہمارے ہیاں مکالمات ہر نئے آنے والے کیلئے لب و لہجه مقرر کرتے ہیں۔ ہمیں اِس کمیونٹی کے مستقبل پر اثر انداز ہونے میں مدد کرنے کیلئے اُن مباحثوں میں مشغول ہونے کا انتخاب کریں جو اِس فورم کو ایک دلچسپ جگہ بناتے ہیں &mdash; اور اُن سے دور رہیے جو ایسا نہیں کرتے۔
+
+      ڈِسکورس ایسے ٹولز فراہم کرتا ہے جو کمیونٹی کو مجموعی طور پر بہترین (اور بدترین) شراکت داروں کی نشاندہی کرنے دیتی ہیں: بُک مارکس، لائیکس، فلَیگز، جوابات، ترامیم، اور اِس طرح دیگر۔ اپنے، اور سبھی دوسروں کے بھی، تجربے کو بہتر بنانے کیلئے اِن ٹولز کا استعمال کریں۔
+
+      چلیے ہم اپنی کمیونٹی کو بہتر بنا کر چھوڑیں۔
+
+      <a name="flag-problems"></a>
+
+      ## [اگر آپ کوئی مسئلہ دیکھیں، تو اُسے فلَیگ کریں](#flag-problems)
+
+      ماڈریٹرز کو خصوصی اختیار حاصل ہیں؛ وہ اِس فورم کیلئے ذمہ دار ہیں۔ لیکن پھر آپ بھی ہیں۔ آپ کی مدد سے، ماڈریٹرز نہ کہ صرف صفائی کرنے والے یا پولیس بلکہ کمیونٹی سہولت کار بھی بن سکتے ہیں۔
+
+      جب آپ بد سلوکی دیکھیں تو جواب مت دیں۔ اِس کو تسلیم کرنے سے برے سلوک کی حوصلہ افزائی ہوتی ہے، اپنی توانائی استعمال ہوتی ہے، اور ہر کسی کا وقت ضائع ہوتا ہے۔ _ بس فلَیگ کریں_۔ اگر کافی فلَیگز جمع ہو جائیں، تو خود بخود یا بذریعہ ماڈریٹر مداخلت، کارروائی کر دی جائے گی۔
+
+      ہماری کمیونٹی کو برقرار رکھنے کیلئے، ماڈریٹرز کسی بھی وقت کسی بھی وجہ سے کسی بھی مواد اور کسی بھی صارف کے اکاؤنٹ کو ہٹانے کا حق محفوظ رکھتے ہیں۔ ماڈریٹرز نئی اشاعتوں کو پیشگی نہیں دیکھتے؛ ماڈریٹرز اور سائٹ کے آپرَیٹرز کمیونٹی کی طرف سے شائع کردہ مواد کیلئے کوئی ذمہ داری نہیں رکھتے۔
+
+      <a name="be-civil"></a>
+
+      ## [ہمیشہ مہذب رہیے](#be-civil)
+
+      کچھ بھی ایک صحت مند بحث کو ایسے نقصان نہیں پہنچاتا جیسے بد سلوکی پہنچاتی ہے:
+
+      * مہذب رہیے۔ کبھی ایسا کچھ نہ شائع کریں جو ایک مناسب شخص جارحانہ، غیر مہذب، یا نفرت بھری تقریر سمجھے۔
+      * اِسے صاف رکھیے۔ کسی بھی فحش یا جنسی طور پر واضح چیز شائع نہ کریں۔
+      * ایک دوسرے کی عزت کریں۔ کسی کو ہراساں یا غمگین، لوگوں کی نقالی، یا اُن کی ذاتی معلومات افشاں نہ کریں۔
+      * ہمارے فَورم کا احترام کریں۔ سپَیم شائع نہ کریں یا دوسری صورت میں فورم کو وَینڈَلِائز نہ کریں۔
+
+      یہ عین مطابق تعریفوں کے ساتھ ٹھوس الفاظ نہیں ہیں &mdash; اِن چیزوں میں سے کسی ایک کے جیسا _دِکھنے_ سے بھی بچیں۔ اگر آپ کو یقین نہیں ہے، تو اپنے آپ سے پوچھیں کہ آپ کیسا محسوس کریں گے اگر آپ کی پوسٹ نیویارک ٹائمز کے پہلے صفحہ پر نمایاں کی جائے۔
+
+      یہ ایک پبلک فورَم ہے، اور سرچ انجن اِن مباحثوں کو اِنڈَیکس کرتے ہیں۔ خاندان اور دوستوں کیلئے زبان، لِنکس، اور تصاویر صاف رکھیں۔
+
+      <a name="keep-tidy"></a>
+
+      ## [اِسے صاف رکھیے](#keep-tidy)
+
+      چیزوں کو صحیح جگہ پر رکھنے کی کوشش کیا کریں، تاکہ ہم زیادہ وقت بحث مباحثے کرنے میں اور کم وقت صفائی کرنے میں صرف کر سکیں۔ اِس لیے:
+
+      * غلط زُمرہ میں ٹاپک شروع نہ کریں۔
+      * ایک ہی چیز کو متعدد ٹاپکس میں کراس-شائع نہ کریں۔
+      * بغیر مواد کے جوابات شائع نہ کریں،
+      * ٹاپک کو درمیان میں بدل کر اُس کا رُخ تبدیلیل نہ کریں۔
+      * اپنی اشاعتوں پر دستخط نہ کریں &mdash; ہر اشاعت پر آپ کی پروفائل معلومات منسلک ہوتی ہیں۔
+
+      "+1" یا "متفق" شائع کرنے کے بجائے، لائیک بٹن کا استعمال کریں۔ ایک موجودہ موضوع کو بنیادی طور پر مختلف سمت میں لے جانے کے بجائے، "منسلک ٹاپک کے طور پر جواب دیں" کا استعمال کریں۔
+
+      <a name="stealing"></a>
+
+      ## [صرف اپنے خود کی چیزیں شائع کریں](#stealing)
+
+      آپ اجازت کے بغیر ڈیجیٹل کچھ بھی شائع نہیں کرسکتے۔ آپ کسی کی بھی دانشورانہ ملکیت (سافٹ ویئر، ویڈیو، آڈیو، تصاویر)، کو چوری کرنے کے متعلقہ بیانات، لِنکس یا طریقوں کو شائع نہیں کر سکتے ہیں، اور نہ کسی دوسرے قانون کو توڑنے کے متعلقہ۔
+
+      <a name="power"></a>
+
+      ## [آپ کے مرہونِ مِنَّت](#power)
+
+      یہ سائٹ آپ کے [دوستانہ مقامی سٹاف](/about) اور *آپ*، یہاں کی کمیونٹی، کے ذریعہ چلائی جا رہی ہے۔ چیزوں کو یہاں کس طرح کام کرنا چاہئے کے بارے میں اگر آپ کے پاس مزید سوالات ہیں، تو [سائٹ آراء زُمرہ](/c/site-feedback) میں ایک نیا ٹاپک کھولیں اور چلیے گفتگو کریں! اگر کوئی اہم یا فوری مسئلہ درپیش ہے جو بذریعہ مَیٹا ٹاپک یا فلَیگ کے سنبھالا نہیں جاسکتا، تو [سٹاف صفحہ](/about) کے ذریعہ ہم سے رابطہ کریں۔
+
+      <a name="tos"></a>
+
+      ## [سروس کی شرائط](#tos)
+
+      جی ہاں، قانونی ابہام بَورِنگ ہوتے ہیں، لیکن ہمیں خود کی &ndash; اور توسیع کے طور پر، آپ اور آپ کے ڈیٹا &ndash; کی غیر دوستانہ افراد سے حفاظت کرنا لاذمی ہے۔ ہمارے پاس [سروس کی شرائط](/tos) ہے جو آپ کے (اور ہمارے) رویے اور مواد، پرائیوِیسی اور قوانین سے متعلقہ حقوق کی تفصیل بیان کرتا ہے۔ اِس سروس کو استعمال کرنے کیلئے، آپ کو ہماری [سروس شرائط](/tos) کی پابندی کرنا ہوگی۔
+  tos_topic:
+    title: "سروس کی شرائط"
+    body: |
+      مندرجہ ذیل شرائط و ضوابط  ویب سائٹ کے تمام استعمال، اور تمام متن، خدمات اور مصنوعات جو ویب سائٹ پر یا اِس کے ذریعہ دستیاب ہیں، بشمول، لیکن اِن تک محدود نہیں، %{company_domain} فورَم سافٹ ویئر، %{company_domain} سپورٹ فورَم اور %{company_domain} ہوسٹنگ سروس ("ہوسٹنگ")، (ملا کر لیا جائے، تو ویب سائٹ)۔ ویب سائٹ %{company_full_name} ("%{company_name}") کی ملکیت اور اس کی طرف سے چلائی جاتی ہے۔ ویب سائٹ آپ کی منظوری سے مشروط پیش کی جاتی ہے: بغیر کسی ترمیم کے یہاں پر موجود تمام شرائط و ضوابط اور تمام دیگر آپریٹنگ قوانین، پالیسیوں (بشمول، بغیر کسی حد کے، %{company_domain} کی [پرائیوِیسی پالیسی](/privacy) اور [کمیونٹی کے قواعد و ضوابط](/faq)) اور طریقہ کار جو اِس سائٹ پر %{company_name} کی طرف سے وقت بوقت شائع کیے جا سکتے ہیں (مجموعی طور پر، "معاہدہ")۔
+
+      ویب سائٹ تک رسائی یا اِس کا استعمال کرنے سے پہلے اِس معاہدہ کو احتیاط سے پڑھیں۔ ویب سائٹ کے کسی بھی حصے تک رسائی یا اِس کا استعمال کرنے سے، آپ اِس معاہدے کے شرائط و ضوابط کے پابند ہو جانے پر اتفاق کرتے ہیں۔ اگر آپ اس معاہدے کے تمام شرائط و ضوابط سے متفق نہیں ہیں، تو آپ ویب سائٹ تک رسائی حاصل یا کسی بھی خدمات کا استعمال نہیں کرسکتے ہیں۔ اگر یہ شرائط و ضوابط %{company_name} کی طرف سے ایک پیشکش سمجھی جاتی ہیں، تو قبولیت واضح طور پر اِن شرائط تک محدود ہے۔ ویب سائٹ صرف اُن افراد کیلئے دستیاب ہے جو کم از کم 13 سال کی عمر کے ہیں۔
+
+      <a name="1"></a>
+
+      ## [1۔ آپ کا %{company_domain} اکاؤنٹ](#1)
+
+      اگر آپ ویب سائٹ پر ایک اکاؤنٹ بناتے ہیں، تو آپ اپنے اکاؤنٹ کو محفوظ رکھنے کے ذمہ دار ہیں اور اِس اکاؤنٹ کے تحت ہونے والی تمام سرگرمیوں کیلئے آپ مکمل طور پر ذمہ دار ہیں۔ آپ کو اپنے اکاؤنٹ کے کسی غیر اجازت استعمال یا سیکورٹی کی کسی دوسری خلاف ورزیاں ہونے پر %{company_name} کو فوری طور پر مطلع کرنا ضروری ہے۔ آپ کی طرف سے کسی بھی کارروائی یا بھول چوک کا ذمہ دار %{company_name} نہیں ہو گا، بشمول اِس طرح کے اعمال یا بھول چوک کے نتیجے میں ہونے والے کسی بھی قسم کے نقصانات۔
+
+      <a name="2"></a>
+
+      ## [2۔ شراکت داروں کی ذمہ داری](#2)
+
+      اگر آپ ویب سائٹ پر مواد شائع کرتے ہیں، ویب سائٹ پر لِنکس شائع کرتے ہیں، یا دوسری صورت میں خود (یا کسی تیسرے فریق کو) ویب سائٹ کے ذریعہ مواد دستیاب کرتے ہیں (ایسا کوئی بھی مواد، "متن")، آپ مکمل طور پر ذمہ دار ہیں، اُس متن، کے مواد کیلئے اور اُس کے نتیجے میں کسی بھی نقصان کےکیلئے۔ معاملہ ایسا ہی ہے خواہ مواد ٹَیکسٹ، گرافکس، ایک آڈیو فائل، یا کمپیوٹر سافٹ ویئر کا حامل ہو۔ مواد دستیاب کرنے سے، آپ نمائندگی کرتے ہیں اور اِس کی ضمانت دیتے ہیں:
+
+      * مواد کا ڈاؤن لوڈ، کاپی اور استعمال کرنا ملکیت کے حقوق کی خلاف ورزی نہیں کرے گا، بشمول، لیکن اِن تک محدود نہیں، کسی بھی تیسری پارٹی کے، کاپی رائٹ، پَیٹنٹ، ٹریڈ مارک یا تجارتی رازوں کے حقوق؛
+      * اگر آپ کے آجر کے پاس آپ کی دانشورانہ ملکیت پر حق حاصل ہے، تو آپ نے یا تو (i) متن کو شائع کرنے یا اُسے دستیاب کرنے کیلئے اپنے آجر سے اجازت موصول کی ہوئی ہے، بشمول کسی بھی سافٹ ویئر لیکن اِس تک محدود نہیں، یا (ii) اپنے آجر سے متن میں یا اُس پر سے تمام حقوق کیلئے چھوٹ حاصل کر لی ہے؛
+      * آپ نے متن سے متعلق کسی بھی تیسرے فریق لائسنسوں کے ساتھ مکمل طور پر عمل کیا ہے، اور ضروری شرائط کو صارفین تک کامیابی سے منتقل کرنے کیلئے تمام ضروری چیزوں کو پورا کر لیا ہے؛
+      * کوئی بھی وائرس، وَورمز، میل ویئر، ٹروجن گھوڑے یا دیگر نقصان دہ یا تباہ کن مواد، متن میں شامل نہیں یا اِنہیں انسٹال نہیں کرتا؛
+      * متن سپَیم نہیں ہے، مشین یا رَینڈم طور پر پیدا نہیں کیا گیا ہے، اور اِس میں غیر اخلاقی یا ناپسندیدہ تجارتی مواد شامل نہیں ہے جن سے ٹریفک تیسری فریقین کی سائٹس پر بھیجی جائے یا تیسری فریقین سائٹس کی سرچ انجنوں پر درجہ بندی بہتر کی جائے، یا مزید غیر قانونی کارروائیوں کو بڑھانے کیلئے تیار کیا گیا ہے (جیسے کہ فیشِنگ) یا وصول کنندگان کو مواد کے ذریعہ کے بارے میں گمراہ کرتا ہے (جیسے کہ سپُوفِنگ)؛
+      * متن فحش نہیں ہے، دھمکیوں پر مشتمل نہیں ہے یا تشدد پر مشتعل نہیں کرتا، اور کسی بھی تیسری فریق کی پرائیوِیسی یا اشاعت کے حقوق کی خلاف ورزی نہیں کرتا؛
+      * آپ کا متن ناپسندیدہ الیکٹرانک پیغامات کے ذریعہ مشتہر نہیں کیا جا رہا جیسے کہ نیوز گروپوں، ای میل فہرستوں، بلاگز اور ویب سائٹس پر سپَیم لنکس، اور اِنہی طرح کے دوسرے بِن مانگے پروموشنل طریقوں کے ذریعہ؛
+      * آپ کے متن کو اِس طرح سے نام نہیں دیا گیا جس سے پڑھنے والے گمراہ ہو جائیں اور سمجھیں کہ آپ کوئی دوسرے شخص یا کمپنی ہیں؛ اور
+      * آپ نے، ایسے متن کے معاملے میں جس میں کمپیوٹر کَوڈ شامل ہو، درست طریقے سے درجہ بندی کیی گئی ہے اور/یا مواد کی قِسم، نوعیت، استعمالات اور اثرات بیان کیے ہیں، چاہے %{company_name} کی طرف سے ایسا کرنے کی درخواست کی گئی یا نہ کی گئی ہو۔
+
+      <a name="3"></a>
+
+      ## [3۔ صارف مواد لائسنس](#3)
+
+      صارف کی شراکتیں [کَرِی اَیٹِو کامنز اَیٹریبیوشن-غیر تجارتی-شئیر الائیک 3.0 اَن پورٹِڈ لائسنس](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US) کے طرز پر لائسنس شدہ ہیں۔ اِن نمائندوں یا وارنٹیوں میں سے کسی کو بھی محدود کیے بغیر، %{company_name} کے پاس حق (اگرچہ ذمہ داری نہیں) ہے کہ، %{company_name} کی واحد صوابدید پر (i) کسی بھی متن سے انکار یا اُس کو ہٹا دیا جائے کہ، %{company_name} کی مناسب رائے میں، %{company_name} کی کسی بھی پالیسی کی خلاف ورزی ہو رہی ہے یا کسی بھی طرح سے نقصان دہ یا قابل اعتراض ہے، یا (ii) کسی بھی فرد یا ادارے کیلئے کسی بھی وجوہات کی بنا پر ویب سائٹ تک رسائی یا اُس کے استعمال کو ختم یا اُس کا انکار کیا جا سکتا ہے، %{company_name} کی واحد صوابدید پر۔ کسی بھی پہلے سے ادا کی گئی رقم کی واپسی کی ذمہ داری %{company_name} پر نہیں ہوگی۔
+
+
+      <a name="4"></a>
+
+      ## [4۔ ادائیگی اور تجدید](#4)
+
+      ### جنرل شرائط
+
+      ویب سائٹ پر قیمت والی اختیاری خدمات یا اَپ گریڈ دستیاب ہوسکتے ہیں۔ ایک اختیاری قیمت والی خدمت یا اَپ گریڈ کا استعمال کرتے ہوئے، آپ ظاہر کی گئی ماہانہ یا سالانہ سبسکرِپشن فیس %{company_name} کو ادا کرنے کیلئے ااتفاق کرتے ہیں۔ ادائیگیاں پری-پَیڈ بنیاد پر وصول کی جائیں گی، جس دن آپ سروس یا اَپ گریڈ کا استعمال کرنا شروع کرتے ہیں اور ماہانہ یا سالانہ سبسکرِپشن مدت کے حساب سے جیسا کہ مطلع کیا گیا ہو۔ یہ فیسیں قابلِ واپسی نہیں ہیں۔
+
+      ### خود بخود تجدید
+
+      جب تک آپ قابل اطلاق سبسکرِپشن مدت کے اختتام سے پہلے %{company_name}کو مطلع نہیں کرتے کہ آپ کسی سروس یا اَپ گریڈ کو منسوخ کرنا چاہتے ہیں، آپ کی سبسکرپشن خود بخود تجدید کر دی جائے گی اور آپ ہمیں پھر قابل اطلاق سالانہ یا ماہانہ سبسکرپشن فیس (اس کے ساتھ ساتھ کسی بھی ٹیکس) کو، بذریعہ کریڈٹ کارڈ یا کسی اور ادائیگی کے طریقہ کے جو ہمارے پاس ریکارڈ پر موجود ہو، وصول کرنے کی اجازت دیتے ہیں۔ کسی بھی وقت سبسکرِپشنیں منسوخ کر دی جا سکتی ہیں۔
+
+      <a name="5"></a>
+
+      ## [5۔ خدمات](#5)
+
+      ### ہَوسٹِنگ، سپورٹ خدمات
+
+      %{company_name} کی طرف سے اختیاری ہَوسٹِنگ اور سپورٹ خدمات ہر ایسی ایک سروس کی الگ شرائط و ضوابط کے تحت فراہم کی جاسکتی ہیں۔ ہَوسٹِنگ/سپورٹ یا سپورٹ خدمات کے اکاؤنٹ کیلئے سائن اَپ کر کہ، آپ ایسی شرائط و ضوابط کی پابندی کرنے کیلئے اتفاق کرتے ہیں۔
+
+      ### HTTPS
+
+      ہم HTTPS ایک ادائیگی والے ایَڈ آن کے طور پر پیش کرتے ہیں۔ سائن اَپ کرنے اور %{company_domain} پر اپنی مرضی کا ڈَومَین استعمال کر کہ، آپ ہمیں آپ کی سائٹ پر HTTPS فراہم کرنے کے واحد مقصد کیلئے ڈَومَین نام رجسٹر کرنے والے کی جانب سے (مثال کے طور پر ضروری سرٹیفکیٹ کی درخواست کرنے کیلئے) عمل کرنے کی اجازت دیتے ہیں۔
+
+      ### اِنٹرپرائز
+
+      %{company_name} کی طرف سے انٹرپرائز ہَوسٹِنگ خدمات ہر ایسی ایک سروس کی الگ شرائط و ضوابط، جو کسٹمر مخصوص معاہدے سے متعین کی جاتی ہیں، کے تحت فراہم کی جاتی ہیں۔ ایک انٹرپرائز ہَوسٹِنگ اکاؤنٹ کیلئے سائن اَپ کر کہ، آپ ایسی شرائط و ضوابط کی پابندی کرنے کیلئے اتفاق کرتے ہیں۔
+
+      <a name="6"></a>
+
+      ## [6۔ ویب سائٹ کے زائرین کی ذمہ داری](#6)
+
+      %{company_name} نے جائزہ نہیں لیا ہے، اور نہ ہی لے سکتا ہے، ویب سائٹ پر شائع کیے جانے والے تمام مواد، سمیت کمپیوٹر سافٹ ویئر، اور لہٰذا اس مواد کے متن، استعمال یا اثرات کیلئے ذمہ دار نہیں ہوسکتا ہے۔ اِس ویب سائٹ کو چلانے سے، %{company_name} یہاں پر موجود مواد کی توثیق کرنے کی نمائندگی یا اشارہ نہیں کرتا، یا نہ اِس کا یقین ہے کہ یہ مواد درست، مفید یا غیر نقصان دہ ہے۔ اپنے آپ اور اپنے کمپیوٹر سسٹموں کو وائرس، وَورمز، ٹروجن گھوڑے یا دیگر نقصان دہ یا تباہ کن مواد سے بچانے کیلئے، احتیاطی تدابیر اختیار کرنے کے آپ خود ذمہ دار ہیں۔ ویب سائٹ میں ایسا مواد جو جارحانہ، نامناسب، یا دوسری صورت میں قابل اعتراض ہو، شامل ہوسکتا ہے، اور اِس کے ساتھ ساتھ مواد میں تکنیکی غلطیاں، ٹائپینگ کی غلطیاں، اور دیگر غلطیاں بھی شامل ہو سکتی ہیں۔ ویب سائٹ میں ایسا مواد بھی شامل ہو سکتا ہے جو پرائیوِیسی یا اشاعت کے حقوق کی خلاف ورزی کرتا ہو، یا دانشورانہ ملکیت اور دیگر ملکیت کے حقوق کی خلاف ورزی کرتا ہو، تیسرے فریقوں کے، یا جن کا ڈاؤن لوڈ، کاپی یا استعمال کرنا، بیان کردہ یا غیر بیان شدہ، اضافی شرائط و ضوابط کے تابع ہے۔ زائرین کی طرف سے ویب سائٹ کے استعمال، یا یہاں شائع کردہ مواد کے اِن افراد کی طرف سے کسی بھی ڈاؤن لوڈ کرنے سے ہونے والے کسی بھی نقصان سے %{company_name} ہر قِسم کی ذمہ داری سے دستبردار ہے۔
+
+      <a name="7"></a>
+
+      ## [7۔ دوسری ویب سائٹ پر شائع کردہ مواد](#7)
+
+      ہم نے جائزہ نہیں لیا ہے، اور نہ ہی لے سکتے ہیں، بذریعہ ویب سائٹس اور ویب صفحات کے دستیاب کردہ، سمیت کمپیوٹر سافٹ ویئر تمام مواد کا، جن کو %{company_domain} لِنک کرتا ہے اور جو %{company_domain} کو لِنک کرتے ہیں۔ اِن غیر-%{company_domain} ویب سائٹس اور ویب صفحات پر %{company_name} کا کوئی کنٹرول نہیں ہے، اور ان کے مواد یا ان کے استعمال کا ذمہ دار نہیں ہے۔ کسی غیر-%{company_domain} ویب سائٹ یا ویب پیج پر لِنک کر کے، %{company_name} ایسی ویب سائٹ یا ایسے ویب صفحہ کی نمائندگی یا توثیق کرنے کا اشارہ نہیں کرتا۔ اپنے آپ اور اپنے کمپیوٹر سسٹموں کو وائرس، وَورمز، ٹروجن گھوڑے یا دیگر نقصان دہ یا تباہ کن مواد سے بچانے کیلئے، احتیاطی تدابیر اختیار کرنے کے آپ خود ذمہ دار ہیں۔ غیر-%{company_domain} ویب سائٹس اور ویب صفحات کے استعمال کے نتیجے میں ہونے والے کسی بھی نقصان سے %{company_name} ہر قِسم کی ذمہ داری سے دستبردار ہے۔
+
+      <a name="8"></a>
+
+      ## [8۔ کاپی رائٹ خلاف ورزی اور DMCA پالیسی](#8)
+
+      جیسا کہ %{company_name} دوسروں کو اپنے دانشورانہ ملکیت کے حقوق کا احترام کرنے کیلئے کہتا ہے، اُسے طرح یہ دوسروں کے دانشورانہ ملکیت کے حقوق کا بھی احترام کرتا ہے۔ اگر آپ سمجھتے ہیں کہ %{company_domain} پر موجود یا لِنک کیے جانے والا مواد آپ کے کاپی رائٹ کی خلاف ورزی کرتا ہے، اور اگر یہ ویب سائٹ امریکہ میں رہتی ہے، تو آپ کو %{company_name} کی [ڈیجیٹل ملینیم کاپی رائٹ ایکٹ](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") پالیسی کے مطابق %{company_name} کو مطلع کرنا چاہئے۔ %{company_name} اِس طرح کے تمام نوٹسوں پر کارروائی کرے گا، بشمول جیسا کہ مطلوب یا مناسب ہو خلاف ورزی کرنے والے مواد کو ہٹانے یا اُس کے تمام لِنکس کو غیر فعال کر کہ۔ اگر، مناسب حالات میں، ایک وِزِیٹر کی طرف سے %{company_name} کے یا دوسروں کے کاپی رائٹ یا دیگر دانشورانہ ملکیت کے حقوق کی بار بار خلاف ورزی کرنے کا تعین کیا جاتا ہے تو %{company_name} اُس شخص کی ویب سائٹ تک رسائی اور اِس کا استعمال برطرف کر دے گا۔ ایسی برطرفی کی صورت میں، %{company_name} کو کسی بھی پہلے سے ادا کی گئی رقم کی واپسی کی ذمہ داری %{company_name} پر نہیں ہوگی۔
+
+      <a name="9"></a>
+
+      ## [9۔ دانشورانہ پراپرٹی](#9)
+
+      یہ معاہدہ آپ کو %{company_name} سے %{company_name} کی یا کسی تیسرے فریق کی دانشورانہ ملکیت منتقل نہیں کرتا ہے، اور اِس پراپرٹی میں اور پر تمام حق، ٹائیٹل اور انٹرسٹ (فریقین کے درمیان) صرف %{company_name} کا پاس ہی رہیں گے۔ %{company_name}، %{company_domain}، %{company_domain} کا لَوگَو، اور %{company_domain} یا ویب سائٹ کے ساتھ استعمال ہونے والے دیگر تمام ٹریڈ مارک، سروس کے نشان، گرافکس اور لَوگَو، %{company_name} یا %{company_name} کے لائسنس دینے والوں کے ٹریڈ مارک یا رجسٹرڈ ٹریڈ مارکس ہیں۔ ویب سائٹ کے ساتھ استعمال ہونے والے دیگر ٹریڈ مارک، سروس کے نشان، گرافکس اور لَوگَو دوسری تیسرے فریق کے ٹریڈ مارک ہو سکتے ہیں۔ آپ کا ویب سائٹ کا استعمال آپ کو کسی بھی %{company_name} یا تیسرے فریق کے ٹریڈ مارک کو دوبارہ بنانے یا استعمال کرنے کیلئے حق یا لائسنس فراہم نہیں کرتا ہے۔
+
+      <a name="10"></a>
+
+      ## [10۔ انتساب](#10)
+
+      %{company_name} آپ کے صفحے کے فوٹر میں '%{company_domain} کے مرہونِ مِنَّت'، تھِیم مصنف، اور فونٹ انتساب جیسے انتساب کے لِنکس کو ظاہر کرنے کا حق محفوظ رکھتا ہے۔
+
+      <a name="11"></a>
+
+      ## [11۔ تبدیلیاں](#11)
+
+      %{company_name} اِس معاہدے کے کسی بھی حصے میں ترمیم یا تبدیل کرنے کے، اپنی واحد صوابدید پر، حق محفوظ رکھتا ہے۔ یہ آپ کی ذمہ داری ہے کہ اس معاہدے کو باقاعدگی سے تبدیلیوں کیلئے چیک کرتے رہیں۔ اِس معاہدے میں کسی بھی تبدیلی کی اشاعت کے بعد، آپ کی طرف سے ویب سائٹ کا استعمال جاری رکھنا یا اُس تک رسائی حاصل کرنا، اِن تبدیلیوں کو قبول کرنے کے برابر ہے۔ %{company_name}، مستقبل میں، ویب سائٹ کے ذریعہ نئی خدمات اور/یا خصوصیات (بشمول، نئے ٹُولز اور وسائل کے تعارف کے) بھی پیش کر سکتا ہے۔ ایسی نئی خصوصیات اور/یا خدمات اس معاہدے کی شرائط و ضوابط کے تابع ہوں گی۔
+
+      <a name="12"></a>
+
+      ## [12۔ برطرفی](#12)
+
+      %{company_name}، کسی وجہ کے ساتھ یا اُس کے بغیر، کسی نوٹس کے ساتھ یا اُس کے بغیر، کسی بھی وقت پوری ویب سائٹ یا اُس کے کسی بھی خاص حصے تک آپ کی رسائی فوری طور پر موثر طریقے سے برطرف کر سکتا ہے۔ اگر آپ اِس معاہدے یا اپنے %{company_domain} اکاؤنٹ (اگر آپ کے پاس ہے تو) کو ختم کرنا چاہتے ہیں، آپ کو صرف ویب سائٹ کا استعمال کرنا بند کرنا ہو گا۔ اس معاہدے کی تمام شرائط جو اپنی فطرت میں برطرفی کے باوجود ختم نہیں ہونی چاہئیں، وہ بچ جائیں گی، بشمول بغیر کسی حد کے، ملکیت کی شرائط، وارنٹی کے ڈِسکلَیمر، ہرجانہ اور ذمہ داریوں کی حدیں۔
+
+      <a name="13"></a>
+
+      ## [13۔ وارنٹیوں کے ڈِسکلَیمر](#13)
+
+      ویب سائٹ "جیسے ہے ویسے ہی" کے طور پر فراہم کی جاتی ہے۔ %{company_name} اور اِس کے سپلائرز اور لائسنس دینے والے کسی بھی قِسم، اظہار یا اشارہ کی گئیں، بشمول، بغیر کسی حد کے، فروختگی کی ضمانتیں، کسی خاص مقصد کیلئے صحیح اور غیر خلاف ورزی کی تمام وارنٹیوں کا انکار کرتے ہیں۔ نہ %{company_name} اور نہ ہی اِس کے سپلائرز اور لائسنس دینے والے، اِس بات کی ضمانت دیتے ہیں کہ ویب سائٹ غلطی سے پاک ہو گی یا اِس تک رسائی مسلسل یا بلاتعطل رہے گی۔ اگر آپ واقعی یہ پڑھ رہے ہیں، تو یہ [ایک تحفہ] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html) ہے۔ آپ کو سمجھ ہے کہ آپ ویب سائٹ کے ذریعہ ڈاؤن لوڈ کرتے ہیں، یا مواد یا خدمات حاصل کرتے ہیں، اپنی صوابدید اور خطرے کے پر۔
+
+      <a name="14"></a>
+
+      ## [14۔ ذمہ داری کی حد](#14)
+
+      کسی بھی واقعہ پر %{company_name}، یا اِس کے سپلائرز اور لائسنس دینے والے، اِس معاہدے کے کسی بھی موضوع کے بارے میں کسی بھی معاہدے کے اندر، غفلت، سخت ذمہ داری یا دوسرے قانونی یا متوازن نظریہ کے تحت ذمہ دار نہیں ہوں گے: (i) کسی خاص، حادثاتی یا نتیجتاً نقصانات؛ (ii) متبادل مصنوعات یا خدمات کی خریداری کی قیمت؛ (iii) استعمال میں تعطلی یا ڈیٹا میں نقصان یا خرابی؛ یا (iv) کارروائی کے سبب سے پہلے بارہ (12) مہینے کے عرصے کے دوران اِس معاہدے کے تحت آپ کی طرف سے %{company_name} کو ادا کی گئیں فیسوں سے زیادہ کسی بھی رقم کیلئے۔ اُن کے مناسب کنٹرول سے باہر معاملات کی وجہ سے کسی بھی ناکامی یا تاخیر کیلئے %{company_domain} پر کوئی ذمہ داری نہیں ہوگی۔ پہلے آنے والا قابل اطلاق قانون کی طرف سے منع کیے جانے کی حد تک لاگو نہیں ہو گا۔
+
+      <a name="15"></a>
+
+      ## [15۔ جنرل نمائندگی اور وارنٹی](#15)
+
+      آپ نمائندگی کرتے ہیں اور اس بات کی ضمانت دیتے ہیں کہ (i) آپ کا ویب سائٹ کا استعمال %{company_name} کی [پرائیویسی پالیسی](/privacy)، [کمیونٹی کے قواعد و ضوابط](/guidelines)، اِس معاہدے کے ساتھ اور تمام قابل اطلاق قوانین اور قواعد و ضوابط (بشمول بغیر کسی حد کے آپ کے ملک، ریاست، شہر، یا دیگر سرکاری علاقے میں کسی بھی مقامی قوانین یا قواعد و ضوابط، آن لائن رویہ اور قابل قبول مواد کے بارے میں، اور ملک، جس میں یہ ویب سائٹ رہتی ہے یا جس میں آپ رہتے ہیں، سے برآمد کردہ تکنیکی ڈَیٹا کی منتقلی سے متعلقہ تمام قابل اطلاق قوانین سمیت) کے ساتھ سخت مطابقت رکھے گا اور (ii) آپ کی ویب سائٹ کا استعمال کسی بھی تیسرے فریق کی دانشورانہ ملکیت کے حقوق کی خلاف ورزی یا اُنہیں خورد برد نہیں کرے گا۔
+
+      <a name="16"></a>
+
+      ## [16۔ تلافی](#16)
+
+      تلافی کرنے اور %{company_name}، اِس کے ٹھیکیداروں، لائسنس دینے والوں کو، اور اِن کے متعلقہ ڈائریکٹرز، افسران، ملازمین اور ایجنٹوں کو تمام دعووں اور اخراجات، بشمول اٹارنیوں کی فیسیں، آپ کی ویب سائٹ کے استعمال سے پیدا ہونے والے، بشمول، لیکن اِس تک محدود نہیں، اِس معاہدے کی خلاف ورزی پر ہونے والے نقصانات کی ذمہ داری سے برطرف کرنے کیلئے آپ اتفاق کرتے ہیں۔
+
+      <a name="17"></a>
+
+      ## [17۔ متفرقہ](#17)
+
+      یہاں کے موضوع کے معاملہ میں یہ معاہدے %{company_name} اور آپ کے درمیان مکمل معاہدہ کو تشکیل دیتا ہے، اور وہ صرف %{company_name} کے ایک بااختیار اَیگزَیکِٹِو کی جانب سے دستخط کردہ ایک تحریری ترمیم، یا %{company_name} کی طرف سے شائع کیے جانے والے ایک رِیوائز کردہ ورژن کی طرف سے ترمیم کیا جا سکتا ہے۔ قابل اطلاق قانون کی حد کے علاوہ، اگر کوئی ہو، دوسری صورت میں فراہم کرتا ہے، یہ معاہدے، ویب سائٹ تک رسائی یا استعمال ریاستِ کَیلِیفَورنیا، یو ایس اے، کے قوانین کی مطابق ہو گا، قانون کے کانفلِکٹ دفعات کو چھوڑ کر، اور کسی بھی تنازعہ کیلئے مناسب مقام سان فرانسِسکَو کاؤنٹی، کَیلِیفَورنیا میں واقع ریاست اور وفاقی عدالتیں ہوں گی۔ امتناعی یا منصفانہ رَیلیف کے دعووں یا دانشورانہ ملکیت کے حقوق کے دعووں (جو کسی بھی قابل عدالت میں کسی بانڈ کی فراہمی کے بغیر لائے جا سکتے ہیں) کے علاوہ، اِس معاہدے کے تحت ہونے والے کسی بھی تنازعہ کو آخر میں جیوڈیشیل آربریٹَیشن اور مَیڈیشن سروس، انکارپوریٹڈ ("JAMS") کے جامع ثالثی قواعد کے مطابق، ایسے قواعد کے مطابق مقرر کردہ تین ثالثین کی طرف سے حل کیا جائے گا۔ ثالثی انگریزی زبان میں سان فرانسِسکَو، کَیلِیفَورنیا میں ہوگی اور کسی بھی عدالت میں فیصلہ نافذ کیا جاسکتا ہے۔ اس معاہدے کو نافذ کرنے کیلئے کسی بھی عمل یا کارروائی میں موجودہ فریق کو اخراجات اور وکلاء کی فیسوں کا حق حاصل ہوگا۔ اگر اس معاہدے کے کسی بھی حصہ کو غلط یا غیر قابلِ عمل متعین کیا جاتا ہے، تو یہ حصہ فریقین کے اصل ارادے کی عکاسی کرتے ہوئے کے طور پر سمجھا جائے گا، اور باقی حصے مکمل ذور اور اثر کے ساتھ رہیں گے۔ اِس معاہدے کی کسی بھی اصطلاح یا شرط کے کسی بھی فریق کی طرف سے، کسی ایک دفعہ کی چھوٹ، اِس طرح کی اصطلاح یا شرط کی اِس کے بعد اگلی خلاف ورزی کیلئے چھوٹ نہیں فراہم کرے گی۔ آپ اس معاہدے کے تحت اپنے حقوق کو کسی بھی فریق کو تفویض کرسکتے ہیں جو اِس کی شرائط و ضوابط کے ساتھ رضامندی، اور اُن پر پابند رہنے کیلئے اتفاق کریں؛ اِس معاہدے میں %{company_name} بغیر کسی شرط کے تحت اپنے حقوق کو تفویض کرسکتا ہے۔ یہ معاہدے فریقین، اُن کے جانشینوں اور اجازت یافتہ تفویض کنندہ پر پابندی اور اُن کے فائدہ کیلئے ہو گا۔
+
+      یہ دستاویز CC-BY-SA ہے۔ یہ آخری دفعہ جنوری 1، 2018 کو اَپ ڈیٹ کی گئی تھی۔
+
+      اصل میں [وَرڈپرَیس کی سروس کی شرائط](http://en.wordpress.com/tos/) سے اخذ کردہ۔
+  privacy_topic:
+    title: "پرائیوِیسی پالیسی"
+    body: |
+      <a name="collect"></a>
+
+      ## [ہم کیا معلومات جمع کرتے ہیں؟](#collect)
+
+      ہم آپ سے معلومات اکھٹی کرتے ہیں جب آپ ہماری ویب سائٹ پر رجسٹر کرتے ہیں اور ڈیٹا جمع کرتے ہیں جب آپ یہاں پر شئیر کردہ مواد کو پڑھ، لکھ، اور اس کا جائزہ لے کر اِس فورَم میں حصہ لیتے ہیں۔
+
+      ہماری سائٹ پر رجسٹر کرتے وقت، آپ سے اپنا نام اور ای میل پتہ درج کرنے کیلئے کہا جا سکتا ہے۔ تاہم، آپ رجسٹریشن کے بغیر ہماری سائٹ وِزِٹ کر سکتے ہیں۔ آپ کا ای میل ایڈریس کی تصدیق بذریعہ ایک منفرد لنک پر مشتمل ای میل سے ہوگی۔ اگر وہ لنک وِزِٹ کیا جاتا ہے، تو ہم جان جائیں گے کہ آپ اس ای میل ایڈریس کو کنٹرول کرتے ہیں۔
+
+      رجسٹر کرنے کے بعد کچھ شائع کرنے پر، ہم اشاعت کا تخلیق کنندہ IP ایڈریس ریکارڈ کر لیتے ہیں۔ ہم سرور لاگز کو بھی برقرار رکھ سکتے ہیں جس میں ہمارے سرور پر کیے جانے والی ہر درخواست کا IP ایڈریس شامل ہوتا ہے۔
+
+      <a name="use"></a>
+
+      ## [ہم آپ کی معلومات کس لیے استعمال کرتے ہیں؟](#use)
+
+      ہم آپ سے جمع کردہ کوئی بھی معلومات مندرجہ ذیل طریقوں میں سے ایک میں استعمال کر سکتے ہیں:
+
+      * آپ کے اِس سائٹ پر تجربے کو ذاتی بنانے کیلئے &mdash; آپ کی معلومات ہمیں آپ کی ذاتی ضروریات کو بہتر سمجھنے میں مدد دیتی ہے۔
+      * اِس سائٹ کو بہتر بنانے کیلئے &mdash; ہم مسلسل آپ کی طرف سے موصول ہونے والی معلومات اور آراء کی بنیاد پر سائٹ خصوصیات کو بہتر بنانے کی کوشش کرتے رہتے ہیں۔
+      * کسٹمر سروس کو بہتر بنانے کیلئے &mdash; آپ کی معلومات ہمیں کسٹمر سروس کی درخواستوں اور معاونت کی ضروریات کا زیادہ موثر طریقے سے جواب دینے میں ہماری مدد کرتی ہے۔
+      * ہر مخصوص مدت کے بعد ای میلز بھیجنے کیلئے &mdash; آپ کی طرف سے فراہم کردہ ای میل ایڈریس استعمال کیا جا سکتا ہے، آپ کو بھیجنے کیلئے: معلومات، اطلاعات جن کی آپ ٹاپکس میں تبدیلیاں ہونے پر، یا اپنے صارف نام کے جواب میں درخواست کرتے ہیں، انکوائریوں کے جواب کیلئے، اور/یا دیگر درخواستوں یا سوالات کا جواب دینے کیلئے۔
+
+      <a name="protect"></a>
+
+      ## [ہم آپ کی معلومات کی حفاظت کیسے کرتے ہیں؟](#protect)
+
+      جب آپ اپنی ذاتی معلومات درج، جمع، یا ایکسَیس کرتے ہیں تو ہم آپ کی ذاتی معلومات کو محفوظ رکھنے کیلئے مختلف قِسم کے سیکورٹی اقدامات کو لاگو کرتے ہیں۔
+
+      <a name="data-retention"></a>
+
+      ## [آپ کی ڈَیٹا برقرار رکھنے کی پالیسی کیا ہے؟](#data-retention)
+
+      ہم نیک نیتی کے ساتھ ممکنہ کوشش کریں گے کہ:
+
+      * اِس سرور پر کیے جانے والی تمام درخواستوں کے IP ایڈریسوں پر مشتمل سرور لاگز کو 90 دنوں سے زائد برقرار نہیں رکھیں گے۔
+      * رجسٹر جردہ صارفین اور اُن کی اشاعتوں کے ساتھ منسلک IP ایڈریسوں کو 5 سال سے زائد برقرار نہیں رکھیں گے۔
+
+      <a name="cookies"></a>
+
+      ## [کیا ہم کوکیز کا استعمال کرتے ہیں؟](#cookies)
+
+      جی ہاں۔ کُوکِیز ایسی چھوٹی فائلیں ہوتی ہیں جو ایک سائٹ یا اُس کی سروس فراہم کرنے والے، بذریعہ ویب براؤزر آپ کے کمپیوٹر کی ہارڈ ڈرائیو میں منتقل کر دیتے ہیں (اگر آپ کی اجازت ہو)۔ یہ کُوکِیز سائٹ کو آپ کے براؤزر کو پہچاننے کے قابل بناتے ہیں اور، اگر آپ کے پاس ایک رجسٹر کردہ اکاؤنٹ ہو، تو براؤزر کو آپ کے رجسٹرڈ اکاؤنٹ سے منسلک کر دیتے ہیں۔
+
+      ہم مستقبل کے وِزِٹس کیلئے آپ کی ترجیحات کو سمجھنے اور محفوظ کرنے کیلئے کُوکِیز کا استعمال کرتے ہیں اور سائٹ پر ٹریفک اور سائٹ اِنٹرَیکشن کے بارے میں مجموعی ڈَیٹا مرتب کرتے ہیں تاکہ ہم مستقبل میں بہتر سائٹ پر تجربات اور ٹولز پیش کرسکیں۔ ہم تیسرے فریق سروس فراہم کرنے والوں کے ساتھ معاہدے کرسکتے ہیں تاکہ ہماری ویب سائٹس پر آنے والوں کو بہتر سمجھا جا سکے۔ یہ سروس فراہم کرنے والوں کو اجازت نہیں ہے کہ ہماری جانب سے جمع کردہ معلومات کو ہمارے کام کو چلنے اور بہتر بنانے میں ہماری مدد کرنے کے علاوہ کسی اور مقصد کیلئے استعمال کریں۔
+
+      <a name="disclose"></a>
+
+      ## [کیا ہم بیرونی تنظیموں کو کوئی بھی معلومات ظاہر کرتے ہیں؟](#disclose)
+
+      ہم آپ کی ذاتی طور پر قابلِ شناخت معلومات کی فروخت، تجارت یا بیرونی تنظیموں کو منتقل نہیں کرتے ہیں۔ ِاس میں بھروسہ والی تیسری پارٹیاں شامل نہیں ہیں جو ہماری سائٹ کو چلانے میں مدد کرتی ہیں، ہمارے کام کو چلانے یا آپ کی خدمت کرنے میں مدد کرتی ہیں، جب تک کہ یہ تنظیمیں آپ کی معلومات کو رازداری سے رکھنے پر متفق رہیں۔ ہم آپ کی معلومات اِس صورت میں بھی جاری کرسکتے ہیں جب ہم یقین رکھتے ہوں کہ ایسا کرنا قانون پر عمل کرنے کیلئے مناسب ہے، ہماری ویب سائٹ کی پالیسیوں کو نافذ کرنے کیلئے، یا ہمارے یا دوسروں کے حقوق، ملکیت، یا حفاظت کو محفوظ رکھنے کیلئے بھی۔ تاہم، مارکیٹنگ، اشتہارات، یا دیگر استعمال کیلئے غیر ذاتی طور پر قابلِ شناخت وِزِیٹر معلومات دیگر تنظیموں کو فراہم کی جا سکتی ہے۔
+
+      <a name="third-party"></a>
+
+      ## [تیسری پارٹی والے لِنکس](#third-party)
+
+      کبھی کبھار، ہماری صوابدید پر، ہم اپنی ویب سائٹ پر تیسری پارٹی کی مصنوعات یا خدمات شامل یا پیش کرسکتے ہیں۔ اِن تیسری پارٹی سائٹس کی الگ اور آزادانہ پرائیوِیسی پالیسیاں ہیں۔ لہٰذا ہم اِن منسلک سائٹس کے مواد اور سرگرمیوں کیلئے کسی قِسم کی بھی کوئی ذمہ داری نہیں رکھتے۔ اس کے باوجود، ہم اپنی سائٹ کی سالمیت کی حفاظت کرنے کی کوشش کرتے ہیں اور اِن سائٹس کے بارے میں کسی بھی رائے کا خیر مقدم کرتے ہیں۔
+
+      <a name="coppa"></a>
+
+      ## [بچوں کی آن لائن پرائیوِیسی کے تحفظ کے ایکٹ کے تعمیل](#coppa)
+
+      ہماری سائٹ، مصنوعات اور خدمات سبھی اُن لوگوں کیلئے پیش کی جاتی ہیں جو کم از کم 13 سال یا اُس سے زائد عمر کے ہیں۔ اگر یہ سرور امریکہ میں ہے، اور آپ 13 سال سے کم عمر ہیں، تو COPPA ([بچوں کی آن لائن پرائیوِیسی کے تحفظ کا ایکٹ](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) کی ضروریات کے مطابق، آپ یہ سائٹ استعمال نہ کیجیے۔
+
+      <a name="online"></a>
+
+      ## [آن لائن پرائیویسی پالیسی صرف](#online)
+
+      یہ آن لائن پرائیویسی پالیسی صرف ہماری ویب سائٹ کے ذریعہ جمع کردہ معلومات پر لاگو ہوتی ہے اور اُس معلومات پر نہیں جو آف لائن جمع کی جائے۔
+
+      <a name="consent"></a>
+
+      ## [آپ کی رضامندی](#consent)
+
+      ہماری ویب سائٹ کا استعمال کرتے ہوئے، آپ ہماری سائٹ کی پرائیویسی پالیسی پر رضامندی کا اظہار کرتے ہیں۔
+
+      <a name="changes"></a>
+
+      ## [ہماری پرائیویسی پالیسی میں تبدیلیاں](#changes)
+
+      اگر ہم اپنی پرائیویسی پالیسی کو تبدیل کرنے کا فیصلہ کریں، تو ہم اِس صفحہ پر اُن تبدیلیوں کو شائع کریں گے۔
+
+      یہ دستاویز CC-BY-SA ہے۔ یہ آخری دفعہ مئی 31، 2013 کو اَپ ڈیٹ کی گئی تھی۔
+  badges:
+    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: |
+        یہ بَیج آپ کے اپنی پوسٹ پر پہلا لائیک موصول ہونے پر دیا جاتا ہے۔ مبارک ہو، آپ نے کچھ شائع کیا ہے جو آپ کے ساتھی کمیونٹی ممبران کو دلچسپ، زبردست، یا مفید معلوم ہوا ہے!
+    autobiographer:
+      name: آپ بيتی نويس
+      description: <a href="%{base_uri}/my/preferences/profile">پروفائل</a> معلومات کو پُر کر دیا
+      long_description: |
+        یہ بَیج <a href="%{base_uri}/my/preferences/profile">اپنی صارف پروفائل</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 بیرونی زائرین نے کلِک کیا ہو شیئر کرنے پر عطا کیا جاتا ہے۔ زبردست! آپ نے نیا ناظرین کی ایک بہت بڑی تعداد میں ایک دلچسپ بحث کو فروغ دیا ہے، اور ہماری کمیونٹی کو بڑے پیمانے پر بڑھانے میں مدد دی ہے!
+    first_like:
+      name: پہلا لائیک
+      description: ایک پوسٹ کو لائیک کیا
+      long_description: |
+        یہ بَیج آپ کو :heart: کا بٹن استعمال کرتے ہوئے پہلی مرتبہ پوسٹ لائیک کرنے پر عطا کیا جاتا ہے۔ پوسٹس لائیک کرنا ایک عمدہ طریقہ ہے تاکہ آپ کے ساتھی کمیونٹی ممبران کو پتہ چل سکے کہ اُن کا شائع کیا ہوا دلچسپ، مفید، زبردست، یا پُر لطف تھا۔ محبت بانٹیے!
+    first_flag:
+      name: پہلا فلَیگ
+      description: ایک پوسٹ کو فلَیگ کیا
+      long_description: |
+        یہ بَیج آپ کو پہلی مرتبہ پوسٹ فلَیگ کرنے پر عطا کیا جاتا ہے۔ فلَیگز کے ذریعہ ہم مل کر ہر ایک کیلئے اِس جگہ کو صاف، اور اچھی طرح سے روشن جگہ رکھنے میں مدد دیتے ہیں۔ اگر آپ کسی بھی ایسی پوسٹ کو نوٹس کرتے ہیں جس پر کسی بھی وجہ سے ماڈریٹر کی توجہ کی ضرورت ہوتی ہے تو براہ کرم فلَیگ کرنے سے نہ ہچکچائیں۔ اگر آپ ساتھی صارفین کی پوسٹس کے ساتھ کوئی مسئلہ دیکھتے ہیں تو آپ اُنہیں ایک <b>ذاتی پیغام</b> بھیجنے کیلئے بھی فلَیگ کرسکتے ہیں۔ اگر آپ کو کوئی مسئلہ نظر آتا ہے، تو اُسے :flag_black: فلَیگ کریں!
+    promoter:
+      name: پروموٹر
+      description: ایک صارف  کو دعوت دی
+      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="%{base_uri}/guidelines">قواعد و ضوابط</a> پڑھیں
+      long_description: |
+        یہ بَیج <a href="%{base_uri}/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 مختلف پوسٹس پر کم از کم ایک لائیک موصول ہونے پر عطا کیا جاتا ہے۔ کمیونٹی یہاں کی مباحثوں میں آپ کی شرکت سے لطف اندوز ہو رہی ہے!
+    respected:
+      name: محترم
+      description: 100 پوسٹس پر 2 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کو 100 مختلف پوسٹس پر کم از کم 2 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ کمیونٹی یہاں کے مباحثوں میں آپ کی کئی شراکتوں کی وجہ سے آپ کا احترام کرنے لگی ہے۔
+    admired:
+      name: تعریف کردہ
+      description: 300 پوسٹس پر 5 لائیکس موصول ہوئے
+      long_description: |
+        یہ بَیج آپ کو 300 مختلف پوسٹس پر کم از کم 5 لائیکس موصول ہونے پر عطا کیا جاتا ہے۔ زبردست! کمیونٹی آپ کی یہاں کے مباحثوں میں مسلسل، اعلیٰ معیار کی شراکتوں کی تعریف کرتی ہے۔
+    out_of_love:
+      name: محبت کی لِمٹ سے باہر
+      description: ایک دن میں 50 لائیکس استعمال کر لیے
+      long_description: |
+        یہ بَیج آپ کے اپنے فی دن کے تمام 50 لائیکس استعمال کرلینے پر عطا کیا جاتا ہے۔ ایک لمحہ کیلئے رُک کر جن اشاعتوں سے آپ لطف اندوز اور جن کی آپ تعریف کرتے ہیں، اُنہیں لائیک کرنا یاد رکھنے سے آپ کے ساتھی کمیونٹی ممبران کی حوصلہ افزائی ہوتی ہے کہ وہ مستقبل میں مذید عمدہ مباحث تخلیق کریں۔
+    higher_love:
+      name: عظیم تر محبت
+      description: ایک دن میں 50 لائیکس 5 مرتبہ استعمال کر لیے
+      long_description: |
+        یہ بَیج آپ کے اپنے فی دن کے تمام 50 لائیکس 5 دنوں کیلئے استعمال کرلینے پر عطا کیا جاتا ہے۔ بہترین مباحثوں کی ہر دن مسلسل حوصلہ افزائی کرنے کیلئے وقت نکالنے کا شکریہ!
+    crazy_in_love:
+      name: محبت میں دیوانہ
+      description: ایک دن میں 50 لائیکس 20 مرتبہ استعمال کر لیے
+      long_description: |
+        یہ بَیج آپ کے اپنے فی دن کے تمام 50 لائیکس 20 دنوں کیلئے استعمال کرلینے پر عطا کیا جاتا ہے۔ زبردست! آپ باقاعدگی سے آپنے ساتھی کمیونٹی ممبران کی حوصلہ افزائی کرنے کی ایک مثال ہیں!
+    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:۔
+    first_emoji:
+      name: پہلی اِیمَوجی
+      description: ایک پوسٹ میں اِیمَوجی کا استعمال کیا
+      long_description: |
+        یہ بَیج آپ کے اپنی پوسٹ پر پہلی مرتبہ اِیمَوجی شامل کرنے پر عطا کیا جاتا ہے :thumbsup:۔ اِیمَوجی آپ کو اپنی پوسٹس میں جذبات کا اظہار کرنے دیتی ہیں، خوشی :smiley: سے اداسی :anguished: تک، اداسی سے غصہ :angry: تک اور سب کچھ درمیان میں :sunglasses:۔ سینکڑوں انتخابات :ok_hand: میں سے منتخب کرنے کیلئے صرف : (کالن) ٹائپ کیجیے یا اَیڈیٹر میں اِیمَوجی ٹُول بار کے بٹن کو دبائیے۔
+    first_mention:
+      name: پہلا ذکر
+      description: پوسٹ میں ایک صارف کا ذکر کیا
+      long_description: اس بَیج آپ کے اپنی پوسٹ میں پہلی مرتبہ کسی کا @صارفنام ذکر کرنے پر عطا کیا جاتا ہے۔ ہر ذکر اُس شخص کیلئے ایک اطلاع پیدا کرتا ہے، تاکہ اُنہیں آپ کی پوسٹ کے بارے میں پتہ چل سکے۔ کسی بھی صارف، یا اگر اجازت ہو تو، گروپ کا ذکر کرنے کیلئے صرف @ (at کا نشان) ٹائپ کرنا شروع کریں – یہ اُن کی توجہ میں کچھ لانے کا آسان طریقہ ہے۔
+    first_onebox:
+      name: پہلا وَن باکس
+      description: ایک وَن باکس کردہ لِنک شائع کیا
+      long_description: یہ بَیج عطا کیا جاتا ہے جب آپ پہلی مرتبہ ایک لِنک کو لائین میں اکیلا شائع کرتے ہیں، جس کے بعد وہ خود بخود ایک مختصر خلاصہ، ایک عنوان، اور (جب دستیاب ہو) ایک تصویر کے ساتھ ایک وَن باکس میں کھل جاتا ہے۔
+    first_reply_by_email:
+      name: بذریعہ ای میل پہلا جواب
+      description: ایک پوسٹ پر بذریعہ ای میل جواب دیا
+      long_description: |
+        یہ بَیج آپ کے پہلی مرتبہ ایک پوسٹ پر بذریعہ ای میل جواب دینے پر عطا کیا جاتا ہے :e-mail:۔
+    new_user_of_the_month:
+      name: "مہینہ کے سب سے زیادہ قابل قدر نئے صارف"
+      description: اِن کے پہلے مہینے میں شاندار شراکتَیں
+      long_description: |
+        یہ بَیج ہر ماہ دو نئے صارفین کو اپنی شاندار مجموعی شراکتوں کیلئے مبارکباد دینے کیلئے عطا کیا جاتا ہے، جیسا کہ اُن کی پوسٹس کو کتنی کثرت سے اور کن کی طرف سے لائیک کیا گیا تھا، سے ناپا جاتا ہے۔
+    enthusiast:
+      name: پرجوش
+      description: 10 دن وِزِٹ کیا
+      long_description: یہ بَیج مسلسل 10 دنوں تک وِزِٹ کرنے پر عطا کیا جاتا ہے۔ ہمارے ساتھ ایک ہفتے سے زائد رکنے کیلئے شکریہ!
+    aficionado:
+      name: اَفیشیاناڈو
+      description: 100 دن وِزِٹ کیا
+      long_description: یہ بَیج مسلسل 100 دنوں تک وِزِٹ کرنے پر عطا کیا جاتا ہے۔ یہ تین ماہ سے زائد ہے!
+    devotee:
+      name: جاں نثار
+      description: 365 دن وِزِٹ کیا
+      long_description: یہ بَیج مسلسل 365 دنوں تک وِزِٹ کرنے پر عطا کیا جاتا ہے۔ واہ، ایک پورا سال!
+    badge_title_metadata: "%{site_title}پر %{display_name} بَیج "
+  admin_login:
+    success: "ای میل بھیج دی گئ"
+    errors:
+      unknown_email_address: "نامعلوم ای میل ایڈریس۔"
+      invalid_token: "غلط ٹوکن۔"
+    email_input: "ایڈمن اِی میل"
+    submit_button: "اِیمیل بھیجیں"
+  performance_report:
+    initial_post_raw: اِس ٹاپک میں آپ کی سائٹ کیلئے روزانہ کی کارکردگی کی رپورٹیں شامل ہیں۔
+    initial_topic_title: ویب سائٹ کارکردگی کی رپورٹیں
+  tags:
+    title: "ٹیگز"
+    staff_tag_disallowed: "\"%{tag}\" ٹَیگ صرف سٹاف کی طرف سے لاگو کیا جا سکتا ہے۔"
+    staff_tag_remove_disallowed: "\"%{tag}\" ٹَیگ صرف سٹاف کی طرف سے ہٹایا جا سکتا ہے۔"
+  rss_by_tag: "ٹاپکس %{tag} کے ساتھ ٹَیگ کردہ"
+  finish_installation:
+    congratulations: "مبارک باد، آپ نے ڈِسکورس اِنسٹال کر لیا!"
+    register:
+      button: "رجسٹر"
+      title: "رجسٹر ایڈمن اکاؤنٹ"
+      help: "شروع کرنے کے لئے ایک نیا اکاؤنٹ رجسٹر کریں"
+      no_emails: "بدقسمتی سے، سَیٹ اَپ کے دوران کوئی ایڈمِنِسٹریٹر ای میل واضح نہیں کی گئیں، لہٰذا ترتیب کو حتمی شکل دینا <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>مشکل ہوسکتا ہے</a>۔"
+    confirm_email:
+      title: "اپنے ای میل کی تصدیق کریں"
+      message: "</p>ہم نے </b>%{email}</b> پر ایک ایکٹیویشن میل بھیج دی ہے۔ براہ مہربانی اپنے اکاؤنٹ کو چالو کرنے کیلئے میل میں دی گئی ہدایات پر عمل کریں۔</p> </p>اگر یہ آپ کو موصول نہ ہو، تو یقینی بنائیں کہ آپ نے ڈِسکورس کیلئے صحیح طریقہ سے ای میل سَیٹ کر لی ہے اور اپنا سپَیم فولڈر چیک کریں۔</p>"
+    resend_email:
+      title: "ایکٹیویشن اِیمیل دوبارہ بھیجییں"
+      message: "<p>ہم نے <b>%{email}</b> پر ایکٹیویشن اِیمیل دوبارہ بھیج دی ہے"
+  safe_mode:
+    title: "سَیف مَوڈ میں داخل ہوں"
+    description: "پلگ اِن یا سائٹ کو اپنی مرضی کے حساب سے بنانے کیلئے کیے جانے والی تبدیلیوں کو لَوڈ کیے بغیر، سَیف مَوڈ آپ کو اپنی سائٹ کی جانچ پڑتال کرنے دیتا ہے۔"
+    no_customizations: "موجودہ تھِیم کو غیر فعال کریں"
+    only_official: "غیر آفیشل پلگ اِن غیر فعال کریں"
+    no_plugins: "تمام پلگ اِن غیر فعال کریں"
+    enter: "سَیف مَوڈ میں داخل ہوں"
+    must_select: "سَیف مَوڈ میں داخل ہونے کیلئے آپ کا کم از کم ایک آپشن منتخب کرنا ضروری ہے۔"
+  wizard:
+    title: "ڈِسکورس سَیٹ اَپ"
+    step:
+      locale:
+        title: "اپنے ڈِسکورس میں خوش آمدید!"
+        fields:
+          default_locale:
+            description: "آپ کی کمیونٹی کیلئے ڈِیفالٹ زبان کونسی ہے؟"
+      forum_title:
+        title: "نام"
+        description: "آپ کا نام ایک فاصلے سے نظر آجانے والی چیز ہے، ممکنہ زائرین کی طرف سے آپ کی کمیونٹی کے بارے میں نوٹ کیے جانے والی <i>پہلی</i> چیز۔ آپ کا نام اور عنوان آپ کی کمیونٹی کے بارے میں کیا کہتا ہے؟"
+        fields:
+          title:
+            label: "آپ کی کمیونٹی کا نام"
+            placeholder: "جمیلہ کے ٹھہرنے کی جگہ"
+          site_description:
+            label: "اپنی کمیونٹی کو ایک مختصر جملہ میں بیان کریں"
+            placeholder: "جمیلہ اور اس کی دوستوں کیلئے دلچسپ چیزوں پر بحث کرنے کی ایک جگہ"
+      introduction:
+        title: "تعارف"
+        fields:
+          welcome:
+            label: "خیرمقدم ٹاپک"
+            description: "<p>آپ ایک لفٹ میں ہوتے ہوئے 1 منٹ کے اندر اندر کسی اجنبی کو اپنی کمیونٹی کس طرح سے بیان کریں گے؟</p> <ul> <li>یہ مباحثے کن لوگوں کیلئے ہیں؟</li> <li>مجھے یہاں پر کیا مل سکتا ہے؟</li> <li>مجھے یہاں کیوں آنا چاہئے؟</li> </ul> <p>آپ کا خیرمقدم ٹاپک وہ پہلی چیز ہے جسے نئے آنے والے پڑھیں گے۔ اِسے اپنی <b>ایک پیراگراف</b> پر مشتمل 'لفٹ میں اِلتجاء' یا 'مِشَن کے بیان' کے طور پر تصور کیجیے۔ </p>"
+            one_paragraph: "براہ مہربانی اپنے خیر مقدم پیغام کو ایک پیراگراف تک محدود رکھیں۔"
+      privacy:
+        title: "رسائی"
+        description: "<p>کیا آپ کا کمیونٹی سب کے لئے کھلی ہے، یا یہ رکنیت، دعوت ناموں، یا منظوری کے ذریعہ محدود ہے؟ اگر آپ پسند کریں تو، آپ ذاتی طور پر چیزوں کو مقرر کر سکتے ہیں، اور پھر بعد میں کمیونٹی کو عوامی طور پر کھول سکتے ہیں۔</p> <p>آپ ہمیشہ ٹاپکس، یا اپنے صارف پروفائل صفحے سے بھی دعوت نامے بھیج سکتے ہیں۔</p>"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "عوامی"
+                description: "کوئی بھی اِس کمیونٹی تک رسائی حاصل کر سکتا ہے اور ایک اکاؤنٹ کیلئے سائن اَپ کرسکتا ہے"
+              restricted:
+                label: "ذاتی"
+                description: "جنہیں میں نے مدعو کیا یا منظوری دی ہے صرف وہ لوگ اِس کمیونٹی تک رسائی حاصل کر سکتے ہیں"
+      contact:
+        title: "رابطہ"
+        fields:
+          contact_email:
+            label: "میل"
+            placeholder: "name@example.com"
+            description: "اِس کمیونٹی کیلئے ذمہ دار شخص یا گروپ کا ای میل ایڈریس۔ اہم اطلاعات جیسے کہ غیر نمٹائے گئے فلَیگز، سیکورٹی اپ ڈیٹس، اور فوری کمیونٹی رابطے کیلئے <a href='/about' target='_blank'>آپ کے \"بارے میں\" والے صفحے</a> پر اہم اطلاعات کیلئے استعمال کیا جاتا ہے۔"
+          contact_url:
+            label: "وِیب صفحہ"
+            placeholder: "http://www.example.com/contact-us"
+            description: "آپ یا آپ کے ادارہ کیلئے عام رابطہ کیلئے وَیب صفحہ۔ <a href='/about' target='_blank'>آپ کے \"بارے میں\" والے صفحے</a> پر دکھایا جائے گا۔"
+          site_contact:
+            label: "خودکار پیغامات"
+            description: "تمام خودکار ڈِسکورس ذاتی پیغامات اِس صارف کی طرف سے بھیجے جائیں گے جیسے کہ فلَیگ انتباہات اور بیک اَپ تکمیل نوٹس۔"
+      corporate:
+        title: "ادارہ"
+        description: "یہ نام آپ کی <a href='/privacy' target='blank'>پرائیوَیسی پالیسی</a> اور <a href='/tos' target='blank'>سروس کی شرائط</a> میں درج کیے جائیں گے، جو ٹاپک ہیں جو کہ آپ سٹاف زُمرہ میں ترمیم کرسکتے ہیں۔ اگر آپ کی کمپنی نہیں ہے، تو ابھی کیلئے آپ آسانی سے اِس مرحلے کو چھوڑ سکتے ہیں۔"
+        fields:
+          company_short_name:
+            label: "کمپنی نام (مختصر)"
+            placeholder: "اِینیٹَیک"
+          company_full_name:
+            label: "کمپنی نام (مکمل)"
+            placeholder: "اِینیٹَیک، انکارپورَیٹِڈ"
+          company_domain:
+            label: "کمپنی ڈَومَین نام"
+            placeholder: "initech.com"
+      colors:
+        title: "تھیم"
+        fields:
+          theme_id:
+            description: "شروعات کیلئے کیا آپ لائیٹ یا ڈارک رنگ سکیم پسند کریں گے؟ آپ اپنی سائٹ کی جمالیات کو مذید اپنی مرضی کے مطابق ڈھال سکتے ہیں بذریعہ ایڈمن، \"مرضی کے مطابق بنائیں\"۔"
+            choices:
+              default:
+                label: "سادہ لائیٹ"
+              dark:
+                label: "سادہ ڈارک"
+      logos:
+        title: "لَوگَو"
+        fields:
+          logo_url:
+            label: "بنیادی لَوگَو"
+            description: "آپ کی سائٹ کے سب سے اوپر بائیں پر لَوگَو کی تصویر۔ وسیع مستطیل شکل کا استعمال کریں۔"
+          logo_small_url:
+            label: "کومپیکٹ لَوگَو"
+            description: "آپ کے لَوگَو کا ایک کومپیکٹ ورژن، جو نیچے سکرول کرنے پر آپ کی سائٹ کے سب سے اوپر بائیں جانب دکھایا جائے گا۔ ایک مربع شکل کا استعمال کریں۔"
+      icons:
+        title: "آئیکن"
+        fields:
+          favicon_url:
+            label: "چھوٹا آئیکن"
+            description: "آئیکن کی تصویر جو وَیب براؤزروں میں آپ کی ویب سائٹ کی نمائندگی کرنے کیلئے استعمال کی جاتی ہے اور جو چھوٹے سائزوں جیسے کہ 32px by 32px پر اچھی لگتی ہے۔"
+          apple_touch_icon_url:
+            label: "بڑا آئیکن"
+            description: "آئیکن کی تصویر جو جدید ڈِیوائیسِز پر آپ کی سائٹ کی نمائندگی کرنے کیلئے استعمال کی جاتی ہے اور جو بڑے سائزوں پر اچھی لگتی ہے۔ تجویز کردہ سائز کم از کم 144px by 144px ہے۔"
+      homepage:
+        description: "ہم آپ کے ہَوم پَیج پر تازہ ترین ٹاپک پیش کرنے کو تجویز کرتے ہیں، لیکن اگر آپ چاہیں تو ہَوم پَیج پر زُمرہ جات (ٹاپکس کے گروپوں) کو بھی دکھا سکتے ہیں۔"
+        title: "ہَوم پَیج"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "تازہ ترین ٹاپک"
+              categories:
+                label: "زُمرَہ جات"
+      emoji:
+        title: "اِیمَوجی"
+        description: "آپ اپنی کمیونٹی کیلئے کونسا اِیمَوجی سڑائل پسند کریں گے؟ آپ ایڈمن، مرضی کے مطابق بنائیں، اِیمَوجی کے ذریعہ بعد میں مزید اپنی مرضی کے اِیمَوجی شامل کرسکتے ہیں۔"
+      invites:
+        title: "سٹاف مدعو کریں"
+        description: "آپ تقریباً کام مکمل کر چکے ہیں! چلیے لوگوں کو دعوت دیتے ہیں کہ <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>آپ کے مباحثوں میں</a> دلچسپ ٹاپک اور جوابات شامل کرنے میں آپ کی مدد کریں تاکہ آپ کی کمیونٹی کا آغاز ہو سکے۔"
+      finished:
+        title: "آپ کا ڈِسکورس تیار ہے!"
+        description: |
+          <p>اگر آپ کبھی بھی اِن ترتیبات کو تبدیل کرنا پسند کریں، تو <a href='/admin' target='_blank'>اپنے ایڈمن سیکشن</a> پر جائیں؛ اِسے سائٹ مینیو میں رِنچ آئیکن کے ساتھ تلاش کریں۔</p>
+          <p>لطف اندوز ہوئے اور <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>اپنی نئی کمیونٹی بنانے میں اللہ آپ کو کامیاب کرے!</a></p>
+  search_logs:
+    graph_title: "سرچ شمار"
+  joined: "شمولیت اختیار کی"
+  date:
+    <<: *datetime_formats
   activemodel:
     errors:
       <<: *errors
-  activerecord:
-    errors:
-      <<: *errors
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 11c48db4de..f5edb45e09 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -295,20 +295,6 @@ vi:
       title: "người khởi xướng"
     change_failed_explanation: "Bạn đã cố gắng để giảm hạng %{user_name}  xuống '%{new_trust_level}'. Tuy nhiên cấp độ  tin cậy hiện tại của họ đã là '%{current_trust_level}'. %{user_name} sẽ được giữ lại ở cấp độ '%{current_trust_level}' - nếu bạn muốn giảm hạng thành viên, trước tiên hãy khóa cấp độ tin cậy"
   rate_limiter:
-    slow_down: "Hành động này đã được thực hiện quá nhiều lần. Bạn vui lòng thử lại sau."
-    by_type:
-      first_day_replies_per_day: "Bạn vừa vượt quá số lần trả lời tối đa trong ngày đầu của thành viên mới. Xin hãy chờ %{time_left} và thử lại sau."
-      first_day_topics_per_day: "Bạn vừa đạt tới số lần mở topic tối đa cho thành viên mới. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      create_topic: "Bạn đang tạo topic quá nhanh. Vui lòng chờ %{time_left} trước khi thử lại."
-      create_post: "Bạn đang trả lời quá nhanh. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      delete_post: "Bạn đang xóa bài viết quá nhanh, hãy đợi %{time_left} trước khi thử lại."
-      topics_per_day: "Bạn vừa đạt tới số lần mở topic mới tối đa trong ngày hôm nay. Vui lòng chờ %{time_left} trước khi thử lại."
-      pms_per_day: "Bạn vừa đạt tới số lần gửi tin nhắn tối đa trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      create_like: "Bạn vừa đạt tới số lần tối đa được Like trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      create_bookmark: "Bạn vừa đạt tới số lần đánh dấu tối đa trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại."
-      live_post_counts: "Bạn đang yêu cầu bộ đếm bài viết quá nhanh, hãy đợi %{time_left} trước khi thử lại."
-      unsubscribe_via_email: "Bạn đã vượt quá số lần hủy nhận tin qua email của ngày hôm nay, hãy đợi %{time_left} trước khi thử lại."
-      topic_invitations_per_day: "Bạn đã vượt quá số lần mời chủ đề của ngày hôm nay, hãy đợi %{time_left} trước khi thử lại."
     hours:
       other: "%{count} giờ"
     minutes:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 9ce9ee2455..e061a54260 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -208,8 +208,6 @@ zh_CN:
     delete_reason: "通过帖子审核队列删除"
     not_found: "未找到帖子或已经更新。"
   groups:
-    success:
-      bulk_add: "%{users_added}用户已经被添加至小组。"
     errors:
       can_not_modify_automatic: "你不能修改自动组"
       invalid_domain: "“%{domain}”不是有效域名。"
@@ -433,22 +431,6 @@ zh_CN:
     image_placeholder:
       broken: "此图片已损坏"
   rate_limiter:
-    slow_down: "你执行这个操作太多次了，请稍后再试。"
-    by_type:
-      first_day_replies_per_day: "你回帖的数量已经超出身为新用户当天允许的上限，请等待%{time_left}之后再试。"
-      first_day_topics_per_day: "你创建新主题的数量已经超出身为新用户当天允许的上限，请等待%{time_left}之后再试。"
-      create_topic: "你创建新主题的速度太快了，请等待%{time_left}之后再试。"
-      create_post: "你回帖太快了，请等待%{time_left}之后再试。"
-      delete_post: "你正在快速地删除帖子。请等 %{time_left}之后再试。"
-      public_group_membership: "你加入/离开群组的速度太快了，请等待%{time_left}之后再试。"
-      topics_per_day: "你今天新主题的数量已经到达上限，请等待%{time_left}之后再试。"
-      pms_per_day: "你今天的私信数量已经到达上限，请等待%{time_left}之后再试。"
-      create_like: "你今天的“赞”数量已经到达上限，请等待%{time_left}之后再试。"
-      create_bookmark: "你今天的收藏已经到达上限，请等待%{time_left}之后再试。"
-      edit_post: "你今天编辑帖子的数量已经到达上限。请等待%{time_left}之后再试。"
-      live_post_counts: "你请求帖子数量的速度太快了，请等待%{time_left}之后再试。"
-      unsubscribe_via_email: "你已经达到了今日用邮件解除订阅的最大数量限制。请等待%{time_left}之后再试。"
-      topic_invitations_per_day: "你已经达到了今日主题邀请的最大数量限制。请等待%{time_left}之后再试。"
     hours:
       other: "%{count}小时"
     minutes:
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 04b51bd79f..38e5556415 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -391,22 +391,6 @@ zh_TW:
       title: "資深"
     change_failed_explanation: "你嘗試將%{user_name}降至%{new_trust_level}。然而他們的信任等級已經是%{current_trust_level}。%{user_name}將仍處于%{current_trust_level}——如果你想要降級用戶，先鎖定信任等級。"
   rate_limiter:
-    slow_down: "您這個動作重複太多次，請稍後再試。"
-    by_type:
-      first_day_replies_per_day: "你回帖的數量已經超出身為新用戶當天允許的上限，請等待%{time_left}之後再試。"
-      first_day_topics_per_day: "你創建新主題的數量已經超出身為新用戶當天允許的上限，請等待%{time_left}之後再試。"
-      create_topic: "您創建討論話題過於倉猝。請稍等 %{time_left} 再試一次。"
-      create_post: "你的回覆過快。請等待%{time_left}再重試。"
-      delete_post: "您刪除討論話題過於倉猝。請稍待 %{time_left} 後再試一次。"
-      public_group_membership: "您加入/離開群組過於頻繁。請稍等 %{time_left} 後再試一次。"
-      topics_per_day: "您今天新發佈的討論話題已經達到上限。請稍待 %{time_left} 後再試一次。"
-      pms_per_day: "您今天發表的訊息數已經達到上限。請等待 %{time_left} 後再行嘗試。"
-      create_like: "您今天給予讚的次數已經達到上限。請等待 %{time_left} 再行嘗試。"
-      create_bookmark: "您今天加入書籤的數目已經達到上限。請等待 %{time_left} 再行嘗試。"
-      edit_post: "您已達到單日編輯次數上限。請等待 %{time_left} 後再行嘗試。"
-      live_post_counts: "您要求的即時文章計數過於快速。請等待 %{time_left} 再行嘗試。"
-      unsubscribe_via_email: "你已經達到了今日用郵件解除訂閲的最大數量限制。請等待%{time_left}之後再試。"
-      topic_invitations_per_day: "你已經達到了今日主題邀請的最大數量限制。請等待%{time_left}之後再試。"
     hours:
       other: "%{count} 小時"
     minutes:
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index ee7b0fea7c..24e8646950 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -202,9 +202,12 @@ server {
       # this is double bad cause we are not passing last modified in
       proxy_ignore_headers "Set-Cookie";
       proxy_hide_header "Set-Cookie";
+      proxy_hide_header "X-Discourse-Username";
+      proxy_hide_header "X-Runtime";
 
       # note x-accel-redirect can not be used with proxy_cache
       proxy_cache one;
+      proxy_cache_key "$scheme,$host,$request_uri";
       proxy_cache_valid 200 301 302 7d;
       proxy_cache_valid any 1m;
       proxy_pass http://discourse;
@@ -221,9 +224,12 @@ server {
       # client
       proxy_ignore_headers "Set-Cookie";
       proxy_hide_header "Set-Cookie";
+      proxy_hide_header "X-Discourse-Username";
+      proxy_hide_header "X-Runtime";
 
       proxy_cache one;
-      proxy_cache_key $uri;
+      # shared in multisite
+      proxy_cache_key $request_uri;
       proxy_cache_valid 200 7d;
       proxy_cache_valid 404 1m;
       proxy_set_header Connection "";
diff --git a/config/routes.rb b/config/routes.rb
index a5249b598d..8a96931a8e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,6 +10,7 @@ USERNAME_ROUTE_FORMAT = /[\w.\-]+?/ unless defined? USERNAME_ROUTE_FORMAT
 BACKUP_ROUTE_FORMAT = /.+\.(sql\.gz|tar\.gz|tgz)/i unless defined? BACKUP_ROUTE_FORMAT
 
 Discourse::Application.routes.draw do
+  relative_url_root = (defined?(Rails.configuration.relative_url_root) && Rails.configuration.relative_url_root) ? Rails.configuration.relative_url_root + '/' : '/'
 
   match "/404", to: "exceptions#not_found", via: [:get, :post]
   get "/404-body" => "exceptions#not_found_body"
@@ -77,7 +78,6 @@ Discourse::Application.routes.draw do
 
     resources :groups, constraints: AdminConstraint.new do
       collection do
-        post "refresh_automatic_groups" => "groups#refresh_automatic_groups"
         get 'bulk'
         get 'bulk-complete' => 'groups#bulk'
         put 'bulk' => 'groups#bulk_perform'
@@ -292,7 +292,10 @@ Discourse::Application.routes.draw do
   get "extra-locales/:bundle" => "extra_locales#show"
 
   resources :session, id: RouteFormat.username, only: [:create, :destroy, :become] do
-    get 'become'
+    if !Rails.env.production?
+      get 'become'
+    end
+
     collection do
       post "forgot_password"
     end
@@ -462,6 +465,7 @@ Discourse::Application.routes.draw do
     get 'logs' => 'groups#histories'
 
     collection do
+      get 'custom/new' => 'groups#new', constraints: AdminConstraint.new
       get "search" => "groups#search"
     end
 
@@ -472,6 +476,12 @@ Discourse::Application.routes.draw do
         messages
         messages/inbox
         messages/archive
+        manage
+        manage/profile
+        manage/members
+        manage/membership
+        manage/interaction
+        manage/logs
       }.each do |path|
         get path => 'groups#show'
       end
@@ -540,7 +550,7 @@ Discourse::Application.routes.draw do
   get "/badges/:id(/:slug)" => "badges#show"
   resources :user_badges, only: [:index, :create, :destroy]
 
-  get '/c', to: redirect('/categories')
+  get '/c', to: redirect(relative_url_root + 'categories')
 
   resources :categories, except: :show
   post "category/:category_id/move" => "categories#move"
@@ -616,7 +626,7 @@ Discourse::Application.routes.draw do
     get "private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive"
     get "private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread"
     get "private-messages-tags/:username/:tag_id.json" => "list#private_messages_tag", as: "topics_private_messages_tag", constraints: StaffConstraint.new
-    get "groups/:group_name.json" => "list#group_topics", as: "group_topics"
+    get "groups/:group_name" => "list#group_topics", as: "group_topics", group_name: RouteFormat.username
 
     scope "/private-messages-group/:username", group_name: RouteFormat.username do
       get ":group_name.json" => "list#private_messages_group", as: "topics_private_messages_group"
@@ -722,8 +732,10 @@ Discourse::Application.routes.draw do
     # current site before updating to a new Service Worker.
     # Support the old Service Worker path to avoid routing error filling up the
     # logs.
-    get "/service-worker.js" => redirect(service_worker_asset), format: :js
+    get "/service-worker.js" => redirect(relative_url_root + service_worker_asset), format: :js
     get service_worker_asset => "static#service_worker_asset", format: :js
+  elsif Rails.env.development?
+    get "/service-worker.js" => "static#service_worker_asset", format: :js
   end
 
   get "cdn_asset/:site/*path" => "static#cdn_asset", format: false
diff --git a/config/site_settings.yml b/config/site_settings.yml
index dc00b023fe..00c23780c3 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -320,6 +320,7 @@ login:
     default: ''
     regex: '^https?:\/\/.+[^\/]$'
   sso_secret: ''
+  sso_overrides_groups: false
   sso_overrides_bio: false
   sso_overrides_email:
     default: false
@@ -358,7 +359,7 @@ users:
     max: 60
   reserved_usernames:
     type: list
-    default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|account-created"
+    default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|hp|account-created|password-reset|admin-login|confirm-admin|account-created|activate-account|confirm-email-token|authorize-email"
   min_password_length:
     client: true
     default: 10
@@ -646,6 +647,8 @@ posting:
   approve_new_topics_unless_trust_level:
     default: 0
     enum: 'TrustLevelSetting'
+  approve_unless_staged:
+    default: false
   notify_about_queued_posts_after:
     default: 24
   auto_close_messages_post_count: 500
@@ -1018,6 +1021,16 @@ security:
     default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?|https://calendar.google.com/calendar/embed?'
     type: list
     client: true
+  whitelisted_crawler_user_agents:
+    type: list
+    default: ''
+  blacklisted_crawler_user_agents:
+    type: list
+    default: ''
+  slow_down_crawler_user_agents:
+    type: list
+    default: 'bingbot'
+  slow_down_crawler_rate: 60
 
 onebox:
   enable_flash_video_onebox: false
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index d91b5f09a1..8aa0859160 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -12,3 +12,23 @@ WebHookEventType.seed do |b|
   b.id = WebHookEventType::USER
   b.name = "user"
 end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::GROUP
+  b.name = "group"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::CATEGORY
+  b.name = "category"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::TAG
+  b.name = "tag"
+end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::FLAG
+  b.name = "flag"
+end
diff --git a/db/migrate/20180320190339_create_web_crawler_requests.rb b/db/migrate/20180320190339_create_web_crawler_requests.rb
new file mode 100644
index 0000000000..f02fd77634
--- /dev/null
+++ b/db/migrate/20180320190339_create_web_crawler_requests.rb
@@ -0,0 +1,11 @@
+class CreateWebCrawlerRequests < ActiveRecord::Migration[5.1]
+  def change
+    create_table :web_crawler_requests do |t|
+      t.date :date, null: false
+      t.string :user_agent, null: false
+      t.integer :count, null: false, default: 0
+    end
+
+    add_index :web_crawler_requests, [:date, :user_agent], unique: true
+  end
+end
diff --git a/db/migrate/20180323154826_create_tag_group_permissions.rb b/db/migrate/20180323154826_create_tag_group_permissions.rb
new file mode 100644
index 0000000000..74abffefc8
--- /dev/null
+++ b/db/migrate/20180323154826_create_tag_group_permissions.rb
@@ -0,0 +1,10 @@
+class CreateTagGroupPermissions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tag_group_permissions do |t|
+      t.references :tag_group,  null: false
+      t.references :group, null: false
+      t.integer :permission_type, default: 1, null: false
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb b/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb
new file mode 100644
index 0000000000..66fb4a227c
--- /dev/null
+++ b/db/migrate/20180327062911_add_post_custom_fields_akismet_index.rb
@@ -0,0 +1,12 @@
+# This is our current pattern for data migrations needed by plugins, we prefer to keep them in core
+# so schema is tightly controlled, especially if we are amending tables owned by core
+#
+# this index makes looking up posts requiring review much faster (20ms on meta)
+
+class AddPostCustomFieldsAkismetIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :post_custom_fields, [:post_id],
+      name: 'idx_post_custom_fields_akismet',
+      where: "name = 'AKISMET_STATE' AND value = 'needs_review'"
+  end
+end
diff --git a/db/migrate/20180328180317_add_category_index_to_shared_drafts.rb b/db/migrate/20180328180317_add_category_index_to_shared_drafts.rb
new file mode 100644
index 0000000000..cd1be7b23d
--- /dev/null
+++ b/db/migrate/20180328180317_add_category_index_to_shared_drafts.rb
@@ -0,0 +1,5 @@
+class AddCategoryIndexToSharedDrafts < ActiveRecord::Migration[5.1]
+  def change
+    add_index :shared_drafts, :category_id
+  end
+end
diff --git a/db/migrate/20180331125522_add_minimum_required_tags_to_categories.rb b/db/migrate/20180331125522_add_minimum_required_tags_to_categories.rb
new file mode 100644
index 0000000000..646e370d01
--- /dev/null
+++ b/db/migrate/20180331125522_add_minimum_required_tags_to_categories.rb
@@ -0,0 +1,5 @@
+class AddMinimumRequiredTagsToCategories < ActiveRecord::Migration[5.1]
+  def change
+    add_column :categories, :minimum_required_tags, :integer, default: 0
+  end
+end
diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index 5bd9792d06..7a99b64395 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -1,6 +1,6 @@
 # Discourse Advanced Developer Install Guide
 
-This guide is aimed at advanced Rails developers who have installed their own Rails apps before. If you are new to Rails, you are likely much better off with our **[Discourse Vagrant Developer Guide](VAGRANT.md)**.
+This guide is aimed at advanced Rails developers who have installed their own Rails apps before.
 
 Note: If you are developing on a Mac, you will probably want to look at [these instructions](DEVELOPMENT-OSX-NATIVE.md) as well.
 
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index 470930a7e4..ec4ae1ecef 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -1,10 +1,10 @@
-# Developing under OS X Without Vagrant
+# Developing under OS X
 
 These instructions assume you have read and understood the **[Discourse Advanced Developer Install Guide](DEVELOPER-ADVANCED.md)**.
 
 OS X has become a popular platform for developing Ruby on Rails applications; as such, if you run OS X, you might find it more congenial to work on **[Discourse](http://discourse.org)** in your native environment. These instructions should get you there.
 
-Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.0 using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started!
+Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.3 using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started!
 
 ## Quick Setup
 
@@ -79,8 +79,8 @@ If you do already have RVM installed, this should make sure everything is up to
 Either way, you'll now want to install the 'turbo' version of Ruby 2.0.
 
     # Now, install Ruby
-    rvm install 2.0.0-turbo
-    rvm use 2.0.0-turbo --default # Careful with this if you're already developing Ruby
+    rvm install 2.3.4-turbo
+    rvm use 2.3.4 --default # Careful with this if you're already developing Ruby
 
 ## Git
 
diff --git a/docs/VAGRANT.md b/docs/VAGRANT.md
deleted file mode 100644
index 32a8fa7ac7..0000000000
--- a/docs/VAGRANT.md
+++ /dev/null
@@ -1,164 +0,0 @@
-# Discourse Developer Install Guide (Vagrant)
-
-### If you are on a Mac or PC, please try our [Discourse as Your First Rails App](http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/) blog post first!
-
-(If you have experience setting up Rails projects, you might want to take a look at our **[Discourse Advanced Developer Guide](DEVELOPER-ADVANCED.md)**. It also contains instructions on building your own Vagrant VM.)
-
-The following instructions will automatically download and provision a virtual machine for you to begin hacking
-on Discourse with:
-
-### Getting Started
-
-1. Install Git: http://git-scm.com/downloads (or [GitHub for Windows](http://windows.github.com/) if you want a GUI)
-2. Install VirtualBox: https://www.virtualbox.org/wiki/Downloads
-3. Install Vagrant: http://www.vagrantup.com/ (We require Vagrant 1.7.2 or later)
-4. Open a terminal
-5. Clone the project: `git clone https://github.com/discourse/discourse.git`
-6. Enter the project directory: `cd discourse`
-
-### Using Vagrant
-
-When you're ready to start working, boot the VM:
-```
-vagrant up
-```
-
-Vagrant will prompt you for your admin password. This is so it can mount your local files inside the VM for an easy workflow.
-
-(The first time you do this, it will take a while as it downloads the VM image and installs it. Go grab a coffee.)
-
-**Note to Linux users**: Your Discourse directory cannot be on an ecryptfs mount or you will receive an error: `exportfs: /home/your/path/to/discourse does not support NFS export`
-
-**Note to OSX/Linux users**: Vagrant will mount your local files via an NFS share. Therefore, make sure that NFS is installed or else you'll receive the error message:
-
-```
-Mounting NFS shared folders failed. This is most often caused by the NFS
-client software not being installed on the guest machine. Please verify
-that the NFS client software is properly installed, and consult any resources
-specific to the linux distro you're using for more information on how to
-do this.
-```
-
-For example, on Ubuntu, you can install NFS support by installing nfs-kernel-server with `apt-get install`.
-
-Once the machine has booted up, you can shell into it by typing:
-
-```
-vagrant ssh
-```
-
-The discourse code is found in the /vagrant directory in the image.
-
-**Note to Windows users**: You cannot run ```vagrant ssh``` from a cmd prompt; you'll receive the error message:
-
-```
-`vagrant ssh` isn't available on the Windows platform. You are still able
-to SSH into the virtual machine if you get a Windows SSH client (such as
-PuTTY). The authentication information is shown below:
-
-Host: 127.0.0.1
-Port: 2222
-Username: vagrant
-Private key: C:/Users/Your Name/.vagrant.d/insecure_private_key
-```
-
-At this point, you will want to get an SSH client, and use it to connect to your Vagrant VM instead. We recommend
-PuTTY:
-
-**[PuTTY Download Link](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)**
-
-You may use this client to connect to the VM by using ```vagrant/vagrant``` as your username/password, or by [using
-PuTTYGen to import the insecure_private_key file](http://jason.sharonandjason.com/key_based_putty_logins_mini_how_to.htm)
-(mentioned above) into a PuTTY profile to quickly access your VM.
-
-### Keeping your VM up to date (and first install)
-
-Now you're in a virtual machine is almost ready to start developing. It's a good idea to perform the following instructions
-*every time* you pull from master to ensure your environment is still up to date.
-
-```
-cd /vagrant
-bundle install
-bundle exec rake db:migrate
-```
-
-### Starting Rails
-
-Once your VM is up to date, you can start a rails instance using the following command from the /vagrant directory:
-
-```
-bundle exec rails s -b 0.0.0.0
-```
-
-In a few seconds, rails will start serving pages. To access them, open a web browser to [http://localhost:4000](http://localhost:4000) - if it all worked you should see discourse! Congratulations, you are ready to start working!
-
-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.
-
-### Creating an Admin User
-
-You'll want an admin account to be able to do anything fun on your new Discourse environment. Enter your vagrant image by using `vagrant ssh` then
-run the following command and follow the instructions:
-
-```bash
-bundle exec rake admin:create
-```
-
-Your admin account should be approved. Log in in your browser and you're good to go!
-
-### Tests
-
-If you're actively working on Discourse, we recommend that you run rake autospec, which will run the specs.  It’s very, very smart. It’ll abort very long test runs. So if it starts running all of the specs and then you just start editing a spec file and save it, it knows that it’s time to interrupt the spec suite, run this one spec for you, then it’ll keep running these specs until they pass as well. If you fail a spec by saving it and then go and start editing around the project to try and fix that spec, it’ll detect that and run that one failing spec, not a hundred of them.
-
-To use it, follow all the above steps. Once rails is running, open a new terminal window or tab, and then do this:
-
-```
-vagrant ssh
-cd /vagrant
-RAILS_ENV=test bundle exec rake db:migrate
-bundle exec rake autospec p l=5
-```
-
-When developing a plugin (the *poll* plugin for instance), the following can be used to only run all tests from the *spec* directory:
-
-```
-bundle exec rake plugin:spec poll
-```
-
-or just a single file with:
-
-```
-LOAD_PLUGINS=1 bundle exec rspec plugins/poll/spec/controllers/posts_controller_spec.rb
-```
-
-For more insight into testing Discourse, see [this discussion](http://rubyrogues.com/117-rr-discourse-part-2-with-sam-saffron-and-robin-ward/) with the Ruby Rogues.
-
-### Sending Email
-
-Mail is sent asynchronously by Sidekiq, so you'll need to have sidekiq running to process jobs. Run it with this command in the /vagrant directory:
-
-```
-bundle exec sidekiq
-```
-
-Mailcatcher is used to avoid the whole issue of actually sending emails: https://github.com/sj26/mailcatcher
-
-Mailcatcher is already installed in the vm, and there's an alias to launch it:
-
-```
-mailcatcher --http-ip=0.0.0.0
-```
-Running the above command might throw out the `'method_missing'` error in the terminal. This can be fixed by upgrading rubygems to the latest version which can be done by running the following in the /vagrant directory:
-
-```
-gem update --system
-```
-
-Then in a browser, go to [http://localhost:4080](http://localhost:4080). Sent emails will be received by mailcatcher and shown in its web ui.
-
-### Shutting down the VM
-
-When you're done working on Discourse, you can shut down Vagrant with:
-
-```
-vagrant halt
-```
diff --git a/docs/vagrant.screen b/docs/vagrant.screen
deleted file mode 100644
index e6c3348278..0000000000
--- a/docs/vagrant.screen
+++ /dev/null
@@ -1,18 +0,0 @@
-# GNU screen configuration file for Discourse vagrant image
-
-# Start up development support commands in detached mode:
-#   screen -d -m -c docs/vagrant.screen
-
-# Start in attached mode:
-# screen -m -c docs/vagrant.screen
-
-# commands that exit hang around until you hit 'k' to kill or 'r' to restart
-zombie kr
-
-screen -t rails_s 0 bash -c 'echo Starting rails server...;  cd /vagrant; bundle exec rails s -b 0.0.0.0'
-screen -t rails_c 1 bash -c 'echo Starting rails console...; cd /vagrant; bundle exec rails c'
-screen -t sidekiq 2 bash -c 'echo Starting sidekiq...;       cd /vagrant; bundle exec sidekiq -l log/sidekiq.log'
-screen -t mail    3 bash -c 'echo Starting mailcatcher...;   cd /; mailcatcher --ip 0.0.0.0'
-screen -t bash    4 bash
-
-scrollback 50000
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 9465457092..491d2cf5c3 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -316,8 +316,8 @@ module BackupRestore
 
     def log(message)
       timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts(message) rescue nil
-      publish_log(message, timestamp) rescue nil
+      puts(message)
+      publish_log(message, timestamp)
       save_log(message, timestamp)
     end
 
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index c5047132fa..d2d46239be 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -64,6 +64,7 @@ module BackupRestore
         wait_for_sidekiq
 
         BackupRestore.move_tables_between_schemas("public", "backup")
+        @db_was_changed = true
         restore_dump
         migrate_database
         reconnect_database
@@ -500,8 +501,8 @@ module BackupRestore
 
     def log(message)
       timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      puts(message) rescue nil
-      publish_log(message, timestamp) rescue nil
+      puts(message)
+      publish_log(message, timestamp)
       save_log(message, timestamp)
     end
 
diff --git a/lib/crawler_detection.rb b/lib/crawler_detection.rb
index 2958087a3c..bf28c6c1aa 100644
--- a/lib/crawler_detection.rb
+++ b/lib/crawler_detection.rb
@@ -28,4 +28,25 @@ module CrawlerDetection
     end
 
   end
+
+  # Given a user_agent that returns true from crawler?, should its request be allowed?
+  def self.allow_crawler?(user_agent)
+    return true if SiteSetting.whitelisted_crawler_user_agents.blank? &&
+      SiteSetting.blacklisted_crawler_user_agents.blank?
+
+    @whitelisted_matchers ||= {}
+    @blacklisted_matchers ||= {}
+
+    if SiteSetting.whitelisted_crawler_user_agents.present?
+      whitelisted = @whitelisted_matchers[SiteSetting.whitelisted_crawler_user_agents] ||= to_matcher(SiteSetting.whitelisted_crawler_user_agents)
+      !user_agent.nil? && user_agent.match?(whitelisted)
+    else
+      blacklisted = @blacklisted_matchers[SiteSetting.blacklisted_crawler_user_agents] ||= to_matcher(SiteSetting.blacklisted_crawler_user_agents)
+      user_agent.nil? || !user_agent.match?(blacklisted)
+    end
+  end
+
+  def self.is_blocked_crawler?(user_agent)
+    crawler?(user_agent) && !allow_crawler?(user_agent)
+  end
 end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 45b6416c6b..f084627700 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -128,7 +128,11 @@ module Discourse
     if Rails.env.development?
       plugin_hash = Digest::SHA1.hexdigest(all_plugins.map { |p| p.path }.sort.join('|'))
       hash_file = "#{Rails.root}/tmp/plugin-hash"
-      old_hash = File.read(hash_file) rescue nil
+
+      old_hash = begin
+        File.read(hash_file)
+      rescue Errno::ENOENT
+      end
 
       if old_hash && old_hash != plugin_hash
         puts "WARNING: It looks like your discourse plugins have recently changed."
@@ -236,7 +240,13 @@ module Discourse
   end
 
   def self.route_for(uri)
-    uri = URI(uri) rescue nil unless uri.is_a?(URI)
+    unless uri.is_a?(URI)
+      uri = begin
+        URI(uri)
+      rescue URI::InvalidURIError
+      end
+    end
+
     return unless uri
 
     path = uri.path || ""
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index e46cf891fd..4ec176b8d0 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -82,6 +82,9 @@ class DiscoursePluginRegistry
       @vendored_pretty_text ||= Set.new
     end
 
+    def vendored_core_pretty_text
+      @vendored_core_pretty_text ||= Set.new
+    end
   end
 
   def register_js(filename, options = {})
@@ -136,6 +139,8 @@ class DiscoursePluginRegistry
         self.admin_javascripts << asset
       elsif opts == :vendored_pretty_text
         self.vendored_pretty_text << asset
+      elsif opts == :vendored_core_pretty_text
+        self.vendored_core_pretty_text << asset
       else
         self.javascripts << asset
       end
@@ -180,6 +185,15 @@ class DiscoursePluginRegistry
     result.uniq
   end
 
+  VENDORED_CORE_PRETTY_TEXT_MAP = {
+    "moment.js" => "lib/javascripts/moment.js"
+  }
+  def self.core_asset_for_name(name)
+    asset = VENDORED_CORE_PRETTY_TEXT_MAP[name]
+    raise KeyError, "Asset #{name} not found in #{VENDORED_CORE_PRETTY_TEXT_MAP}" unless asset
+    asset
+  end
+
   def locales
     self.class.locales
   end
@@ -235,6 +249,7 @@ class DiscoursePluginRegistry
     asset_globs.clear
     html_builders.clear
     vendored_pretty_text.clear
+    vendored_core_pretty_text.clear
     seed_path_builders.clear
     locales.clear
   end
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 758b8dcd75..c9b0e14e6e 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -26,10 +26,16 @@ module DiscourseTagging
         end
       end
 
-      if tag_names.present?
-        category = topic.category
-        tag_names = tag_names + old_tag_names if append
+      category = topic.category
+      tag_names = tag_names + old_tag_names if append
 
+      # validate minimum required tags for a category
+      if !guardian.is_staff? && category && category.minimum_required_tags > 0 && tag_names.length < category.minimum_required_tags
+        topic.errors[:base] << I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags)
+        return false
+      end
+
+      if tag_names.present?
         # guardian is explicitly nil cause we don't want to strip all
         # staff tags that already passed validation
         tags = filter_allowed_tags(
@@ -76,7 +82,6 @@ module DiscourseTagging
       term.gsub!("_", "\\_")
       term = clean_tag(term)
       query = query.where('tags.name like ?', "%#{term}%")
-      # query = query.where('tags.id NOT IN (?)', selected_tag_ids) unless selected_tag_ids.empty?
     end
 
     # Filters for category-specific tags:
@@ -152,7 +157,36 @@ module DiscourseTagging
       end
     end
 
-    query
+    if guardian.nil? || guardian.is_staff?
+      query
+    else
+      filter_visible(query, guardian)
+    end
+  end
+
+  def self.filter_visible(query, guardian = nil)
+    if !guardian&.is_staff? && TagGroupPermission.where(group_id: Group::AUTO_GROUPS[:staff]).exists?
+      query.where(filter_visible_sql)
+    else
+      query
+    end
+  end
+
+  def self.filter_visible_sql
+    @filter_visible_sql ||= <<~SQL
+      tags.id NOT IN (
+        SELECT tgm.tag_id
+          FROM tag_group_memberships tgm
+    INNER JOIN tag_group_permissions tgp
+            ON tgp.tag_group_id = tgm.tag_group_id
+           AND tgp.group_id = #{Group::AUTO_GROUPS[:staff]})
+    SQL
+  end
+
+  def self.hidden_tag_names(guardian = nil)
+    return [] if guardian&.is_staff? || !TagGroupPermission.where(group_id: Group::AUTO_GROUPS[:staff]).exists?
+    tag_group_ids = TagGroupPermission.where(group_id: Group::AUTO_GROUPS[:staff]).pluck(:tag_group_id)
+    Tag.includes(:tag_groups).where('tag_group_id in (?)', tag_group_ids).pluck(:name)
   end
 
   def self.clean_tag(tag)
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index abf42f61e8..4c093de916 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -64,6 +64,7 @@ module Email
       DistributedMutex.synchronize(@message_id) do
         begin
           return if IncomingEmail.exists?(message_id: @message_id)
+          ensure_valid_address_lists
           @from_email, @from_display_name = parse_from_field(@mail)
           @incoming_email = create_incoming_email
           process_internal
@@ -77,6 +78,16 @@ module Email
       end
     end
 
+    def ensure_valid_address_lists
+      [:to, :cc, :bcc].each do |field|
+        addresses = @mail[field]
+
+        if addresses&.errors.present?
+          @mail[field] = addresses.to_s.scan(/\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b/i)
+        end
+      end
+    end
+
     def is_blacklisted?
       return false if SiteSetting.ignore_by_title.blank?
       Regexp.new(SiteSetting.ignore_by_title, Regexp::IGNORECASE) =~ @mail.subject
@@ -290,6 +301,7 @@ module Email
       [:exchange, /name="message(Body|Reply)Section"/],
       [:apple_mail, /id="AppleMailSignature"/],
       [:mozilla, /class="moz-/],
+      [:protonmail, /class="protonmail_/],
     ]
 
     def extract_from_gmail(html)
@@ -340,6 +352,13 @@ module Email
       to_markdown(doc.to_html, elided.to_html)
     end
 
+    def extract_from_protonmail(html)
+      doc = Nokogiri::HTML.fragment(html)
+      # Removes anything that has a class starting with "protonmail_" and everything after that
+      elided = doc.css("*[class^='protonmail_'], *[class^='protonmail_'] ~ *").remove
+      to_markdown(doc.to_html, elided.to_html)
+    end
+
     def trim_reply_and_extract_elided(text)
       return [text, ""] if @opts[:skip_trimming]
       EmailReplyTrimmer.trim(text, true)
@@ -518,14 +537,7 @@ module Email
       case destination[:type]
       when :group
         group = destination[:obj]
-        create_topic(user: user,
-                     raw: body,
-                     elided: elided,
-                     title: subject,
-                     archetype: Archetype.private_message,
-                     target_group_names: [group.name],
-                     is_group_message: true,
-                     skip_validations: true)
+        create_group_post(group, user, body, elided)
 
       when :category
         category = destination[:obj]
@@ -543,7 +555,7 @@ module Email
       when :reply
         email_log = destination[:obj]
 
-        if email_log.user_id != user.id && !forwareded_reply_key?(email_log, user)
+        if email_log.user_id != user.id && !forwarded_reply_key?(email_log, user)
           raise ReplyUserNotMatchingError, "email_log.user_id => #{email_log.user_id.inspect}, user.id => #{user.id.inspect}"
         end
 
@@ -556,27 +568,63 @@ module Email
       end
     end
 
-    def forwareded_reply_key?(email_log, user)
+    def create_group_post(group, user, body, elided)
+      message_ids = Email::Receiver.extract_reply_message_ids(@mail, max_message_id_count: 5)
+      post_ids = []
+
+      incoming_emails = IncomingEmail
+        .where(message_id: message_ids)
+        .addressed_to_user(user)
+        .pluck(:post_id, :to_addresses, :cc_addresses)
+
+      incoming_emails.each do |post_id, to_addresses, cc_addresses|
+        post_ids << post_id if contains_email_address_of_user?(to_addresses, user) ||
+          contains_email_address_of_user?(cc_addresses, user)
+      end
+
+      if post_ids.any? && post = Post.where(id: post_ids).order(:created_at).last
+        create_reply(user: user,
+                     raw: body,
+                     elided: elided,
+                     post: post,
+                     topic: post.topic,
+                     skip_validations: true)
+      else
+        create_topic(user: user,
+                     raw: body,
+                     elided: elided,
+                     title: subject,
+                     archetype: Archetype.private_message,
+                     target_group_names: [group.name],
+                     is_group_message: true,
+                     skip_validations: true)
+      end
+    end
+
+    def forwarded_reply_key?(email_log, user)
       incoming_emails = IncomingEmail
         .joins(:post)
         .where('posts.topic_id = ?', email_log.topic_id)
         .addressed_to(email_log.reply_key)
-        .addressed_to(user.email)
+        .addressed_to_user(user)
+        .pluck(:to_addresses, :cc_addresses)
 
-      incoming_emails.each do |email|
-        next unless contains_email_address?(email.to_addresses, user.email) ||
-          contains_email_address?(email.cc_addresses, user.email)
+      incoming_emails.each do |to_addresses, cc_addresses|
+        next unless contains_email_address_of_user?(to_addresses, user) ||
+          contains_email_address_of_user?(cc_addresses, user)
 
-        return true if contains_reply_by_email_address(email.to_addresses, email_log.reply_key) ||
-          contains_reply_by_email_address(email.cc_addresses, email_log.reply_key)
+        return true if contains_reply_by_email_address(to_addresses, email_log.reply_key) ||
+          contains_reply_by_email_address(cc_addresses, email_log.reply_key)
       end
 
       false
     end
 
-    def contains_email_address?(addresses, email)
+    def contains_email_address_of_user?(addresses, user)
       return false if addresses.blank?
-      addresses.split(";").include?(email)
+
+      addresses = addresses.split(";")
+      user.user_emails.any? { |user_email| addresses.include?(user_email.email) }
     end
 
     def contains_reply_by_email_address(addresses, reply_key)
@@ -684,14 +732,9 @@ module Email
     def find_related_post
       return if SiteSetting.find_related_post_with_key && !sent_to_mailinglist_mirror?
 
-      message_ids = [@mail.in_reply_to, Email::Receiver.extract_references(@mail.references)]
-      message_ids.flatten!
-      message_ids.select!(&:present?)
-      message_ids.uniq!
+      message_ids = Email::Receiver.extract_reply_message_ids(@mail, max_message_id_count: 5)
       return if message_ids.empty?
 
-      message_ids = message_ids.first(5)
-
       host = Email::Sender.host_for(Discourse.base_url)
       post_id_regexp  = Regexp.new "topic/\\d+/(\\d+)@#{Regexp.escape(host)}"
       topic_id_regexp = Regexp.new "topic/(\\d+)@#{Regexp.escape(host)}"
@@ -710,6 +753,14 @@ module Email
       Post.where(id: post_ids).order(:created_at).last
     end
 
+    def self.extract_reply_message_ids(mail, max_message_id_count:)
+      message_ids = [mail.in_reply_to, Email::Receiver.extract_references(mail.references)]
+      message_ids.flatten!
+      message_ids.select!(&:present?)
+      message_ids.uniq!
+      message_ids.first(max_message_id_count)
+    end
+
     def self.extract_references(references)
       if Array === references
         references
@@ -804,7 +855,7 @@ module Email
             end
           end
         ensure
-          tmp.try(:close!) rescue nil
+          tmp&.close!
         end
       end
 
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index 46cdff3c01..f58b8a1888 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -30,20 +30,12 @@ class FinalDestination
 
   def initialize(url, opts = nil)
     @url = url
-    @uri =
-      begin
-        URI(escape_url) if @url
-      rescue URI::InvalidURIError
-      end
+    @uri = uri(escape_url) if @url
 
     @opts = opts || {}
     @force_get_hosts = @opts[:force_get_hosts] || []
     @opts[:max_redirects] ||= 5
-    @opts[:lookup_ip] ||= lambda do |host|
-      begin
-        FinalDestination.lookup_ip(host)
-      end
-    end
+    @opts[:lookup_ip] ||= lambda { |host| FinalDestination.lookup_ip(host) }
     @ignored = [Discourse.base_url_no_prefix] + (@opts[:ignore_redirects] || [])
     @limit = @opts[:max_redirects]
     @status = :ready
@@ -106,9 +98,8 @@ class FinalDestination
 
     if result == :redirect
       old_port = uri.port
-
       location = "#{uri.scheme}://#{uri.host}#{location}" if location[0] == "/"
-      uri = URI(location) rescue nil
+      uri = uri(location)
 
       # https redirect, so just cache that whole new domain is https
       if old_port == 80 && uri&.port == 443 && (URI::HTTPS === uri)
@@ -204,9 +195,8 @@ class FinalDestination
 
     if location
       old_port = @uri.port
-
       location = "#{@uri.scheme}://#{@uri.host}#{location}" if location[0] == "/"
-      @uri = URI(location) rescue nil
+      @uri = uri(location)
       @limit -= 1
 
       # https redirect, so just cache that whole new domain is https
@@ -243,7 +233,8 @@ class FinalDestination
   end
 
   def hostname_matches?(url)
-    @uri && url.present? && @uri.hostname == (URI(url) rescue nil)&.hostname
+    url = uri(url)
+    @uri && url.present? && @uri.hostname == url&.hostname
   end
 
   def is_dest_valid?
@@ -317,11 +308,11 @@ class FinalDestination
   end
 
   def self.lookup_ip(host)
-    # TODO clean this up in the test suite, cause it is a mess
-    # if Rails.env == "test"
-    #   STDERR.puts "WARNING FinalDestination.lookup_ip was called with host: #{host}, this is network call that should be mocked"
-    # end
-    IPSocket::getaddress(host)
+    if Rails.env.test?
+      "0.0.0.0"
+    else
+      IPSocket::getaddress(host)
+    end
   rescue SocketError
     nil
   end
@@ -388,4 +379,13 @@ class FinalDestination
     end
   end
 
+  private
+
+  def uri(location)
+    begin
+      URI(location)
+    rescue URI::InvalidURIError, ArgumentError
+    end
+  end
+
 end
diff --git a/lib/flag_query.rb b/lib/flag_query.rb
index cda69b8f91..268e4abef1 100644
--- a/lib/flag_query.rb
+++ b/lib/flag_query.rb
@@ -35,6 +35,7 @@ module FlagQuery
              p.user_id,
              p.topic_id,
              p.post_number,
+             p.reply_count,
              p.hidden,
              p.deleted_at,
              p.user_deleted,
diff --git a/lib/guardian.rb b/lib/guardian.rb
index b9f73aa6c7..11a7ee9661 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -215,8 +215,11 @@ class Guardian
     can_administer?(user) && !user.moderator?
   end
 
-  def can_grant_title?(user)
-    user && is_staff?
+  def can_grant_title?(user, title = nil)
+    return true if user && is_staff?
+    return false if user != @user
+    return true if user.badges.where(name: title, allow_title: true).exists?
+    user.groups.where(title: title).exists?
   end
 
   def can_change_primary_group?(user)
diff --git a/lib/import_export/importer.rb b/lib/import_export/importer.rb
index 94502a348e..90d787a529 100644
--- a/lib/import_export/importer.rb
+++ b/lib/import_export/importer.rb
@@ -161,7 +161,10 @@ module ImportExport
     end
 
     def new_category_id(external_category_id)
-      CategoryCustomField.where(name: "import_id", value: "#{external_category_id}#{import_source}").first.category_id rescue nil
+      CategoryCustomField.where(
+        name: "import_id",
+        value: "#{external_category_id}#{import_source}"
+      ).first&.category_id
     end
 
     def import_source
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
index ccc2b547fe..aafe3b338c 100644
--- a/lib/inline_oneboxer.rb
+++ b/lib/inline_oneboxer.rb
@@ -29,10 +29,12 @@ class InlineOneboxer
       return cached if cached.present?
     end
 
+    return unless url
+
     if route = Discourse.route_for(url)
       if route[:controller] == "topics" &&
         route[:action] == "show" &&
-        topic = (Topic.where(id: route[:topic_id].to_i).first rescue nil)
+        topic = Topic.where(id: route[:topic_id].to_i).first
 
         return onebox_for(url, topic.title, opts) if Guardian.new.can_see?(topic)
       end
@@ -42,7 +44,10 @@ class InlineOneboxer
     domains = SiteSetting.inline_onebox_domains_whitelist&.split('|') unless always_allow
 
     if always_allow || domains
-      uri = URI(url) rescue nil
+      uri = begin
+        URI(url)
+      rescue URI::InvalidURIError
+      end
 
       if uri.present? &&
         uri.hostname.present? &&
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index af8d5fbfac..09a41fd643 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -47,7 +47,8 @@ module JsLocaleHelper
         translations = {
           locale_str => {
             'js' => {},
-            'admin_js' => {}
+            'admin_js' => {},
+            'wizard_js' => {}
           }
         }
       end
@@ -56,6 +57,7 @@ module JsLocaleHelper
       if translations[locale_str] && plugin_translations(locale_str)
         translations[locale_str]['js'].deep_merge!(plugin_translations(locale_str)['js']) if plugin_translations(locale_str)['js']
         translations[locale_str]['admin_js'].deep_merge!(plugin_translations(locale_str)['admin_js']) if plugin_translations(locale_str)['admin_js']
+        translations[locale_str]['wizard_js'].deep_merge!(plugin_translations(locale_str)['wizard_js']) if plugin_translations(locale_str)['wizard_js']
       end
 
       translations
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 2ad01b0521..e7ffb8869a 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -83,6 +83,7 @@ class Middleware::RequestTracker
     if track_view
       if data[:is_crawler]
         ApplicationRequest.increment!(:page_view_crawler)
+        WebCrawlerRequest.increment!(data[:user_agent])
       elsif data[:has_auth_cookie]
         ApplicationRequest.increment!(:page_view_logged_in)
         ApplicationRequest.increment!(:page_view_logged_in_mobile) if data[:is_mobile]
@@ -129,8 +130,9 @@ class Middleware::RequestTracker
       is_mobile: helper.is_mobile?,
       track_view: track_view,
       timing: timing
-    }
-
+    }.tap do |h|
+      h[:user_agent] = env['HTTP_USER_AGENT'] if h[:is_crawler]
+    end
   end
 
   def log_request_info(env, result, info)
@@ -155,12 +157,20 @@ class Middleware::RequestTracker
 
   def call(env)
     result = nil
+    log_request = true
+    request = Rack::Request.new(env)
 
-    if rate_limit(env)
+    if rate_limit(request)
       result = [429, {}, ["Slow down, too Many Requests from this IP Address"]]
       return result
     end
 
+    if block_crawler(request)
+      log_request = false
+      result = [403, { 'Content-Type' => 'text/plain' }, ['Crawler is not allowed']]
+      return result
+    end
+
     env["discourse.request_tracker"] = self
     MethodProfiler.start
     result = @app.call(env)
@@ -186,7 +196,7 @@ class Middleware::RequestTracker
         end
       end
     end
-    log_request_info(env, result, info) unless env["discourse.request_tracker.skip"]
+    log_request_info(env, result, info) unless !log_request || env["discourse.request_tracker.skip"]
   end
 
   PRIVATE_IP ||= /^(127\.)|(192\.168\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(::1$)|([fF][cCdD])/
@@ -196,7 +206,7 @@ class Middleware::RequestTracker
     !!(ip && ip.to_s.match?(PRIVATE_IP))
   end
 
-  def rate_limit(env)
+  def rate_limit(request)
 
     if (
       GlobalSetting.max_reqs_per_ip_mode == "block" ||
@@ -204,7 +214,7 @@ class Middleware::RequestTracker
       GlobalSetting.max_reqs_per_ip_mode == "warn+block"
     )
 
-      ip = Rack::Request.new(env).ip
+      ip = request.ip
 
       if !GlobalSetting.max_reqs_rate_limit_on_private
         return false if is_private_ip?(ip)
@@ -236,15 +246,15 @@ class Middleware::RequestTracker
         global: true
       )
 
-      env['DISCOURSE_RATE_LIMITERS'] = [limiter10, limiter60]
-      env['DISCOURSE_ASSET_RATE_LIMITERS'] = [limiter_assets10]
+      request.env['DISCOURSE_RATE_LIMITERS'] = [limiter10, limiter60]
+      request.env['DISCOURSE_ASSET_RATE_LIMITERS'] = [limiter_assets10]
 
       warn = GlobalSetting.max_reqs_per_ip_mode == "warn" ||
         GlobalSetting.max_reqs_per_ip_mode == "warn+block"
 
       if !limiter_assets10.can_perform?
         if warn
-          Rails.logger.warn("Global asset IP rate limit exceeded for #{ip}: 10 second rate limit, uri: #{env["REQUEST_URI"]}")
+          Rails.logger.warn("Global asset IP rate limit exceeded for #{ip}: 10 second rate limit, uri: #{request.env["REQUEST_URI"]}")
         end
 
         return !(GlobalSetting.max_reqs_per_ip_mode == "warn")
@@ -257,7 +267,7 @@ class Middleware::RequestTracker
         limiter60.performed!
       rescue RateLimiter::LimitExceeded
         if warn
-          Rails.logger.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit, uri: #{env["REQUEST_URI"]}")
+          Rails.logger.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit, uri: #{request.env["REQUEST_URI"]}")
           !(GlobalSetting.max_reqs_per_ip_mode == "warn")
         else
           true
@@ -266,6 +276,14 @@ class Middleware::RequestTracker
     end
   end
 
+  def block_crawler(request)
+    request.get? &&
+      !request.xhr? &&
+      request.env['HTTP_ACCEPT'] =~ /text\/html/ &&
+      !request.path.ends_with?('robots.txt') &&
+      CrawlerDetection.is_blocked_crawler?(request.env['HTTP_USER_AGENT'])
+  end
+
   def log_later(data, host)
     Scheduler::Defer.later("Track view", _db = nil) do
       self.class.log_request_on_site(data, host)
diff --git a/lib/migration/base_dropper.rb b/lib/migration/base_dropper.rb
index c00035d4ab..f36963d99e 100644
--- a/lib/migration/base_dropper.rb
+++ b/lib/migration/base_dropper.rb
@@ -33,7 +33,12 @@ module Migration
             SELECT 1
             FROM schema_migration_details
             WHERE name = :after_migration AND
-                  created_at <= (current_timestamp AT TIME ZONE 'UTC' - INTERVAL :delay)
+                  (created_at <= (current_timestamp AT TIME ZONE 'UTC' - INTERVAL :delay) OR
+                   (SELECT created_at
+                    FROM schema_migration_details
+                    ORDER BY id ASC
+                    LIMIT 1) > (current_timestamp AT TIME ZONE 'UTC' - INTERVAL '10 minutes')
+                  )
         )
       SQL
     end
diff --git a/lib/migration/safe_migrate.rb b/lib/migration/safe_migrate.rb
index 92486fe67b..18e1e14d30 100644
--- a/lib/migration/safe_migrate.rb
+++ b/lib/migration/safe_migrate.rb
@@ -84,26 +84,26 @@ class Migration::SafeMigrate
   end
 
   def self.protect!(sql)
-    if sql =~ /^\s*drop\s+table/i
+    if sql =~ /^\s*(?:drop\s+table|alter\s+table.*rename\s+to)\s+/i
       $stdout.puts("", <<~STR)
         WARNING
         -------------------------------------------------------------------------------------
-        An attempt was made to drop a table in a migration
+        An attempt was made to drop or rename a table in a migration
         SQL used was: '#{sql}'
-        Please use the deferred pattrn using Migration::TableDropper in db/seeds to drop
-        the table.
+        Please use the deferred pattern using Migration::TableDropper in db/seeds to drop
+        or rename the table.
 
         This protection is in place to protect us against dropping tables that are currently
         in use by live applications.
       STR
       raise Discourse::InvalidMigration, "Attempt was made to drop a table"
-    elsif sql =~ /^\s*alter\s+table.*(rename|drop)/i
+    elsif sql =~ /^\s*alter\s+table.*(?:rename|drop)\s+/i
       $stdout.puts("", <<~STR)
         WARNING
         -------------------------------------------------------------------------------------
         An attempt was made to drop or rename a column in a migration
         SQL used was: '#{sql}'
-        Please use the deferred pattrn using Migration::ColumnDropper in db/seeds to drop
+        Please use the deferred pattern using Migration::ColumnDropper in db/seeds to drop
         or rename columns.
 
         Note, to minimize disruption use self.ignored_columns = ["column name"] on your
diff --git a/lib/migration/table_dropper.rb b/lib/migration/table_dropper.rb
index 02d383849e..78a9c7172f 100644
--- a/lib/migration/table_dropper.rb
+++ b/lib/migration/table_dropper.rb
@@ -44,9 +44,10 @@ module Migration
         LIMIT 1
       SQL
 
-      builder.where(new_table_exists) if @new_name.present?
+      builder.where(table_exists(":new_name")) if @new_name.present?
 
       builder.where("table_schema = 'public'")
+        .where(table_exists(":old_name"))
         .where(previous_migration_done)
         .exec(old_name: @old_name,
               new_name: @new_name,
@@ -54,13 +55,13 @@ module Migration
               after_migration: @after_migration).to_a.length > 0
     end
 
-    def new_table_exists
+    def table_exists(table_name_placeholder)
       <<~SQL
         EXISTS(
             SELECT 1
             FROM INFORMATION_SCHEMA.TABLES
             WHERE table_schema = 'public' AND
-                  table_name = :new_name
+                  table_name = #{table_name_placeholder}
         )
       SQL
     end
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index 8eb03d32b6..b6965bc221 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -68,7 +68,7 @@ class NewPostManager
   end
 
   def self.exempt_user?(user)
-    user.staff? || user.staged
+    user.staff?
   end
 
   def self.post_needs_approval?(manager)
@@ -81,7 +81,8 @@ class NewPostManager
     (manager.args[:title].present? && user.trust_level < SiteSetting.approve_new_topics_unless_trust_level.to_i) ||
     is_fast_typer?(manager) ||
     matches_auto_silence_regex?(manager) ||
-    WordWatcher.new("#{manager.args[:title]} #{manager.args[:raw]}").requires_approval?
+    WordWatcher.new("#{manager.args[:title]} #{manager.args[:raw]}").requires_approval? ||
+    (SiteSetting.approve_unless_staged && user.staged)
   end
 
   def self.default_handler(manager)
@@ -123,6 +124,7 @@ class NewPostManager
     SiteSetting.approve_post_count > 0 ||
     SiteSetting.approve_unless_trust_level.to_i > 0 ||
     SiteSetting.approve_new_topics_unless_trust_level.to_i > 0 ||
+    SiteSetting.approve_unless_staged ||
     WordWatcher.words_for_action_exists?(:require_approval) ||
     handlers.size > 1
   end
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index b8394f1690..dc5b649157 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -77,6 +77,8 @@ module Oneboxer
     doc
   end
 
+  HTML5_BLOCK_ELEMENTS ||= %w{address article aside blockquote canvas center dd div dl dt fieldset figcaption figure footer form h1 h2 h3 h4 h5 h6 header hgroup hr li main nav noscript ol output p pre section table tfoot ul video}
+
   def self.apply(string_or_doc, args = nil)
     doc = string_or_doc
     doc = Nokogiri::HTML::fragment(doc) if doc.is_a?(String)
@@ -88,8 +90,9 @@ module Oneboxer
         parsed_onebox = Nokogiri::HTML::fragment(onebox)
         next unless parsed_onebox.children.count > 0
 
-        # special logic to strip empty p elements
-        if element&.parent&.node_name&.downcase == "p" && element&.parent&.children&.count == 1
+        if element&.parent&.node_name&.downcase == "p" &&
+           element.parent.children.count == 1 &&
+           HTML5_BLOCK_ELEMENTS.include?(parsed_onebox.children[0].node_name.downcase)
           element = element.parent
         end
 
@@ -98,6 +101,9 @@ module Oneboxer
       end
     end
 
+    # strip empty <p> elements
+    doc.css("p").each { |p| p.remove if p.children.empty? }
+
     Result.new(doc, changed)
   end
 
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 91953a1074..c2d41e2c3f 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -338,7 +338,12 @@ class Plugin::Instance
   end
 
   def register_asset(file, opts = nil)
-    full_path = File.dirname(path) << "/assets/" << file
+    if opts && opts == :vendored_core_pretty_text
+      full_path = DiscoursePluginRegistry.core_asset_for_name(file)
+    else
+      full_path = File.dirname(path) << "/assets/" << file
+    end
+
     assets << [full_path, opts]
   end
 
@@ -506,6 +511,7 @@ JS
 
   def javascript_includes
     assets.map do |asset, opts|
+      next if opts == :vendored_core_pretty_text
       next if opts == :admin
       next unless asset =~ DiscoursePluginRegistry::JS_REGEX
       asset
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 465c19ad06..dc7111320e 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -33,7 +33,9 @@ class Plugin::Metadata
     "discourse-translator",
     "discourse-patreon",
     "discourse-prometheus",
-    "discourse-assign"
+    "discourse-assign",
+    "discourse-narrative-bot",
+    "discourse-presence"
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 5a5af07376..3a1a55d3f1 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -405,10 +405,15 @@ class PostRevisor
 
   def remove_flags_and_unhide_post
     return unless editing_a_flagged_and_hidden_post?
+
+    flaggers = []
     @post.post_actions.where(post_action_type_id: PostActionType.flag_types_without_custom.values).each do |action|
+      flaggers << action.user if action.user
       action.remove_act!(Discourse.system_user)
     end
+
     @post.unhide!
+    PostActionNotifier.after_post_unhide(@post, flaggers)
   end
 
   def editing_a_flagged_and_hidden_post?
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 4e2fc4e81e..082835eb91 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -101,6 +101,10 @@ module PrettyText
       end
     end
 
+    DiscoursePluginRegistry.vendored_core_pretty_text.each do |vpt|
+      ctx.eval(File.read(vpt))
+    end
+
     DiscoursePluginRegistry.vendored_pretty_text.each do |vpt|
       ctx.eval(File.read(vpt))
     end
diff --git a/lib/promotion.rb b/lib/promotion.rb
index e40c39e10a..d1d16b5e91 100644
--- a/lib/promotion.rb
+++ b/lib/promotion.rb
@@ -111,16 +111,16 @@ class Promotion
   def self.recalculate(user, performed_by = nil)
     # First, use the manual locked level
     unless user.manual_locked_trust_level.nil?
-      user.trust_level = user.manual_locked_trust_level
-      user.save
-      return
+      return user.update!(
+        trust_level: user.manual_locked_trust_level
+      )
     end
 
     # Then consider the group locked level
     if user.group_locked_trust_level
-      user.trust_level = user.group_locked_trust_level
-      user.save
-      return
+      return user.update!(
+        trust_level: user.group_locked_trust_level
+      )
     end
 
     user.update_column(:trust_level, TrustLevel[0])
diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb
index ba8a903594..a0fdf25705 100644
--- a/lib/single_sign_on.rb
+++ b/lib/single_sign_on.rb
@@ -4,7 +4,6 @@ class SingleSignOn
                :add_groups, :remove_groups, :groups]
   FIXNUMS = []
   BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
-  ARRAYS = [:groups]
   NONCE_EXPIRY_TIME = 10.minutes
 
   attr_accessor(*ACCESSORS)
@@ -41,7 +40,6 @@ class SingleSignOn
       if BOOLS.include? k
         val = ["true", "false"].include?(val) ? val == "true" : nil
       end
-      val = Array(val) if ARRAYS.include?(k) && !val.nil?
       sso.send("#{k}=", val)
     end
 
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 7701e89cfc..20cd574a58 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -252,13 +252,17 @@ module SiteSettingExtension
     refresh_settings.include?(name.to_sym)
   end
 
+  HOSTNAME_SETTINGS ||= %w{
+    disabled_image_download_domains onebox_domains_blacklist exclude_rel_nofollow_domains
+    email_domains_blacklist email_domains_whitelist white_listed_spam_host_domains
+  }
+
   def filter_value(name, value)
-    if %w[disabled_image_download_domains onebox_domains_blacklist exclude_rel_nofollow_domains email_domains_blacklist email_domains_whitelist white_listed_spam_host_domains].include? name
-      domain_array = []
-      value.split('|').each { |url| domain_array << get_hostname(url) }
-      value = domain_array.join("|")
+    if HOSTNAME_SETTINGS.include?(name)
+      value.split("|").map { |url| get_hostname(url) }.compact.uniq.join("|")
+    else
+      value
     end
-    value
   end
 
   def set(name, value)
@@ -339,11 +343,21 @@ module SiteSettingExtension
   end
 
   def get_hostname(url)
-    unless (URI.parse(url).scheme rescue nil).nil?
-      url = "http://#{url}" if URI.parse(url).scheme.nil?
-      url = URI.parse(url).host
+    url.strip!
+
+    host = begin
+      URI.parse(url)&.host
+    rescue URI::InvalidURIError
+      nil
     end
-    url
+
+    host ||= begin
+      URI.parse("http://#{url}")&.host
+    rescue URI::InvalidURIError
+      nil
+    end
+
+    host.presence || url
   end
 
   private
diff --git a/lib/socket_server.rb b/lib/socket_server.rb
index fdd430b9a9..fda521ec0a 100644
--- a/lib/socket_server.rb
+++ b/lib/socket_server.rb
@@ -16,7 +16,7 @@ class SocketServer
   end
 
   def stop
-    @server&.close rescue nil
+    @server&.close
     FileUtils.rm_f(@socket_path)
     @server = nil
     @blk = nil
@@ -72,7 +72,7 @@ class SocketServer
   rescue => e
     Rails.logger.warn("Failed to handle connection in stats socket #{e}:\n#{e.backtrace.join("\n")}")
   ensure
-    socket&.close rescue nil
+    socket&.close
   end
 
   def get_response(command)
diff --git a/lib/staff_constraint.rb b/lib/staff_constraint.rb
index ba4dc0a36c..7572ada16c 100644
--- a/lib/staff_constraint.rb
+++ b/lib/staff_constraint.rb
@@ -4,9 +4,17 @@ class StaffConstraint
 
   def matches?(request)
     provider = Discourse.current_user_provider.new(request.env)
-    provider.current_user && provider.current_user.staff?
+    provider.current_user &&
+      provider.current_user.staff? &&
+      custom_staff_check(request)
   rescue Discourse::InvalidAccess
     false
   end
 
+  # Extensibility point: plugins can overwrite this to add additional checks
+  # if they require.
+  def custom_staff_check(request)
+    true
+  end
+
 end
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 369f65038d..ea7de4dbe0 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -110,7 +110,11 @@ class Stylesheet::Manager
       if File.exists?(stylesheet_fullpath)
         unless StylesheetCache.where(target: qualified_target, digest: digest).exists?
           begin
-            source_map = File.read(source_map_fullpath) rescue nil
+            source_map = begin
+              File.read(source_map_fullpath)
+            rescue Errno::ENOENT
+            end
+
             StylesheetCache.add(qualified_target, digest, File.read(stylesheet_fullpath), source_map)
           rescue => e
             Rails.logger.warn "Completely unexpected error adding contents of '#{stylesheet_fullpath}' to cache #{e}"
diff --git a/lib/tasks/admin.rake b/lib/tasks/admin.rake
index c57e03b785..d2ff44b366 100644
--- a/lib/tasks/admin.rake
+++ b/lib/tasks/admin.rake
@@ -19,7 +19,10 @@ task "admin:invite", [:email] => [:environment] do |_, args|
 
   puts "Granting admin!"
   user.grant_admin!
-  user.change_trust_level!(4)
+  if user.trust_level < 1
+    user.change_trust_level!(1)
+  end
+
   user.email_tokens.update_all confirmed: true
 
   puts "Sending email!"
@@ -81,7 +84,9 @@ task "admin:create" => :environment do
   grant_admin = ask("Do you want to grant Admin privileges to this account? (Y/n)  ")
   if (grant_admin == "" || grant_admin.downcase == 'y')
     admin.grant_admin!
-    admin.change_trust_level!(4)
+    if admin.trust_level < 1
+      admin.change_trust_level!(1)
+    end
     admin.email_tokens.update_all confirmed: true
     admin.activate
 
diff --git a/lib/tasks/destroy.rake b/lib/tasks/destroy.rake
new file mode 100644
index 0000000000..957369aacb
--- /dev/null
+++ b/lib/tasks/destroy.rake
@@ -0,0 +1,39 @@
+## These tasks are destructive and are for clearing out all the
+#   content and users from your site, but keeping your site settings,
+#   theme, and category structrue.
+desc "Remove all topics in a category"
+task "destroy:topics", [:category] => :environment do |t, args|
+  category = args[:category]
+  puts "Going to delete all topics in the #{category} category"
+  puts log = DestroyTask.destroy_topics(category)
+end
+
+desc "Remove all topics in all categories"
+task "destroy:topics_all_categories" => :environment do
+  puts "Going to delete all topics in all categories..."
+  puts log = DestroyTask.destroy_topics_all_categories
+end
+
+desc "Remove all private messages"
+task "destroy:private_messages" => :environment do
+  puts "Going to delete all private messages..."
+  puts log = DestroyTask.destroy_private_messages
+end
+
+desc "Destroy all groups"
+task "destroy:groups" => :environment do
+  puts "Going to delete all non-default groups..."
+  puts log = DestroyTask.destroy_groups
+end
+
+desc "Destroy all non-admin users"
+task "destroy:users" => :environment do
+  puts "Going to delete all non-admin users..."
+  puts log = DestroyTask.destroy_users
+end
+
+desc "Destory site stats"
+task "destroy:stats" => :environment do
+  puts "Going to delete all site stats..."
+  DestroyTask.destroy_stats
+end
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index e506eed273..a0bfc0c0b7 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -12,6 +12,7 @@
 # => SINGLE_PLUGIN             set to plugin name to only run plugin-specific rspec tests (you'll probably want to SKIP_CORE as well)
 # => BISECT                    set to 1 to run rspec --bisect (applies to core rspec tests only)
 # => RSPEC_SEED                set to seed to use for rspec tests (applies to core rspec tests only)
+# => PAUSE_ON_TERMINATE        set to 1 to pause prior to terminating redis and pg
 #
 # Other useful environment variables (not specific to this rake task)
 # => COMMIT_HASH    used by the discourse_test docker image to load a specific commit of discourse
@@ -56,7 +57,7 @@ task 'docker:test' do
       puts "Starting background redis"
       @redis_pid = Process.spawn('redis-server --dir tmp/test_data/redis')
 
-      @postgres_bin = "/usr/lib/postgresql/9.5/bin/"
+      @postgres_bin = "/usr/lib/postgresql/10/bin/"
       `#{@postgres_bin}initdb -D tmp/test_data/pg`
 
       # speed up db, never do this in production mmmmk
@@ -118,6 +119,11 @@ task 'docker:test' do
   ensure
     puts "Terminating"
 
+    if ENV['PAUSE_ON_TERMINATE']
+      puts "Pausing prior to termination"
+      sleep
+    end
+
     Process.kill("TERM", @redis_pid) if @redis_pid
     Process.kill("TERM", @pg_pid) if @pg_pid
     Process.wait @redis_pid if @redis_pid
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 387af78b8a..3c17bc1e3b 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -87,9 +87,12 @@ def rebake_posts(opts = {})
   total = Post.count
   rebaked = 0
 
-  Post.find_each do |post|
-    rebake_post(post, opts)
-    print_status(rebaked += 1, total)
+  # TODO: make this resumable because carrying around 20 million ids in memory is not a great idea long term
+  Post.order(id: :desc).pluck(:id).in_groups_of(1000, false).each do |batched_post_ids|
+    Post.order(created_at: :desc).where(id: batched_post_ids).each do |post|
+      rebake_post(post, opts)
+      print_status(rebaked += 1, total)
+    end
   end
 
   SiteSetting.disable_edit_notifications = disable_edit_notifications
@@ -274,3 +277,97 @@ task 'posts:refresh_emails', [:topic_id] => [:environment] do |_, args|
 
   puts "", "Done. #{updated} posts updated.", ""
 end
+
+desc 'Reorders all posts based on their creation_date'
+task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
+  Post.transaction do
+    # update sort_order and flip post_number to prevent
+    # unique constraint violations when updating post_number
+    builder = SqlBuilder.new(<<~SQL)
+      WITH ordered_posts AS (
+          SELECT
+            id,
+            ROW_NUMBER()
+            OVER (
+              PARTITION BY topic_id
+              ORDER BY created_at, post_number ) AS new_post_number
+          FROM posts
+          /*where*/
+      )
+      UPDATE posts AS p
+      SET sort_order = o.new_post_number,
+        post_number  = p.post_number * -1
+      FROM ordered_posts AS o
+      WHERE p.id = o.id AND
+            p.post_number <> o.new_post_number
+    SQL
+    builder.where("topic_id = :topic_id") if args[:topic_id]
+    builder.exec(topic_id: args[:topic_id])
+
+    Notification.exec_sql(<<~SQL)
+      UPDATE notifications AS x
+      SET post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.post_number = ABS(p.post_number) AND
+            p.post_number < 0
+    SQL
+
+    PostTiming.exec_sql(<<~SQL)
+      UPDATE post_timings AS x
+      SET post_number = x.post_number * -1
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+
+      UPDATE post_timings AS t
+      SET post_number = p.sort_order
+      FROM posts AS p
+      WHERE t.topic_id = p.topic_id AND
+            t.post_number = p.post_number AND
+            p.post_number < 0;
+    SQL
+
+    Post.exec_sql(<<~SQL)
+      UPDATE posts AS x
+      SET reply_to_post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.reply_to_post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+    SQL
+
+    TopicUser.exec_sql(<<~SQL)
+      UPDATE topic_users AS x
+        SET last_read_post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.last_read_post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+
+      UPDATE topic_users AS x
+        SET highest_seen_post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.highest_seen_post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+
+      UPDATE topic_users AS x
+        SET last_emailed_post_number = p.sort_order
+      FROM posts AS p
+      WHERE x.topic_id = p.topic_id AND
+            x.last_emailed_post_number = ABS(p.post_number) AND
+            p.post_number < 0;
+    SQL
+
+    # finally update the post_number
+    Post.exec_sql(<<~SQL)
+      UPDATE posts
+      SET post_number = sort_order
+      WHERE post_number < 0
+    SQL
+  end
+
+  puts "", "Done.", ""
+end
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 0332f89652..d69f3078a7 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -409,8 +409,14 @@ def recover_from_tombstone
   end
 
   begin
-    original_setting = SiteSetting.max_image_size_kb
-    SiteSetting.max_image_size_kb = 10240
+    previous_image_size      = SiteSetting.max_image_size_kb
+    previous_attachment_size = SiteSetting.max_attachment_size_kb
+    previous_extensions      = SiteSetting.authorized_extensions
+
+    SiteSetting.max_image_size_kb      = 10 * 1024
+    SiteSetting.max_attachment_size_kb = 10 * 1024
+    SiteSetting.authorized_extensions  = "*"
+
     current_db = RailsMultisite::ConnectionManagement.current_db
     public_path = Rails.root.join("public")
     paths = Dir.glob(File.join(public_path, 'uploads', 'tombstone', current_db, '**', '*.*'))
@@ -424,9 +430,10 @@ def recover_from_tombstone
         doc = Nokogiri::HTML::fragment(post.raw)
         updated = false
 
-        doc.css("img[src]").each do |img|
-          url = img["src"]
+        image_urls = doc.css("img[src]").map { |img| img["src"] }
+        attachment_urls = doc.css("a.attachment[href]").map { |a| a["href"] }
 
+        (image_urls + attachment_urls).each do |url|
           next if !url.start_with?("/uploads/")
           next if Upload.exists?(url: url)
 
@@ -473,7 +480,9 @@ def recover_from_tombstone
       end
     end
   ensure
-    SiteSetting.max_image_size_kb = original_setting
+    SiteSetting.max_image_size_kb      = previous_image_size
+    SiteSetting.max_attachment_size_kb = previous_attachment_size
+    SiteSetting.authorized_extensions  = previous_extensions
   end
 end
 
diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb
index d65d84e9a6..761aebbf3f 100644
--- a/lib/theme_store/git_importer.rb
+++ b/lib/theme_store/git_importer.rb
@@ -78,7 +78,7 @@ class ThemeStore::GitImporter
     end
 
     Discourse::Utils.execute_command({
-      'GIT_SSH_COMMAND' => "ssh -i #{ssh_folder}/id_rsa"
+      'GIT_SSH_COMMAND' => "ssh -i #{ssh_folder}/id_rsa -o StrictHostKeyChecking=no"
     }, "git", "clone", @url, @temp_folder)
   ensure
     FileUtils.rm_rf ssh_folder
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 2c1103ace6..6394156fcb 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -24,11 +24,6 @@ class TopicCreator
     # this allows us to add errors
     valid = topic.valid?
 
-    # not sure where this should go
-    if !@guardian.is_staff? && staff_only = DiscourseTagging.staff_only_tags(@opts[:tags])
-      topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_only.join(" "))
-    end
-
     DiscourseEvent.trigger(:after_validate_topic, topic, self)
     valid &&= topic.errors.empty?
 
@@ -159,7 +154,19 @@ class TopicCreator
   end
 
   def setup_tags(topic)
-    DiscourseTagging.tag_topic_by_names(topic, @guardian, @opts[:tags])
+    if @opts[:tags].blank?
+      unless @guardian.is_staff? || !guardian.can_tag?(topic)
+        # Validate minimum required tags for a category
+        category = find_category
+        if category.present? && category.minimum_required_tags > 0
+          topic.errors[:base] << I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags)
+          rollback_from_errors!(topic)
+        end
+      end
+    else
+      valid_tags = DiscourseTagging.tag_topic_by_names(topic, @guardian, @opts[:tags])
+      rollback_from_errors!(topic) unless valid_tags
+    end
   end
 
   def setup_auto_close_time(topic)
diff --git a/lib/topic_publisher.rb b/lib/topic_publisher.rb
index 3a901ad1c9..a7cecb7e4f 100644
--- a/lib/topic_publisher.rb
+++ b/lib/topic_publisher.rb
@@ -7,7 +7,8 @@ class TopicPublisher
   end
 
   def publish!
-    TopicTimestampChanger.new(timestamp: Time.zone.now, topic: @topic).change! do
+    published_at = Time.zone.now
+    TopicTimestampChanger.new(timestamp: published_at, topic: @topic).change! do
       if @topic.private_message?
         @topic = TopicConverter.new(@topic, @published_by)
           .convert_to_public_topic(@category_id)
@@ -29,7 +30,11 @@ class TopicPublisher
       op = @topic.first_post
       if op.present?
         op.revisions.delete_all
-        op.update_column(:version, 1)
+        op.update_columns(
+          version: 1,
+          public_version: 1,
+          last_version_at: published_at
+        )
       end
     end
 
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index a6cbacf3f4..563eedf67a 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -482,17 +482,19 @@ class TopicQuery
     end
 
     def apply_shared_drafts(result, category_id, options)
-      viewing_shared = category_id && category_id == SiteSetting.shared_drafts_category.to_i
+      drafts_category_id = SiteSetting.shared_drafts_category.to_i
+      viewing_shared = category_id && category_id == drafts_category_id
 
       if guardian.can_create_shared_draft?
-        result = result.includes(:shared_draft).references(:shared_draft)
-
         if options[:destination_category_id]
           destination_category_id = get_category_id(options[:destination_category_id])
-          return result.where("shared_drafts.category_id" => destination_category_id)
+          topic_ids = SharedDraft.where(category_id: destination_category_id).pluck(:topic_id)
+          return result.where(id: topic_ids)
+        elsif viewing_shared
+          result = result.includes(:shared_draft).references(:shared_draft)
+        else
+          return result.where('topics.category_id != ?', drafts_category_id)
         end
-
-        return result.where("shared_drafts.id IS NULL") unless viewing_shared
       end
 
       result
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 7105748320..1086b8333c 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -105,7 +105,7 @@ class UploadCreator
       @upload
     end
   ensure
-    @file.close! rescue nil
+    @file&.close
   end
 
   def extract_image_info!
@@ -149,7 +149,7 @@ class UploadCreator
       @opts[:content_type] = "image/jpeg"
       extract_image_info!
     else
-      jpeg_tempfile.close! rescue nil
+      jpeg_tempfile&.close
     end
   end
 
diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb
index 397a30b176..f0b7b54a01 100644
--- a/lib/validators/post_validator.rb
+++ b/lib/validators/post_validator.rb
@@ -16,7 +16,6 @@ class Validators::PostValidator < ActiveModel::Validator
     max_images_validator(record)
     max_attachments_validator(record)
     can_post_links_validator(record)
-    newuser_links_validator(record)
     unique_post_validator(record)
   end
 
@@ -82,7 +81,7 @@ class Validators::PostValidator < ActiveModel::Validator
 
   # Ensure new users can not put too many images in a post
   def max_images_validator(post)
-    return if post.acting_user.blank?
+    return if post.acting_user.blank? || post.acting_user&.staff?
 
     if post.acting_user.trust_level < TrustLevel[SiteSetting.min_trust_to_post_images]
       add_error_if_count_exceeded(
@@ -110,10 +109,13 @@ class Validators::PostValidator < ActiveModel::Validator
   end
 
   def can_post_links_validator(post)
-    return if (post.link_count == 0 && !post.has_oneboxes?) ||
+    if (post.link_count == 0 && !post.has_oneboxes?) ||
       Guardian.new(post.acting_user).can_post_link? ||
       private_message?(post)
 
+      return newuser_links_validator(post)
+    end
+
     post.errors.add(:base, I18n.t(:links_require_trust))
   end
 
diff --git a/lib/validators/upload_url_validator.rb b/lib/validators/upload_url_validator.rb
index 527ad2d4e9..899d6afa7a 100644
--- a/lib/validators/upload_url_validator.rb
+++ b/lib/validators/upload_url_validator.rb
@@ -1,7 +1,11 @@
 class UploadUrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if value.present?
-      uri = URI.parse(value) rescue nil
+      uri =
+        begin
+          URI.parse(value)
+        rescue URI::InvalidURIError
+        end
 
       unless uri && Upload.exists?(url: value)
         record.errors[attribute] << (options[:message] || I18n.t('errors.messages.invalid'))
diff --git a/lib/version.rb b/lib/version.rb
index 097cb3b7c4..b6ae4d6a88 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 2
       MINOR = 0
       TINY  = 0
-      PRE   = 'beta5'
+      PRE   = 'beta6'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/plugins/discourse-details/config/locales/client.ar.yml b/plugins/discourse-details/config/locales/client.ar.yml
new file mode 100644
index 0000000000..79ea4de815
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ar.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ar: {}
diff --git a/plugins/discourse-details/config/locales/client.bs_BA.yml b/plugins/discourse-details/config/locales/client.bs_BA.yml
new file mode 100644
index 0000000000..7b73cd2f22
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.bs_BA.yml
@@ -0,0 +1,8 @@
+# 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/
+
+bs_BA: {}
diff --git a/plugins/discourse-details/config/locales/client.ca.yml b/plugins/discourse-details/config/locales/client.ca.yml
new file mode 100644
index 0000000000..e155a119c2
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ca.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ca: {}
diff --git a/plugins/discourse-details/config/locales/client.cs.yml b/plugins/discourse-details/config/locales/client.cs.yml
new file mode 100644
index 0000000000..84323e5eec
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.cs.yml
@@ -0,0 +1,14 @@
+# 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/
+
+cs:
+  js:
+    details:
+      title: Skrýt detaily
+    composer:
+      details_title: Souhrn
+      details_text: "Tento text bude skrytý"
diff --git a/plugins/discourse-details/config/locales/client.da.yml b/plugins/discourse-details/config/locales/client.da.yml
new file mode 100644
index 0000000000..094d94481c
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.da.yml
@@ -0,0 +1,14 @@
+# 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/
+
+da:
+  js:
+    details:
+      title: Skjul detaljer
+    composer:
+      details_title: Resume
+      details_text: "Denne tekst vil blive skjult"
diff --git a/plugins/discourse-details/config/locales/client.de.yml b/plugins/discourse-details/config/locales/client.de.yml
index a55b3688bb..5d0428d8da 100644
--- a/plugins/discourse-details/config/locales/client.de.yml
+++ b/plugins/discourse-details/config/locales/client.de.yml
@@ -1,3 +1,10 @@
+# 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/
+
 de:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.el.yml b/plugins/discourse-details/config/locales/client.el.yml
new file mode 100644
index 0000000000..63bf4b0e2f
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.el.yml
@@ -0,0 +1,8 @@
+# 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/
+
+el: {}
diff --git a/plugins/discourse-details/config/locales/client.es.yml b/plugins/discourse-details/config/locales/client.es.yml
new file mode 100644
index 0000000000..584032ad82
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.es.yml
@@ -0,0 +1,14 @@
+# 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/
+
+es:
+  js:
+    details:
+      title: Ocultar detalles
+    composer:
+      details_title: Resumen
+      details_text: "Este texto estará oculto"
diff --git a/plugins/discourse-details/config/locales/client.et.yml b/plugins/discourse-details/config/locales/client.et.yml
new file mode 100644
index 0000000000..8c601aa1ed
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.et.yml
@@ -0,0 +1,8 @@
+# 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/
+
+et: {}
diff --git a/plugins/discourse-details/config/locales/client.fa_IR.yml b/plugins/discourse-details/config/locales/client.fa_IR.yml
new file mode 100644
index 0000000000..9eb71210db
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.fa_IR.yml
@@ -0,0 +1,14 @@
+# 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/
+
+fa_IR:
+  js:
+    details:
+      title: مخفی کردن جزئیات
+    composer:
+      details_title: خلاصه
+      details_text: "این متن پنهان خواهد شد"
diff --git a/plugins/discourse-details/config/locales/client.fi.yml b/plugins/discourse-details/config/locales/client.fi.yml
index 6b8672a770..d1d1c24431 100644
--- a/plugins/discourse-details/config/locales/client.fi.yml
+++ b/plugins/discourse-details/config/locales/client.fi.yml
@@ -1,3 +1,10 @@
+# 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/
+
 fi:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.fr.yml b/plugins/discourse-details/config/locales/client.fr.yml
index 84f9494dd8..3d9f59970a 100644
--- a/plugins/discourse-details/config/locales/client.fr.yml
+++ b/plugins/discourse-details/config/locales/client.fr.yml
@@ -1,3 +1,10 @@
+# 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/
+
 fr:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.gl.yml b/plugins/discourse-details/config/locales/client.gl.yml
new file mode 100644
index 0000000000..695b5cf287
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.gl.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-details/config/locales/client.he.yml b/plugins/discourse-details/config/locales/client.he.yml
new file mode 100644
index 0000000000..c0a6554785
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.he.yml
@@ -0,0 +1,14 @@
+# 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/
+
+he:
+  js:
+    details:
+      title: הסתרת פרטים
+    composer:
+      details_title: תקציר
+      details_text: "טקסט זה יוסתר"
diff --git a/plugins/discourse-details/config/locales/client.id.yml b/plugins/discourse-details/config/locales/client.id.yml
new file mode 100644
index 0000000000..2112cad6a2
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.id.yml
@@ -0,0 +1,8 @@
+# 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/
+
+id: {}
diff --git a/plugins/discourse-details/config/locales/client.it.yml b/plugins/discourse-details/config/locales/client.it.yml
index d5027e4686..606fc73b3e 100644
--- a/plugins/discourse-details/config/locales/client.it.yml
+++ b/plugins/discourse-details/config/locales/client.it.yml
@@ -1,3 +1,10 @@
+# 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/
+
 it:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.ja.yml b/plugins/discourse-details/config/locales/client.ja.yml
new file mode 100644
index 0000000000..8c2dc00904
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ja.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ja: {}
diff --git a/plugins/discourse-details/config/locales/client.ko.yml b/plugins/discourse-details/config/locales/client.ko.yml
new file mode 100644
index 0000000000..bf4e05d6f4
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ko.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ko: {}
diff --git a/plugins/discourse-details/config/locales/client.lv.yml b/plugins/discourse-details/config/locales/client.lv.yml
new file mode 100644
index 0000000000..dc48bb58ee
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.lv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+lv: {}
diff --git a/plugins/discourse-details/config/locales/client.nb_NO.yml b/plugins/discourse-details/config/locales/client.nb_NO.yml
new file mode 100644
index 0000000000..2231ad9749
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.nb_NO.yml
@@ -0,0 +1,8 @@
+# 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/
+
+nb_NO: {}
diff --git a/plugins/discourse-details/config/locales/client.nl.yml b/plugins/discourse-details/config/locales/client.nl.yml
new file mode 100644
index 0000000000..3ed124da08
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.nl.yml
@@ -0,0 +1,14 @@
+# 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/
+
+nl:
+  js:
+    details:
+      title: Verberg details
+    composer:
+      details_title: Samenvatting
+      details_text: "Deze tekst zal worden verborgen"
diff --git a/plugins/discourse-details/config/locales/client.pl_PL.yml b/plugins/discourse-details/config/locales/client.pl_PL.yml
new file mode 100644
index 0000000000..c04d371e5a
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.pl_PL.yml
@@ -0,0 +1,8 @@
+# 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/
+
+pl_PL: {}
diff --git a/plugins/discourse-details/config/locales/client.pt.yml b/plugins/discourse-details/config/locales/client.pt.yml
new file mode 100644
index 0000000000..d12527a51f
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.pt.yml
@@ -0,0 +1,8 @@
+# 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/
+
+pt: {}
diff --git a/plugins/discourse-details/config/locales/client.pt_BR.yml b/plugins/discourse-details/config/locales/client.pt_BR.yml
new file mode 100644
index 0000000000..bc85fd86b1
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.pt_BR.yml
@@ -0,0 +1,8 @@
+# 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/
+
+pt_BR: {}
diff --git a/plugins/discourse-details/config/locales/client.ro.yml b/plugins/discourse-details/config/locales/client.ro.yml
new file mode 100644
index 0000000000..6ec427828b
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ro.yml
@@ -0,0 +1,14 @@
+# 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/
+
+ro:
+  js:
+    details:
+      title: Ascunde detaliile
+    composer:
+      details_title: Sumar
+      details_text: "Acest text va fi ascuns"
diff --git a/plugins/discourse-details/config/locales/client.ru.yml b/plugins/discourse-details/config/locales/client.ru.yml
new file mode 100644
index 0000000000..5c634ee3d3
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.ru.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ru: {}
diff --git a/plugins/discourse-details/config/locales/client.sk.yml b/plugins/discourse-details/config/locales/client.sk.yml
new file mode 100644
index 0000000000..bcc3a93dc5
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sk.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sk: {}
diff --git a/plugins/discourse-details/config/locales/client.sl.yml b/plugins/discourse-details/config/locales/client.sl.yml
new file mode 100644
index 0000000000..154d194f86
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sl.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sl: {}
diff --git a/plugins/discourse-details/config/locales/client.sq.yml b/plugins/discourse-details/config/locales/client.sq.yml
new file mode 100644
index 0000000000..4526be3162
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sq.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sq: {}
diff --git a/plugins/discourse-details/config/locales/client.sr.yml b/plugins/discourse-details/config/locales/client.sr.yml
new file mode 100644
index 0000000000..7e57a61dd2
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sr.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sr: {}
diff --git a/plugins/discourse-details/config/locales/client.sv.yml b/plugins/discourse-details/config/locales/client.sv.yml
new file mode 100644
index 0000000000..fd54901f75
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sv: {}
diff --git a/plugins/discourse-details/config/locales/client.te.yml b/plugins/discourse-details/config/locales/client.te.yml
new file mode 100644
index 0000000000..49141baa04
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.te.yml
@@ -0,0 +1,8 @@
+# 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/
+
+te: {}
diff --git a/plugins/discourse-details/config/locales/client.th.yml b/plugins/discourse-details/config/locales/client.th.yml
new file mode 100644
index 0000000000..7ed98e15d8
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.th.yml
@@ -0,0 +1,8 @@
+# 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/
+
+th: {}
diff --git a/plugins/discourse-details/config/locales/client.tr_TR.yml b/plugins/discourse-details/config/locales/client.tr_TR.yml
new file mode 100644
index 0000000000..00efffd670
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.tr_TR.yml
@@ -0,0 +1,8 @@
+# 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/
+
+tr_TR: {}
diff --git a/plugins/discourse-details/config/locales/client.uk.yml b/plugins/discourse-details/config/locales/client.uk.yml
new file mode 100644
index 0000000000..3acfff74e8
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.uk.yml
@@ -0,0 +1,8 @@
+# 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/
+
+uk: {}
diff --git a/plugins/discourse-details/config/locales/client.ur.yml b/plugins/discourse-details/config/locales/client.ur.yml
index 8051af4445..2148493258 100644
--- a/plugins/discourse-details/config/locales/client.ur.yml
+++ b/plugins/discourse-details/config/locales/client.ur.yml
@@ -1,3 +1,10 @@
+# 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/
+
 ur:
   js:
     details:
diff --git a/plugins/discourse-details/config/locales/client.vi.yml b/plugins/discourse-details/config/locales/client.vi.yml
new file mode 100644
index 0000000000..fa809fe162
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.vi.yml
@@ -0,0 +1,8 @@
+# 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/
+
+vi: {}
diff --git a/plugins/discourse-details/config/locales/client.zh_CN.yml b/plugins/discourse-details/config/locales/client.zh_CN.yml
new file mode 100644
index 0000000000..53c9902287
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.zh_CN.yml
@@ -0,0 +1,8 @@
+# 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/
+
+zh_CN: {}
diff --git a/plugins/discourse-details/config/locales/client.zh_TW.yml b/plugins/discourse-details/config/locales/client.zh_TW.yml
new file mode 100644
index 0000000000..92c18de9ae
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.zh_TW.yml
@@ -0,0 +1,8 @@
+# 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/
+
+zh_TW: {}
diff --git a/plugins/discourse-details/config/locales/server.ar.yml b/plugins/discourse-details/config/locales/server.ar.yml
new file mode 100644
index 0000000000..79ea4de815
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ar.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ar: {}
diff --git a/plugins/discourse-details/config/locales/server.bs_BA.yml b/plugins/discourse-details/config/locales/server.bs_BA.yml
new file mode 100644
index 0000000000..7b73cd2f22
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.bs_BA.yml
@@ -0,0 +1,8 @@
+# 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/
+
+bs_BA: {}
diff --git a/plugins/discourse-details/config/locales/server.ca.yml b/plugins/discourse-details/config/locales/server.ca.yml
new file mode 100644
index 0000000000..e155a119c2
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ca.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ca: {}
diff --git a/plugins/discourse-details/config/locales/server.cs.yml b/plugins/discourse-details/config/locales/server.cs.yml
new file mode 100644
index 0000000000..c0f2fec763
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.cs.yml
@@ -0,0 +1,8 @@
+# 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/
+
+cs: {}
diff --git a/plugins/discourse-details/config/locales/server.da.yml b/plugins/discourse-details/config/locales/server.da.yml
new file mode 100644
index 0000000000..9ca8189621
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.da.yml
@@ -0,0 +1,8 @@
+# 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/
+
+da: {}
diff --git a/plugins/discourse-details/config/locales/server.de.yml b/plugins/discourse-details/config/locales/server.de.yml
index f1f54d1be4..20962ca5c9 100644
--- a/plugins/discourse-details/config/locales/server.de.yml
+++ b/plugins/discourse-details/config/locales/server.de.yml
@@ -1,3 +1,10 @@
+# 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/
+
 de:
   site_settings:
     details_enabled: "Aktiviert das Details-Plugin. Wenn du dies änderst, musst du alle Beiträge neu „backen“ mit: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.el.yml b/plugins/discourse-details/config/locales/server.el.yml
new file mode 100644
index 0000000000..63bf4b0e2f
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.el.yml
@@ -0,0 +1,8 @@
+# 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/
+
+el: {}
diff --git a/plugins/discourse-details/config/locales/server.es.yml b/plugins/discourse-details/config/locales/server.es.yml
new file mode 100644
index 0000000000..39761e82e6
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.es.yml
@@ -0,0 +1,10 @@
+# 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/
+
+es:
+  site_settings:
+    details_enabled: "Activar el plugin de detalles (details). Si cambias esto debes hacer rebake de todos los mensajes con: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.et.yml b/plugins/discourse-details/config/locales/server.et.yml
new file mode 100644
index 0000000000..8c601aa1ed
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.et.yml
@@ -0,0 +1,8 @@
+# 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/
+
+et: {}
diff --git a/plugins/discourse-details/config/locales/server.fa_IR.yml b/plugins/discourse-details/config/locales/server.fa_IR.yml
new file mode 100644
index 0000000000..3f564b2f11
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.fa_IR.yml
@@ -0,0 +1,8 @@
+# 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/
+
+fa_IR: {}
diff --git a/plugins/discourse-details/config/locales/server.fi.yml b/plugins/discourse-details/config/locales/server.fi.yml
index cc9e0208fb..0937810275 100644
--- a/plugins/discourse-details/config/locales/server.fi.yml
+++ b/plugins/discourse-details/config/locales/server.fi.yml
@@ -1,3 +1,10 @@
+# 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/
+
 fi:
   site_settings:
     details_enabled: "Laita yhteenveto-plugin päälle. Jos muutat: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.fr.yml b/plugins/discourse-details/config/locales/server.fr.yml
index 4066a0937d..d9a93b9293 100644
--- a/plugins/discourse-details/config/locales/server.fr.yml
+++ b/plugins/discourse-details/config/locales/server.fr.yml
@@ -1,3 +1,10 @@
+# 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/
+
 fr:
   site_settings:
     details_enabled: "Activer le plugin details. Si vous modifiez ceci, vous devez exécuter la commande  \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.gl.yml b/plugins/discourse-details/config/locales/server.gl.yml
new file mode 100644
index 0000000000..695b5cf287
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.gl.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-details/config/locales/server.he.yml b/plugins/discourse-details/config/locales/server.he.yml
new file mode 100644
index 0000000000..4f3160d3b9
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.he.yml
@@ -0,0 +1,10 @@
+# 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/
+
+he:
+  site_settings:
+    details_enabled: "הפעלת תוסף הפרטים. שינוי הגדרה זו יאלץ אותך לאפות את הרשומות שלך מחדש עם: „rake posts:rebake”"
diff --git a/plugins/discourse-details/config/locales/server.id.yml b/plugins/discourse-details/config/locales/server.id.yml
new file mode 100644
index 0000000000..2112cad6a2
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.id.yml
@@ -0,0 +1,8 @@
+# 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/
+
+id: {}
diff --git a/plugins/discourse-details/config/locales/server.it.yml b/plugins/discourse-details/config/locales/server.it.yml
index 4e9518a65a..12c5162aab 100644
--- a/plugins/discourse-details/config/locales/server.it.yml
+++ b/plugins/discourse-details/config/locales/server.it.yml
@@ -1,3 +1,8 @@
-it:
-  site_settings:
-    details_enabled: "Abilitare il plugin details. Se modifichi questa opzione devi aggiornare tutti i messaggi con: \"rake posts:rebake\"."
+# 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/
+
+it: {}
diff --git a/plugins/discourse-details/config/locales/server.ja.yml b/plugins/discourse-details/config/locales/server.ja.yml
new file mode 100644
index 0000000000..8c2dc00904
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ja.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ja: {}
diff --git a/plugins/discourse-details/config/locales/server.ko.yml b/plugins/discourse-details/config/locales/server.ko.yml
new file mode 100644
index 0000000000..bf4e05d6f4
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ko.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ko: {}
diff --git a/plugins/discourse-details/config/locales/server.lv.yml b/plugins/discourse-details/config/locales/server.lv.yml
new file mode 100644
index 0000000000..dc48bb58ee
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.lv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+lv: {}
diff --git a/plugins/discourse-details/config/locales/server.nb_NO.yml b/plugins/discourse-details/config/locales/server.nb_NO.yml
new file mode 100644
index 0000000000..2231ad9749
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.nb_NO.yml
@@ -0,0 +1,8 @@
+# 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/
+
+nb_NO: {}
diff --git a/plugins/discourse-details/config/locales/server.nl.yml b/plugins/discourse-details/config/locales/server.nl.yml
new file mode 100644
index 0000000000..bb31021aaa
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.nl.yml
@@ -0,0 +1,8 @@
+# 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/
+
+nl: {}
diff --git a/plugins/discourse-details/config/locales/server.pl_PL.yml b/plugins/discourse-details/config/locales/server.pl_PL.yml
new file mode 100644
index 0000000000..c04d371e5a
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.pl_PL.yml
@@ -0,0 +1,8 @@
+# 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/
+
+pl_PL: {}
diff --git a/plugins/discourse-details/config/locales/server.pt.yml b/plugins/discourse-details/config/locales/server.pt.yml
new file mode 100644
index 0000000000..d12527a51f
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.pt.yml
@@ -0,0 +1,8 @@
+# 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/
+
+pt: {}
diff --git a/plugins/discourse-details/config/locales/server.pt_BR.yml b/plugins/discourse-details/config/locales/server.pt_BR.yml
new file mode 100644
index 0000000000..bc85fd86b1
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.pt_BR.yml
@@ -0,0 +1,8 @@
+# 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/
+
+pt_BR: {}
diff --git a/plugins/discourse-details/config/locales/server.ro.yml b/plugins/discourse-details/config/locales/server.ro.yml
new file mode 100644
index 0000000000..31d1c44013
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ro.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ro: {}
diff --git a/plugins/discourse-details/config/locales/server.ru.yml b/plugins/discourse-details/config/locales/server.ru.yml
new file mode 100644
index 0000000000..5c634ee3d3
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.ru.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ru: {}
diff --git a/plugins/discourse-details/config/locales/server.sk.yml b/plugins/discourse-details/config/locales/server.sk.yml
new file mode 100644
index 0000000000..bcc3a93dc5
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sk.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sk: {}
diff --git a/plugins/discourse-details/config/locales/server.sl.yml b/plugins/discourse-details/config/locales/server.sl.yml
new file mode 100644
index 0000000000..154d194f86
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sl.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sl: {}
diff --git a/plugins/discourse-details/config/locales/server.sq.yml b/plugins/discourse-details/config/locales/server.sq.yml
new file mode 100644
index 0000000000..4526be3162
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sq.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sq: {}
diff --git a/plugins/discourse-details/config/locales/server.sr.yml b/plugins/discourse-details/config/locales/server.sr.yml
new file mode 100644
index 0000000000..7e57a61dd2
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sr.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sr: {}
diff --git a/plugins/discourse-details/config/locales/server.sv.yml b/plugins/discourse-details/config/locales/server.sv.yml
new file mode 100644
index 0000000000..fd54901f75
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sv: {}
diff --git a/plugins/discourse-details/config/locales/server.te.yml b/plugins/discourse-details/config/locales/server.te.yml
new file mode 100644
index 0000000000..49141baa04
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.te.yml
@@ -0,0 +1,8 @@
+# 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/
+
+te: {}
diff --git a/plugins/discourse-details/config/locales/server.th.yml b/plugins/discourse-details/config/locales/server.th.yml
new file mode 100644
index 0000000000..7ed98e15d8
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.th.yml
@@ -0,0 +1,8 @@
+# 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/
+
+th: {}
diff --git a/plugins/discourse-details/config/locales/server.tr_TR.yml b/plugins/discourse-details/config/locales/server.tr_TR.yml
new file mode 100644
index 0000000000..00efffd670
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.tr_TR.yml
@@ -0,0 +1,8 @@
+# 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/
+
+tr_TR: {}
diff --git a/plugins/discourse-details/config/locales/server.uk.yml b/plugins/discourse-details/config/locales/server.uk.yml
new file mode 100644
index 0000000000..3acfff74e8
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.uk.yml
@@ -0,0 +1,8 @@
+# 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/
+
+uk: {}
diff --git a/plugins/discourse-details/config/locales/server.ur.yml b/plugins/discourse-details/config/locales/server.ur.yml
index c97287e9c4..c4e0b1fa94 100644
--- a/plugins/discourse-details/config/locales/server.ur.yml
+++ b/plugins/discourse-details/config/locales/server.ur.yml
@@ -1,3 +1,10 @@
+# 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/
+
 ur:
   site_settings:
     details_enabled: "Enable the details plugin. If you change this, you must rebake all posts with: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.vi.yml b/plugins/discourse-details/config/locales/server.vi.yml
new file mode 100644
index 0000000000..fa809fe162
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.vi.yml
@@ -0,0 +1,8 @@
+# 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/
+
+vi: {}
diff --git a/plugins/discourse-details/config/locales/server.zh_CN.yml b/plugins/discourse-details/config/locales/server.zh_CN.yml
new file mode 100644
index 0000000000..53c9902287
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.zh_CN.yml
@@ -0,0 +1,8 @@
+# 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/
+
+zh_CN: {}
diff --git a/plugins/discourse-details/config/locales/server.zh_TW.yml b/plugins/discourse-details/config/locales/server.zh_TW.yml
new file mode 100644
index 0000000000..92c18de9ae
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.zh_TW.yml
@@ -0,0 +1,8 @@
+# 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/
+
+zh_TW: {}
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt.yml b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
index 0d37e3d5ec..d6f8fb6d76 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
@@ -7,7 +7,12 @@
 
 pt:
   site_settings:
+    discourse_narrative_bot_enabled: 'Ativar Discourse Narrative Bot'
+    disable_discourse_narrative_bot_welcome_post: "Desativar a publicação de boas-vindas do Discourse Narrative Bot"
+    discourse_narrative_bot_ignored_usernames: "Nomes de utilizador que o Discourse Narrative Bot deverá ignorar"
+    discourse_narrative_bot_disable_public_replies: "Desativar as respostas públicas do Discourse Narrative Bot"
     discourse_narrative_bot_welcome_post_type: "O tipo de publicação de boas-vindas que \"Discourse Narrative Bot\" deverá enviar"
+    discourse_narrative_bot_welcome_post_delay: "Aguardar (n) segundos antes de enviar a publicação de boas-vindas do Discurso Narrativa Bot."
   badges:
     certified:
       name: Certificado
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
index 57af13071b..76b2222f7b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -53,6 +53,7 @@ pt_BR:
         quote: "No meio de toda dificuldade reside a oportunidade"
         author: "Albert Einstein"
       '2':
+        quote: "A liberdade não vale a pena se não conota liberdade para errar."
         author: "Mahatma Gandhi"
       '3':
         quote: "Não chore por que acabou, sorria por que aconteceu."
@@ -90,12 +91,16 @@ pt_BR:
         '5': "Você pode contar com ele"
         '6': "Como eu vejo, sim"
         '7': "Provavelmente"
+        '8': "Boa perspectiva"
         '9': "Sim"
+        '10': "Sinais apontam que sim"
         '12': "Pergunte novamente depois"
         '13': "Melhor não falar pra você agora"
+        '15': "Concentre-se e pergunte novamente"
         '16': "Não conte com isso"
         '17': "Minha resposta é não"
         '18': "Minhas fontes dizem que não"
+        '19': "Perspectiva não tão boa"
         '20': "Muito duvidoso"
       result: |-
         > :crystal_ball: %{result}
@@ -136,6 +141,12 @@ pt_BR:
           - Por motivos de segurança, nós temporariamente limitamos o que novos usuários podem fazer. Você vai ganhar novas habilidades (e [emblemas](/badges) ao passo que nós conhecermos melhor você.
 
           - Nós acreditamos em um {comunidade com comportamento civilizado](/guidelines) em todos os momentos.
+      onebox:
+        reply: |-
+          Legal! isto vai funcionar para a maioria dos links. Lembre-se, deve estar na linha _all by itself_, com nada na frente ou atrás.
       images:
         like_not_found: |-
           Você esqueceu de curtir :heart: meu [post?](%{url})
+      formatting:
+        reply: |-
+          Ótimo! HTML e BBCode também servem para formatação - para saber mais, [veja este tutorial](http://commonmark.org/help) :nerd:
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
index f2bbc9d3b1..9b685d9b38 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
@@ -119,10 +119,12 @@ module DiscourseNarrativeBot
         date: Time.zone.now.strftime('%b %d %Y'),
         format: :svg
       }
-
       options.merge!(type: type) if type
+
       src = Discourse.base_url + DiscourseNarrativeBot::Engine.routes.url_helpers.certificate_path(options)
-      "<img class='discobot-certificate' src='#{src}' width='650' height='464' alt='#{I18n.t("#{self.class::I18N_KEY}.certificate.alt")}'>"
+      alt = CGI.escapeHTML(I18n.t("#{self.class::I18N_KEY}.certificate.alt"))
+
+      "<img class='discobot-certificate' src='#{src}' width='650' height='464' alt='#{alt}'>"
     end
 
     protected
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index 9bd4819b5f..26ab1437d6 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -182,8 +182,13 @@ module DiscourseNarrativeBot
       #{instance_eval(&@next_instructions)}
       RAW
 
+      title = I18n.t("#{I18N_KEY}.hello.title", title: SiteSetting.title)
+      if SiteSetting.max_emojis_in_title == 0
+        title = title.gsub(/:([\w\-+]+(?::t\d)?):/, '').strip
+      end
+
       opts = {
-        title: I18n.t("#{I18N_KEY}.hello.title", title: SiteSetting.title),
+        title: title,
         target_usernames: @user.username,
         archetype: Archetype.private_message,
         subtype: TopicSubtype.system_message,
diff --git a/plugins/discourse-narrative-bot/spec/user_spec.rb b/plugins/discourse-narrative-bot/spec/user_spec.rb
index 86dde81499..d0dba54a7e 100644
--- a/plugins/discourse-narrative-bot/spec/user_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/user_spec.rb
@@ -32,6 +32,21 @@ describe User do
         end
       end
 
+      context 'with title emoji disabled' do
+        before do
+          SiteSetting.disable_discourse_narrative_bot_welcome_post = false
+          SiteSetting.max_emojis_in_title = 0
+        end
+
+        it 'initiates the bot' do
+          expect { user }.to change { Topic.count }.by(1)
+
+          expect(Topic.last.title).to eq(I18n.t(
+            'discourse_narrative_bot.new_user_narrative.hello.title'
+          ).gsub(/:robot:/, '').strip)
+        end
+      end
+
       context 'enabled' do
         before do
           SiteSetting.disable_discourse_narrative_bot_welcome_post = false
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml
index 65b70e00fb..6d72a5333e 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ar.yml
@@ -1,3 +1,10 @@
+# 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/
+
 ar:
   site_settings:
     daily_performance_report: "تحليل سجلّات الخادم NGINX يوميًا ونشر موضوع مفصّل مع طاقم الموقع"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.bs_BA.yml b/plugins/discourse-nginx-performance-report/config/locales/server.bs_BA.yml
new file mode 100644
index 0000000000..7b73cd2f22
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.bs_BA.yml
@@ -0,0 +1,8 @@
+# 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/
+
+bs_BA: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ca.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ca.yml
new file mode 100644
index 0000000000..e155a119c2
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ca.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ca: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.cs.yml b/plugins/discourse-nginx-performance-report/config/locales/server.cs.yml
new file mode 100644
index 0000000000..3ee9703c97
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.cs.yml
@@ -0,0 +1,10 @@
+# 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/
+
+cs:
+  site_settings:
+    daily_performance_report: "Analyzovat denní logy NGINX a zaslat téma s podrobnostmi přístupné pouze členům redakce."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.da.yml b/plugins/discourse-nginx-performance-report/config/locales/server.da.yml
new file mode 100644
index 0000000000..9ca8189621
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.da.yml
@@ -0,0 +1,8 @@
+# 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/
+
+da: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.de.yml b/plugins/discourse-nginx-performance-report/config/locales/server.de.yml
index b3614c80ca..d03cf19445 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.de.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.de.yml
@@ -1,3 +1,10 @@
+# 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/
+
 de:
   site_settings:
     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."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.el.yml b/plugins/discourse-nginx-performance-report/config/locales/server.el.yml
new file mode 100644
index 0000000000..63bf4b0e2f
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.el.yml
@@ -0,0 +1,8 @@
+# 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/
+
+el: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.es.yml b/plugins/discourse-nginx-performance-report/config/locales/server.es.yml
index c825ad36cb..b12872ac7f 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.es.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.es.yml
@@ -1,3 +1,10 @@
+# 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/
+
 es:
   site_settings:
-    daily_performance_report: "Analizar registros de NGINX diariamente y publicar un tema para Administradores con los detalles"
+    daily_performance_report: "Analizar los registros de NGINX diariamente y publicar un tema para administradores con los detalles"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.et.yml b/plugins/discourse-nginx-performance-report/config/locales/server.et.yml
new file mode 100644
index 0000000000..8c601aa1ed
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.et.yml
@@ -0,0 +1,8 @@
+# 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/
+
+et: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.fa_IR.yml b/plugins/discourse-nginx-performance-report/config/locales/server.fa_IR.yml
index e579400fae..a2a48af4a4 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.fa_IR.yml
@@ -1,3 +1,10 @@
+# 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/
+
 fa_IR:
   site_settings:
     daily_performance_report: "تحلیل لاگ‌های NGINX و ارسال یک پست شامل جزئیات ویژه مدیران"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.fi.yml b/plugins/discourse-nginx-performance-report/config/locales/server.fi.yml
index 960f5f3189..e438a7bf68 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.fi.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.fi.yml
@@ -1,3 +1,10 @@
+# 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/
+
 fi:
   site_settings:
     daily_performance_report: "Analysoi NGINX lokit päivittäin ja julkaise vain henkilökunnalle näkyvä ketju yksityiskohdista"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.fr.yml b/plugins/discourse-nginx-performance-report/config/locales/server.fr.yml
index 8164b34173..6867c86975 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.fr.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.fr.yml
@@ -1,3 +1,10 @@
+# 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/
+
 fr:
   site_settings:
     daily_performance_report: "Analyser les logs de NGINX quotidiennement et poster un sujet Responsables Uniquement avec les détails"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.gl.yml b/plugins/discourse-nginx-performance-report/config/locales/server.gl.yml
new file mode 100644
index 0000000000..695b5cf287
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.gl.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.he.yml b/plugins/discourse-nginx-performance-report/config/locales/server.he.yml
index 38bd6fc06b..8a96541962 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.he.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.he.yml
@@ -1,3 +1,10 @@
+# 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/
+
 he:
   site_settings:
     daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.id.yml b/plugins/discourse-nginx-performance-report/config/locales/server.id.yml
new file mode 100644
index 0000000000..2112cad6a2
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.id.yml
@@ -0,0 +1,8 @@
+# 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/
+
+id: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.it.yml b/plugins/discourse-nginx-performance-report/config/locales/server.it.yml
new file mode 100644
index 0000000000..12c5162aab
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.it.yml
@@ -0,0 +1,8 @@
+# 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/
+
+it: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ja.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ja.yml
index 3c445c8fde..12af1da55f 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ja.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ja.yml
@@ -1,3 +1,10 @@
+# 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/
+
 ja:
   site_settings:
     daily_performance_report: "日別のNGINXのログを解析し、Staff Onlyトピックへ詳細を投稿する"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ko.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ko.yml
index b5d846206d..7e6a71596b 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ko.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ko.yml
@@ -1,3 +1,10 @@
+# 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/
+
 ko:
   site_settings:
     daily_performance_report: "NGINX 일별 로그를 분석하고 상세정보를 스태프들에게 글타래 게시"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.lv.yml b/plugins/discourse-nginx-performance-report/config/locales/server.lv.yml
new file mode 100644
index 0000000000..dc48bb58ee
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.lv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+lv: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.nb_NO.yml b/plugins/discourse-nginx-performance-report/config/locales/server.nb_NO.yml
new file mode 100644
index 0000000000..2231ad9749
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.nb_NO.yml
@@ -0,0 +1,8 @@
+# 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/
+
+nb_NO: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.nl.yml b/plugins/discourse-nginx-performance-report/config/locales/server.nl.yml
index 63ba82f224..e9b5e384e0 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.nl.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.nl.yml
@@ -1,3 +1,10 @@
+# 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/
+
 nl:
   site_settings:
     daily_performance_report: "Analyseer elke dag NGINX logs en post een Alleen Voor Medewerkers topic met de details"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.pl_PL.yml b/plugins/discourse-nginx-performance-report/config/locales/server.pl_PL.yml
new file mode 100644
index 0000000000..c04d371e5a
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.pl_PL.yml
@@ -0,0 +1,8 @@
+# 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/
+
+pl_PL: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.pt.yml b/plugins/discourse-nginx-performance-report/config/locales/server.pt.yml
index ef5e821867..894545936b 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.pt.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.pt.yml
@@ -1,3 +1,10 @@
+# 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/
+
 pt:
   site_settings:
     daily_performance_report: "Analise os logs diários NGINX e publique um tópico visível apenas para o pessoal com detalhes"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.pt_BR.yml b/plugins/discourse-nginx-performance-report/config/locales/server.pt_BR.yml
index 2ed8d9a529..f1d06bdb06 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.pt_BR.yml
@@ -1,3 +1,10 @@
+# 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/
+
 pt_BR:
   site_settings:
     daily_performance_report: "Analiza logs do NGINX diariamente e cria um tópico na categoria Somente Equipe com os detalhes."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ro.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ro.yml
new file mode 100644
index 0000000000..31d1c44013
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ro.yml
@@ -0,0 +1,8 @@
+# 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/
+
+ro: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ru.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ru.yml
index ff0c212b4c..c4212530c4 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ru.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ru.yml
@@ -1,3 +1,10 @@
+# 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/
+
 ru:
   site_settings:
     daily_performance_report: "Ежедневно анализировать логи сервера NGINX и отправлять сообщение с результатами анализа в тему, видимую только персоналу."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sk.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sk.yml
index 0b53aa1a5e..d2b1d85b8d 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.sk.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sk.yml
@@ -1,3 +1,10 @@
+# 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/
+
 sk:
   site_settings:
     daily_performance_report: "Denne analyzuj NGINX logy a z detailov vytváraj témy iba pre zamestnancov."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sl.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sl.yml
new file mode 100644
index 0000000000..154d194f86
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sl.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sl: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sq.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sq.yml
index 58f330c7a7..463900e4fb 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.sq.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sq.yml
@@ -1,3 +1,10 @@
+# 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/
+
 sq:
   site_settings:
     daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sr.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sr.yml
new file mode 100644
index 0000000000..7e57a61dd2
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sr.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sr: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sv.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sv.yml
new file mode 100644
index 0000000000..fd54901f75
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sv: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.te.yml b/plugins/discourse-nginx-performance-report/config/locales/server.te.yml
new file mode 100644
index 0000000000..49141baa04
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.te.yml
@@ -0,0 +1,8 @@
+# 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/
+
+te: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.th.yml b/plugins/discourse-nginx-performance-report/config/locales/server.th.yml
new file mode 100644
index 0000000000..7ed98e15d8
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.th.yml
@@ -0,0 +1,8 @@
+# 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/
+
+th: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.tr_TR.yml b/plugins/discourse-nginx-performance-report/config/locales/server.tr_TR.yml
index b10f10d50e..c6ce04582f 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.tr_TR.yml
@@ -1,3 +1,10 @@
+# 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/
+
 tr_TR:
   site_settings:
     daily_performance_report: "NGINX kayıtlarını analiz edip detaylı bir şekilde günlük Yetkili kategorisinde bir konu içerisinde paylaş."
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml b/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml
new file mode 100644
index 0000000000..3acfff74e8
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.uk.yml
@@ -0,0 +1,8 @@
+# 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/
+
+uk: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.ur.yml b/plugins/discourse-nginx-performance-report/config/locales/server.ur.yml
index c9ce6b0c70..0d61b8f9d5 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.ur.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.ur.yml
@@ -1,3 +1,10 @@
+# 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/
+
 ur:
   site_settings:
     daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.vi.yml b/plugins/discourse-nginx-performance-report/config/locales/server.vi.yml
index 01743449ec..0ad2a948e2 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.vi.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.vi.yml
@@ -1,3 +1,10 @@
+# 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/
+
 vi:
   site_settings:
     daily_performance_report: "Phân tích nhật ký NGINX hàng ngày và gửi cho BQT thông tin chi tiết"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.zh_CN.yml b/plugins/discourse-nginx-performance-report/config/locales/server.zh_CN.yml
new file mode 100644
index 0000000000..b3ee6f8f27
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.zh_CN.yml
@@ -0,0 +1,10 @@
+# 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/
+
+zh_CN:
+  site_settings:
+    daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到管理人员才能看到的主题"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.zh_TW.yml b/plugins/discourse-nginx-performance-report/config/locales/server.zh_TW.yml
new file mode 100644
index 0000000000..92c18de9ae
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.zh_TW.yml
@@ -0,0 +1,8 @@
+# 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/
+
+zh_TW: {}
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.zn_CN.yml b/plugins/discourse-nginx-performance-report/config/locales/server.zn_CN.yml
deleted file mode 100644
index dd6ab31956..0000000000
--- a/plugins/discourse-nginx-performance-report/config/locales/server.zn_CN.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-zn_CN:
-  site_settings:
-    daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到管理人员才能看到的主题"
diff --git a/plugins/discourse-presence/config/locales/server.es.yml b/plugins/discourse-presence/config/locales/server.es.yml
index 2a7dd93de9..80a5721901 100644
--- a/plugins/discourse-presence/config/locales/server.es.yml
+++ b/plugins/discourse-presence/config/locales/server.es.yml
@@ -8,3 +8,4 @@
 es:
   site_settings:
     presence_enabled: '¿Mostrar usuarios que estén respondiendo al tema, o editando el post actual?'
+    presence_max_users_shown: 'Número máximo de usuarios mostrados.'
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
index 0c0dfb387f..d0f35d1f0a 100644
--- a/plugins/discourse-presence/plugin.rb
+++ b/plugins/discourse-presence/plugin.rb
@@ -2,7 +2,7 @@
 # about: Show which users are writing a reply to a topic
 # version: 1.0
 # authors: André Pereira, David Taylor
-# url: https://github.com/discourse/discourse-presence.git
+# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-presence
 
 enabled_site_setting :presence_enabled
 
diff --git a/plugins/poll/config/locales/client.nl.yml b/plugins/poll/config/locales/client.nl.yml
index b35d6656cd..0f6a052c54 100644
--- a/plugins/poll/config/locales/client.nl.yml
+++ b/plugins/poll/config/locales/client.nl.yml
@@ -55,6 +55,7 @@ nl:
         help:
           options_count: Geef ten minste 2 opties
           invalid_values: Minimale waarde moet kleiner zijn dan de maximale waarde.
+          min_step_value: De minimale waarde voor stap is 1
         poll_type:
           label: Type
           regular: Eén keuze
diff --git a/plugins/poll/config/locales/client.zh_TW.yml b/plugins/poll/config/locales/client.zh_TW.yml
index 5b2348af81..fa2a6ee6b3 100644
--- a/plugins/poll/config/locales/client.zh_TW.yml
+++ b/plugins/poll/config/locales/client.zh_TW.yml
@@ -50,6 +50,7 @@ zh_TW:
         help:
           options_count: 輸入至少 2 個選項
           invalid_values: 最小值必須比最大值小。
+          min_step_value: 最小梯級階值為 1
         poll_type:
           label: 類型
           regular: 單選
diff --git a/plugins/poll/config/locales/server.cs.yml b/plugins/poll/config/locales/server.cs.yml
index 42f6ee729c..9fbc8e7dad 100644
--- a/plugins/poll/config/locales/server.cs.yml
+++ b/plugins/poll/config/locales/server.cs.yml
@@ -37,6 +37,7 @@ cs:
     no_polls_associated_with_this_post: "Tento příspěvek nemá žádné hlasování. "
     no_poll_with_this_name: "Tento příspěvek nemá žádné hlasování se jménem <strong>%{name}</strong>. "
     post_is_deleted: "Operaci na smazaném příspěvku nelze provést."
+    user_cant_post_in_topic: "Nemůžete hlasovat, protože v tomto tématu nemůžete odesílat příspěvky."
     topic_must_be_open_to_vote: "Téma musí být otevřené, aby bylo možné hlasovat."
     poll_must_be_open_to_vote: "Hlasování musí být otevřené, aby bylo možné hlasovat."
     topic_must_be_open_to_toggle_status: "Téma musí být otevřené, aby bylo možné změnit status."
diff --git a/plugins/poll/config/locales/server.es.yml b/plugins/poll/config/locales/server.es.yml
index 11c4d70619..8ffbdd082d 100644
--- a/plugins/poll/config/locales/server.es.yml
+++ b/plugins/poll/config/locales/server.es.yml
@@ -35,6 +35,7 @@ es:
     no_polls_associated_with_this_post: "No hay encuestas asociadas a este post."
     no_poll_with_this_name: "No hay ninguna encuesta llamada <strong>%{name}</strong> asociada con este post."
     post_is_deleted: "No se puede actuar en un post eliminado."
+    user_cant_post_in_topic: "No puedes votar porque no puedes publicar en este tema."
     topic_must_be_open_to_vote: "Este tema debe estar abierto para votar."
     poll_must_be_open_to_vote: "La encuesta debe estar abierta para votar."
     topic_must_be_open_to_toggle_status: "Este tema debe estar abierto para cambiar entre estados."
diff --git a/plugins/poll/config/locales/server.id.yml b/plugins/poll/config/locales/server.id.yml
index 571a259624..b2fe013e06 100644
--- a/plugins/poll/config/locales/server.id.yml
+++ b/plugins/poll/config/locales/server.id.yml
@@ -7,6 +7,7 @@
 
 id:
   site_settings:
+    poll_enabled: "Izinkan jajak pendapat?"
     poll_maximum_options: "Nomor maksimum dari pilihan yang diperbolehkan di sebuah polling."
     poll_edit_window_mins: "Menit setelah postingan dibuat dimana polling masih bisa diedit."
   poll:
diff --git a/plugins/poll/config/locales/server.nl.yml b/plugins/poll/config/locales/server.nl.yml
index 0d21198eb7..5d11a483a1 100644
--- a/plugins/poll/config/locales/server.nl.yml
+++ b/plugins/poll/config/locales/server.nl.yml
@@ -7,8 +7,10 @@
 
 nl:
   site_settings:
+    poll_enabled: "Polls toestaan?"
     poll_maximum_options: "Maximale aantal toegestane opties in een poll."
     poll_edit_window_mins: "Aantal minuten na het aanmaken van een bericht waarin polls kunnen worden bewerkt."
+    poll_minimum_trust_level_to_create: "Het minimale vertrouwensniveau dat nodig is om polls aan te maken."
   poll:
     multiple_polls_without_name: "Er zijn meerdere polls zonder naam. Gebruik het attribuut '<code>naam</code>' om uw polls uniek te identificeren."
     multiple_polls_with_same_name: "Er zijn meerdere polls met dezelfde naam : <strong>%{name}</strong>. Gebruik het attribuut '<code>naam</code>' om uw polls uniek te identificeren."
@@ -33,9 +35,11 @@ nl:
     no_polls_associated_with_this_post: "Er zijn geen polls aan dit bericht gekoppeld."
     no_poll_with_this_name: "Er is geen poll met de naam <strong>%{name}</strong> aan dit bericht gekoppeld."
     post_is_deleted: "Dit kan niet bij een verwijderd bericht."
+    user_cant_post_in_topic: "Je kunt niet stemmen omdat je niet in dit topic kunt posten."
     topic_must_be_open_to_vote: "Het topic moet geopend zijn om te kunnen stemmen."
     poll_must_be_open_to_vote: "De poll moet geopend zijn om te kunnen stemmen."
     topic_must_be_open_to_toggle_status: "Het topic moet geopend zijn om de status te kunnen omschakelen."
     only_staff_or_op_can_toggle_status: "Alleen een staflid of de oorspronkelijke plaatser van een bericht kan de status van een poll omschakelen."
+    insufficient_rights_to_create: "Je hebt geen toestemming om polls te maken."
     email:
       link_to_poll: "Klik om de poll te bekijken."
diff --git a/plugins/poll/config/locales/server.sk.yml b/plugins/poll/config/locales/server.sk.yml
index cc79c282c1..7f8627d64f 100644
--- a/plugins/poll/config/locales/server.sk.yml
+++ b/plugins/poll/config/locales/server.sk.yml
@@ -37,6 +37,7 @@ sk:
     no_polls_associated_with_this_post: "S týmto príspevkom nie sú spojené žiadne hlasovania."
     no_poll_with_this_name: "S týmto príspevkom nie je spojené žiadne hlasovanie s názvom <strong>%{name}</strong>."
     post_is_deleted: "Na vymazanom príspevku nie je možné vykonať."
+    user_cant_post_in_topic: "K tomuto príspevku nemôžeš prispieť a preto nemôžeš ani hlasovať."
     topic_must_be_open_to_vote: "Na odovzdanie hlasu téma otvorená."
     poll_must_be_open_to_vote: "Na odovzdanie hlasu musí byť hlasovanie otvorené."
     topic_must_be_open_to_toggle_status: "Na zmenu stavu musí byť téma otvorená."
diff --git a/plugins/poll/config/locales/server.ur.yml b/plugins/poll/config/locales/server.ur.yml
index 5541bc579f..ed97700726 100644
--- a/plugins/poll/config/locales/server.ur.yml
+++ b/plugins/poll/config/locales/server.ur.yml
@@ -35,6 +35,7 @@ ur:
     no_polls_associated_with_this_post: "کوئی پول اس پوسٹ کے ساتھ منسلک نہیں ہیں۔"
     no_poll_with_this_name: "کوئی پول جس کا نام <strong>%{نام}</strong> ہو، اس پوسٹ کے ساتھ منسلک نہیں ہے۔"
     post_is_deleted: "حذف کر دی گی پوست پر کام نہیں کیا جا سکتا۔"
+    user_cant_post_in_topic: "آپ ووٹ نہیں کر سکتے کیونکہ آپ اِس ٹاپک میں پوسٹ نہیں کر سکتے ہیں۔"
     topic_must_be_open_to_vote: "ووٹ کرنے کیلیے ٹاپک کا کھلا ہونا ضروری ہے۔"
     poll_must_be_open_to_vote: "ووٹ کرنے کیلیے پول کا کھلا ہونا ضروری ہے۔"
     topic_must_be_open_to_toggle_status: "سٹیٹس بدلنے کیلیے ٹاپک کا کھلا ہونا ضروری ہے۔"
diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
index 69f9fb4365..99f4fd300c 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
@@ -1,6 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
-import { replaceCurrentUser } from "discourse/plugins/poll/helpers/replace-current-user";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 
 acceptance("Poll Builder - polls are disabled", {
diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
index 4f210446f4..5f407a958f 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
@@ -1,6 +1,5 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
-import { replaceCurrentUser } from "discourse/plugins/poll/helpers/replace-current-user";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 
 acceptance("Poll Builder - polls are enabled", {
diff --git a/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6 b/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6
deleted file mode 100644
index 59161ed6bd..0000000000
--- a/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-export function replaceCurrentUser(properties) {
-  const currentUser = Discourse.User.current();
-  currentUser.setProperties(properties);
-  Discourse.User.resetCurrent(currentUser);
-}
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 56a7272a14..03a62dcc22 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -90,6 +90,10 @@ class ImportScripts::Base
       SiteSetting.set(key, value)
     end
 
+    # Some changes that should not be rolled back after the script is done
+    SiteSetting.purge_unactivated_users_grace_period_days = 60
+    SiteSetting.purge_deleted_uploads_grace_period_days = 90
+
     RateLimiter.disable
   end
 
diff --git a/script/import_scripts/drupal-6.rb b/script/import_scripts/drupal-6.rb
index 018a1fba90..9b7b1f2628 100644
--- a/script/import_scripts/drupal-6.rb
+++ b/script/import_scripts/drupal-6.rb
@@ -115,8 +115,8 @@ class ImportScripts::Drupal < ImportScripts::Base
         FROM node n
         LEFT JOIN forum f ON f.vid=n.vid
         LEFT JOIN node_revisions nr ON nr.vid=n.vid
-        WHERE node.type = 'forum'
-          AND node.status = 1
+        WHERE n.type = 'forum'
+          AND n.status = 1
 	LIMIT #{batch_size}
           OFFSET #{offset};
       ", cache_rows: false)
@@ -152,9 +152,9 @@ class ImportScripts::Drupal < ImportScripts::Base
       SELECT COUNT(*) count
       FROM comments c
       LEFT JOIN node n ON n.nid=c.nid
-      WHERE node.type IN #{node_types}
-      AND node.status = 1
-      AND comments.status=0;
+      WHERE n.type IN #{node_types}
+      AND n.status = 1
+      AND c.status=0;
     ").first['count']
 
     batch_size = 1000
diff --git a/script/import_scripts/getsatisfaction.rb b/script/import_scripts/getsatisfaction.rb
index 4c6af21938..0111b5c8b5 100644
--- a/script/import_scripts/getsatisfaction.rb
+++ b/script/import_scripts/getsatisfaction.rb
@@ -15,6 +15,10 @@
 #
 # You need to call fix_quotes_in_csv() for CSV files that use \" to escape quotes within quoted fields.
 # The import script expects quotes to be escaped with "".
+#
+# It's likely that some posts in replies.csv aren't in the correct order. Currently the import script doesn't handle
+# that correctly and will import the replies in the wrong order.
+# You should run `rake posts:reorder_posts` after the import.
 
 require 'csv'
 require 'set'
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index 46265220a8..dfaf74f68f 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -197,11 +197,7 @@ module ImportScripts::Mbox
     end
 
     def extract_reply_message_ids(mail)
-      message_ids = [mail.in_reply_to, Email::Receiver.extract_references(mail.references)]
-      message_ids.flatten!
-      message_ids.select!(&:present?)
-      message_ids.uniq!
-      message_ids.first(20)
+      Email::Receiver.extract_reply_message_ids(mail, max_message_id_count: 20)
     end
 
     def extract_subject(receiver, list_name)
diff --git a/script/plugin-translations.rb b/script/plugin-translations.rb
index c01e804a8c..430fe99b2c 100644
--- a/script/plugin-translations.rb
+++ b/script/plugin-translations.rb
@@ -19,6 +19,7 @@ class PluginTxUpdater
     'discourse-canned-replies',
     'discourse-characters-required',
     'discourse-chat-integration',
+    'discourse-chronos',
     'discourse-data-explorer',
     'discourse-math',
     'discourse-oauth2-basic',
diff --git a/script/pull_translations.rb b/script/pull_translations.rb
index b1be6f3231..8b5faedb41 100644
--- a/script/pull_translations.rb
+++ b/script/pull_translations.rb
@@ -13,7 +13,9 @@ require_relative '../lib/i18n/locale_file_walker'
 
 YML_DIRS = ['config/locales',
             'plugins/poll/config/locales',
+            'plugins/discourse-details/config/locales',
             'plugins/discourse-narrative-bot/config/locales',
+            'plugins/discourse-nginx-performance-report/config/locales',
             'plugins/discourse-presence/config/locales']
 YML_FILE_PREFIXES = ['server', 'client']
 
@@ -46,14 +48,18 @@ def yml_path(dir, prefix, language)
   File.expand_path(path, __FILE__)
 end
 
-languages = get_languages.select { |x| x != 'en' }.sort
+def yml_path_if_exists(dir, prefix, language)
+  path = yml_path(dir, prefix, language)
+  File.exists?(path) ? path : nil
+end
 
-# 'ur' translations still have invalid interpolation that breaks the build
-languages -= ['ur']
+languages = get_languages.select { |x| x != 'en' }.sort
 
 # ensure that all locale files exists. tx doesn't create missing locale files during pull
 YML_DIRS.each do |dir|
   YML_FILE_PREFIXES.each do |prefix|
+    next unless yml_path_if_exists(dir, prefix, 'en')
+
     languages.each do |language|
       filename = yml_path(dir, prefix, language)
       FileUtils.touch(filename) unless File.exists?(filename)
@@ -87,11 +93,6 @@ YML_FILE_COMMENTS = <<END
 # https://www.transifex.com/projects/p/discourse-org/
 END
 
-def yml_path_if_exists(dir, prefix, language)
-  path = yml_path(dir, prefix, language)
-  File.exists?(path) ? path : nil
-end
-
 # Add comments to the top of files and replace the language (first key in YAML file)
 def update_file_header(filename, language)
   lines = File.readlines(filename)
diff --git a/spec/components/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb
index 86b5345042..65f811ef51 100644
--- a/spec/components/crawler_detection_spec.rb
+++ b/spec/components/crawler_detection_spec.rb
@@ -28,6 +28,12 @@ describe CrawlerDetection do
       expect(described_class.crawler?("Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)")).to eq(true)
       expect(described_class.crawler?("Baiduspider+(+http://www.baidu.com/search/spider.htm)")).to eq(true)
       expect(described_class.crawler?("Mozilla/5.0 (compatible; YandexBot/3.0; +http://yandex.com/bots)")).to eq(true)
+
+      expect(described_class.crawler?("DiscourseAPI Ruby Gem 0.19.0")).to eq(true)
+      expect(described_class.crawler?("Pingdom.com_bot_version_1.4_(http://www.pingdom.com/)")).to eq(true)
+      expect(described_class.crawler?("LogicMonitor SiteMonitor/1.0")).to eq(true)
+      expect(described_class.crawler?("Java/1.8.0_151")).to eq(true)
+      expect(described_class.crawler?("Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)")).to eq(true)
     end
 
     it "returns false for non-crawler user agents" do
@@ -37,13 +43,106 @@ describe CrawlerDetection do
       expect(described_class.crawler?("Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25")).to eq(false)
       expect(described_class.crawler?("Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0")).to eq(false)
       expect(described_class.crawler?("Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30")).to eq(false)
-
-      expect(described_class.crawler?("DiscourseAPI Ruby Gem 0.19.0")).to eq(true)
-      expect(described_class.crawler?("Pingdom.com_bot_version_1.4_(http://www.pingdom.com/)")).to eq(true)
-      expect(described_class.crawler?("LogicMonitor SiteMonitor/1.0")).to eq(true)
-      expect(described_class.crawler?("Java/1.8.0_151")).to eq(true)
-      expect(described_class.crawler?("Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)")).to eq(true)
     end
 
   end
+
+  describe 'allow_crawler?' do
+    it 'returns true if whitelist and blacklist are blank' do
+      expect(CrawlerDetection.allow_crawler?('Googlebot/2.1 (+http://www.google.com/bot.html)')).to eq(true)
+    end
+
+    context 'whitelist is set' do
+      before do
+        SiteSetting.whitelisted_crawler_user_agents = 'Googlebot|Twitterbot'
+      end
+
+      it 'returns true for matching user agents' do
+        expect(CrawlerDetection.allow_crawler?('Googlebot/2.1 (+http://www.google.com/bot.html)')).to eq(true)
+        expect(CrawlerDetection.allow_crawler?('Googlebot-Image/1.0')).to eq(true)
+        expect(CrawlerDetection.allow_crawler?('Twitterbot')).to eq(true)
+      end
+
+      it 'returns false for user agents that do not match' do
+        expect(CrawlerDetection.allow_crawler?('facebookexternalhit/1.1 (+http(s)://www.facebook.com/externalhit_uatext.php)')).to eq(false)
+        expect(CrawlerDetection.allow_crawler?('Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)')).to eq(false)
+        expect(CrawlerDetection.allow_crawler?('')).to eq(false)
+      end
+
+      context 'and blacklist is set' do
+        before do
+          SiteSetting.blacklisted_crawler_user_agents = 'Googlebot-Image'
+        end
+
+        it 'ignores the blacklist' do
+          expect(CrawlerDetection.allow_crawler?('Googlebot-Image/1.0')).to eq(true)
+        end
+      end
+    end
+
+    context 'blacklist is set' do
+      before do
+        SiteSetting.blacklisted_crawler_user_agents = 'Googlebot|Twitterbot'
+      end
+
+      it 'returns true for crawlers that do not match' do
+        expect(CrawlerDetection.allow_crawler?('Mediapartners-Google')).to eq(true)
+        expect(CrawlerDetection.allow_crawler?('facebookexternalhit/1.1 (+http(s)://www.facebook.com/externalhit_uatext.php)')).to eq(true)
+        expect(CrawlerDetection.allow_crawler?('')).to eq(true)
+      end
+
+      it 'returns false for user agents that match' do
+        expect(CrawlerDetection.allow_crawler?('Googlebot/2.1 (+http://www.google.com/bot.html)')).to eq(false)
+        expect(CrawlerDetection.allow_crawler?('Googlebot-Image/1.0')).to eq(false)
+        expect(CrawlerDetection.allow_crawler?('Twitterbot')).to eq(false)
+      end
+    end
+  end
+
+  describe 'is_blocked_crawler?' do
+    it 'is false if user agent is a crawler and no whitelist or blacklist is defined' do
+      expect(CrawlerDetection.is_blocked_crawler?('Twitterbot')).to eq(false)
+    end
+
+    it 'is false if user agent is not a crawler and no whitelist or blacklist is defined' do
+      expect(CrawlerDetection.is_blocked_crawler?('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36')).to eq(false)
+    end
+
+    it 'is true if user agent is a crawler and is not whitelisted' do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+      expect(CrawlerDetection.is_blocked_crawler?('Twitterbot')).to eq(true)
+    end
+
+    it 'is false if user agent is not a crawler and there is a whitelist' do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+      expect(CrawlerDetection.is_blocked_crawler?('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36')).to eq(false)
+    end
+
+    it 'is true if user agent is a crawler and is blacklisted' do
+      SiteSetting.blacklisted_crawler_user_agents = 'Twitterbot'
+      expect(CrawlerDetection.is_blocked_crawler?('Twitterbot')).to eq(true)
+    end
+
+    it 'is true if user agent is a crawler and is not blacklisted' do
+      SiteSetting.blacklisted_crawler_user_agents = 'Twitterbot'
+      expect(CrawlerDetection.is_blocked_crawler?('Googlebot')).to eq(false)
+    end
+
+    it 'is false if user agent is not a crawler and blacklist is defined' do
+      SiteSetting.blacklisted_crawler_user_agents = 'Mozilla'
+      expect(CrawlerDetection.is_blocked_crawler?('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36')).to eq(false)
+    end
+
+    it 'is true if user agent is missing and whitelist is defined' do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+      expect(CrawlerDetection.is_blocked_crawler?('')).to eq(true)
+      expect(CrawlerDetection.is_blocked_crawler?(nil)).to eq(true)
+    end
+
+    it 'is false if user agent is missing and blacklist is defined' do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+      expect(CrawlerDetection.is_blocked_crawler?('')).to eq(false)
+      expect(CrawlerDetection.is_blocked_crawler?(nil)).to eq(false)
+    end
+  end
 end
diff --git a/spec/components/discourse_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb
index b6b00018e6..82ecbbe680 100644
--- a/spec/components/discourse_plugin_registry_spec.rb
+++ b/spec/components/discourse_plugin_registry_spec.rb
@@ -168,6 +168,13 @@ describe DiscoursePluginRegistry do
       expect(registry.admin_javascripts.count).to eq(1)
       expect(registry.javascripts.count).to eq(0)
     end
+
+    it "registers vendored_core_pretty_text properly" do
+      registry.register_asset("my_lib.js", :vendored_core_pretty_text)
+
+      expect(registry.vendored_core_pretty_text.count).to eq(1)
+      expect(registry.javascripts.count).to eq(0)
+    end
   end
 
   context '#register_seed_data' do
diff --git a/spec/components/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb
index ab15f0b0d2..d9660ef2d3 100644
--- a/spec/components/discourse_tagging_spec.rb
+++ b/spec/components/discourse_tagging_spec.rb
@@ -7,11 +7,12 @@ require 'discourse_tagging'
 
 describe DiscourseTagging do
 
+  let(:admin) { Fabricate(:admin) }
   let(:user)  { Fabricate(:user) }
 
-  let!(:tag1) { Fabricate(:tag, name: "tag1") }
-  let!(:tag2) { Fabricate(:tag, name: "tag2") }
-  let!(:tag3) { Fabricate(:tag, name: "tag3") }
+  let!(:tag1) { Fabricate(:tag, name: "fun") }
+  let!(:tag2) { Fabricate(:tag, name: "fun2") }
+  let!(:tag3) { Fabricate(:tag, name: "fun3") }
 
   before do
     SiteSetting.tagging_enabled = true
@@ -25,7 +26,7 @@ describe DiscourseTagging do
         tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user),
           selected_tags: [tag2.name],
           for_input: true,
-          term: 'tag'
+          term: 'fun'
         ).map(&:name)
         expect(tags).to contain_exactly(tag1.name, tag3.name)
       end
@@ -37,6 +38,86 @@ describe DiscourseTagging do
         ).map(&:name)
         expect(tags).to contain_exactly(tag1.name, tag3.name)
       end
+
+      context 'with tags visible only to staff' do
+        let(:hidden_tag) { Fabricate(:tag) }
+        let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+        it 'should return all tags to staff' do
+          tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(admin)).to_a
+          expect(tags).to contain_exactly(tag1, tag2, tag3, hidden_tag)
+          expect(tags.size).to eq(4)
+        end
+
+        it 'should not return hidden tag to non-staff' do
+          tags = DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user)).to_a
+          expect(tags).to contain_exactly(tag1, tag2, tag3)
+          expect(tags.size).to eq(3)
+        end
+      end
+    end
+  end
+
+  describe 'filter_visible' do
+    let(:hidden_tag) { Fabricate(:tag) }
+    let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+    let(:topic) { Fabricate(:topic, tags: [tag1, tag2, tag3, hidden_tag]) }
+
+    it 'returns all tags to staff' do
+      tags = DiscourseTagging.filter_visible(topic.tags, Guardian.new(admin))
+      expect(tags.size).to eq(4)
+      expect(tags).to contain_exactly(tag1, tag2, tag3, hidden_tag)
+    end
+
+    it 'does not return hidden tags to non-staff' do
+      tags = DiscourseTagging.filter_visible(topic.tags, Guardian.new(user))
+      expect(tags.size).to eq(3)
+      expect(tags).to contain_exactly(tag1, tag2, tag3)
+    end
+  end
+
+  describe 'tag_topic_by_names' do
+    context 'staff-only tags' do
+      let(:topic) { Fabricate(:topic) }
+
+      before do
+        SiteSetting.staff_tags = "alpha"
+      end
+
+      it "regular users can't add staff-only tags" do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), ['alpha'])
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(I18n.t("tags.staff_tag_disallowed", tag: 'alpha'))
+      end
+
+      it 'staff can add staff-only tags' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), ['alpha'])
+        expect(valid).to eq(true)
+        expect(topic.errors[:base]).to be_empty
+      end
+    end
+
+    context 'respects category minimum_required_tags setting' do
+      let(:category) { Fabricate(:category, minimum_required_tags: 2) }
+      let(:topic) { Fabricate(:topic, category: category) }
+
+      it 'when tags are less than minimum_required_tags' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag1.name])
+        expect(valid).to eq(false)
+        expect(topic.errors[:base]&.first).to eq(I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
+      end
+
+      it 'when tags are equal to minimum_required_tags' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), [tag1.name, tag2.name])
+        expect(valid).to eq(true)
+        expect(topic.errors[:base]).to be_empty
+      end
+
+      it 'lets admin tag a topic regardless of minimum_required_tags' do
+        valid = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), [tag1.name])
+        expect(valid).to eq(true)
+        expect(topic.errors[:base]).to be_empty
+      end
     end
   end
 end
diff --git a/spec/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb.rb
similarity index 100%
rename from spec/discourse_tagging_spec.rb
rename to spec/components/discourse_tagging_spec.rb.rb
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index 4c3a562f92..ef1f2f161c 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -412,7 +412,7 @@ describe Email::Receiver do
       expect(topic.posts.last.created_at).to be_within(1.minute).of(DateTime.now)
     end
 
-    it "accepts emails with wrong reply key if the system knows about the forwareded email" do
+    it "accepts emails with wrong reply key if the system knows about the forwarded email" do
       Fabricate(:incoming_email,
                 raw: <<~RAW,
                   Return-Path: <discourse@bar.com>
@@ -549,6 +549,27 @@ describe Email::Receiver do
 
     end
 
+    context "when message sent to a group has no key and find_related_post_with_key is enabled" do
+      let!(:topic) do
+        SiteSetting.find_related_post_with_key = true
+        process(:email_reply_1)
+        Topic.last
+      end
+
+      it "creates a reply when the sender and referenced message id are known" do
+        expect { process(:email_reply_2) }.to change { topic.posts.count }.by(1).and change { Topic.count }.by(0)
+      end
+
+      it "creates a new topic when the sender is not known" do
+        IncomingEmail.where(message_id: '34@foo.bar.mail').update(cc_addresses: 'three@foo.com')
+        expect { process(:email_reply_2) }.to change { topic.posts.count }.by(0).and change { Topic.count }.by(1)
+      end
+
+      it "creates a new topic when the referenced message id is not known" do
+        IncomingEmail.where(message_id: '34@foo.bar.mail').update(message_id: '99@foo.bar.mail')
+        expect { process(:email_reply_2) }.to change { topic.posts.count }.by(0).and change { Topic.count }.by(1)
+      end
+    end
   end
 
   context "new topic in a category" do
@@ -886,4 +907,12 @@ describe Email::Receiver do
       end
     end
   end
+
+  it "tries to fix unparsable email addresses in To and CC headers" do
+    expect { process(:unparsable_email_addresses) }.to raise_error(Email::Receiver::BadDestinationAddress)
+
+    email = IncomingEmail.last
+    expect(email.to_addresses).to eq("foo@bar.com")
+    expect(email.cc_addresses).to eq("bob@example.com;carol@example.com")
+  end
 end
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index 5cb93e533e..1d2d8887b2 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -22,8 +22,7 @@ describe FinalDestination do
         when 'force.get.com' then '22.102.29.40'
         when 'wikipedia.com' then '1.2.3.4'
         else
-          as_ip = IPAddr.new(host) rescue nil
-          raise "couldn't lookup #{host}" if as_ip.nil?
+          as_ip = IPAddr.new(host)
           host
         end
       end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 9d715817f4..41e65232d7 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -2186,6 +2186,35 @@ describe Guardian do
     it 'is false without a user to look at' do
       expect(Guardian.new(admin).can_grant_title?(nil)).to be_falsey
     end
+
+    context 'with title argument' do
+      let(:title_badge) { Fabricate(:badge, name: 'Helper', allow_title: true) }
+      let(:no_title_badge) { Fabricate(:badge, name: 'Writer', allow_title: false) }
+      let(:group) { Fabricate(:group, title: 'Groupie') }
+
+      it 'returns true if title belongs to a badge that user has' do
+        BadgeGranter.grant(title_badge, user)
+        expect(Guardian.new(user).can_grant_title?(user, title_badge.name)).to eq(true)
+      end
+
+      it "returns false if title belongs to a badge that user doesn't have" do
+        expect(Guardian.new(user).can_grant_title?(user, title_badge.name)).to eq(false)
+      end
+
+      it "returns false if title belongs to a badge that user has but can't be used as a title" do
+        BadgeGranter.grant(no_title_badge, user)
+        expect(Guardian.new(user).can_grant_title?(user, no_title_badge.name)).to eq(false)
+      end
+
+      it 'returns true if title is from a group the user belongs to' do
+        group.add(user)
+        expect(Guardian.new(user).can_grant_title?(user, group.title)).to eq(true)
+      end
+
+      it "returns false if title is from a group the user doesn't belong to" do
+        expect(Guardian.new(user).can_grant_title?(user, group.title)).to eq(false)
+      end
+    end
   end
 
   describe 'can_change_trust_level?' do
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index bc7b1d608e..96262e78ed 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -9,6 +9,7 @@ describe Middleware::RequestTracker do
       "HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36",
       "REQUEST_URI" => "/path?bla=1",
       "REQUEST_METHOD" => "GET",
+      "HTTP_ACCEPT" => "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
       "rack.input" => ""
     }.merge(opts)
   end
@@ -235,7 +236,7 @@ describe Middleware::RequestTracker do
     def app(result, sql_calls: 0, redis_calls: 0)
       lambda do |env|
         sql_calls.times do
-          User.where(id: -100).first
+          User.where(id: -100).pluck(:id)
         end
         redis_calls.times do
           $redis.get("x")
@@ -260,6 +261,10 @@ describe Middleware::RequestTracker do
     end
 
     it "can correctly log detailed data" do
+
+      # ensure pg is warmed up with the select 1 query
+      User.where(id: -100).pluck(:id)
+
       tracker = Middleware::RequestTracker.new(app([200, {}, []], sql_calls: 2, redis_calls: 2))
       tracker.call(env)
 
@@ -273,4 +278,58 @@ describe Middleware::RequestTracker do
       expect(timing[:redis][:calls]).to eq 2
     end
   end
+
+  context "crawler blocking" do
+    let :middleware do
+      app = lambda do |env|
+        [200, {}, ['OK']]
+      end
+
+      Middleware::RequestTracker.new(app)
+    end
+
+    def expect_success_response(status, _, response)
+      expect(status).to eq(200)
+      expect(response).to eq(['OK'])
+    end
+
+    def expect_blocked_response(status, _, response)
+      expect(status).to eq(403)
+      expect(response).to eq(['Crawler is not allowed'])
+    end
+
+    it "applies whitelisted_crawler_user_agents correctly" do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+      expect_success_response(*middleware.call(env))
+      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'Twitterbot')))
+      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)')))
+      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'DiscourseAPI Ruby Gem 0.19.0')))
+    end
+
+    it "applies blacklisted_crawler_user_agents correctly" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+      expect_success_response(*middleware.call(env))
+      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)')))
+      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'Twitterbot')))
+      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'DiscourseAPI Ruby Gem 0.19.0')))
+    end
+
+    it "blocked crawlers shouldn't log page views" do
+      ApplicationRequest.clear_cache!
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+      expect {
+        middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'))
+        ApplicationRequest.write_cache!
+      }.to_not change { ApplicationRequest.count }
+    end
+
+    it "allows json requests" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+      expect_success_response(*middleware.call(env(
+        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)',
+        'HTTP_ACCEPT' => 'application/json'
+      )))
+    end
+  end
+
 end
diff --git a/spec/components/migration/column_dropper_spec.rb b/spec/components/migration/column_dropper_spec.rb
index 8d3c4ad6f3..9a0bd536e2 100644
--- a/spec/components/migration/column_dropper_spec.rb
+++ b/spec/components/migration/column_dropper_spec.rb
@@ -4,49 +4,110 @@ require_dependency 'migration/column_dropper'
 RSpec.describe Migration::ColumnDropper do
 
   def has_column?(table, column)
-    Topic.exec_sql("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
-                    WHERE
-                      table_schema = 'public' AND
-                      table_name = :table AND
-                      column_name = :column
-                   ",
-                      table: table, column: column
-                  ).to_a.length == 1
+    ActiveRecord::Base.exec_sql(<<~SQL, table: table, column: column).to_a.length == 1
+      SELECT 1
+      FROM INFORMATION_SCHEMA.COLUMNS
+      WHERE
+        table_schema = 'public' AND
+        table_name = :table AND
+        column_name = :column
+    SQL
   end
 
-  it "can correctly drop columns after correct delay" do
-    Topic.exec_sql "ALTER TABLE topics ADD COLUMN junk int"
-    name = Topic
-      .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
-      .getvalue(0, 0)
+  def update_first_migration_date(created_at)
+    ActiveRecord::Base.exec_sql(<<~SQL, created_at: created_at)
+        UPDATE schema_migration_details
+        SET created_at = :created_at
+        WHERE id = (SELECT MIN(id)
+                    FROM schema_migration_details)
+    SQL
+  end
 
-    Topic.exec_sql("UPDATE schema_migration_details SET created_at = :created_at WHERE name = :name",
-                  name: name, created_at: 15.minutes.ago)
+  describe ".drop" do
+    let(:migration_name) do
+      ActiveRecord::Base
+        .exec_sql("SELECT name FROM schema_migration_details ORDER BY id DESC LIMIT 1")
+        .getvalue(0, 0)
+    end
 
-    dropped_proc_called = false
+    before do
+      Topic.exec_sql "ALTER TABLE topics ADD COLUMN junk int"
 
-    Migration::ColumnDropper.drop(
-      table: 'topics',
-      after_migration: name,
-      columns: ['junk'],
-      delay: 20.minutes,
-      on_drop: ->() { dropped_proc_called = true }
-    )
+      ActiveRecord::Base.exec_sql(<<~SQL, name: migration_name, created_at: 15.minutes.ago)
+        UPDATE schema_migration_details
+        SET created_at = :created_at
+        WHERE name = :name
+      SQL
+    end
 
-    expect(has_column?('topics', 'junk')).to eq(true)
-    expect(dropped_proc_called).to eq(false)
+    it "can correctly drop columns after correct delay" do
+      dropped_proc_called = false
+      update_first_migration_date(2.years.ago)
 
-    Migration::ColumnDropper.drop(
-      table: 'topics',
-      after_migration: name,
-      columns: ['junk'],
-      delay: 10.minutes,
-      on_drop: ->() { dropped_proc_called = true }
-    )
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 20.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
 
-    expect(has_column?('topics', 'junk')).to eq(false)
-    expect(dropped_proc_called).to eq(true)
+      expect(has_column?('topics', 'junk')).to eq(true)
+      expect(dropped_proc_called).to eq(false)
 
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 10.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(has_column?('topics', 'junk')).to eq(false)
+      expect(dropped_proc_called).to eq(true)
+
+      dropped_proc_called = false
+
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 10.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      # it should call "on_drop" only when there are columns to drop
+      expect(dropped_proc_called).to eq(false)
+    end
+
+    it "drops the columns immediately if the first migration was less than 10 minutes ago" do
+      dropped_proc_called = false
+      update_first_migration_date(11.minutes.ago)
+
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 30.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(has_column?('topics', 'junk')).to eq(true)
+      expect(dropped_proc_called).to eq(false)
+
+      update_first_migration_date(9.minutes.ago)
+
+      Migration::ColumnDropper.drop(
+        table: 'topics',
+        after_migration: migration_name,
+        columns: ['junk'],
+        delay: 30.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(has_column?('topics', 'junk')).to eq(false)
+      expect(dropped_proc_called).to eq(true)
+    end
   end
 
   describe '.mark_readonly' do
diff --git a/spec/components/migration/safe_migrate_spec.rb b/spec/components/migration/safe_migrate_spec.rb
index 846a4494cf..1be7f7c86d 100644
--- a/spec/components/migration/safe_migrate_spec.rb
+++ b/spec/components/migration/safe_migrate_spec.rb
@@ -34,6 +34,24 @@ describe Migration::SafeMigrate do
 
     expect(output).to include("TableDropper")
 
+    expect { User.first }.not_to raise_error
+    expect(User.first).not_to eq(nil)
+  end
+
+  it "bans all table renames" do
+    Migration::SafeMigrate.enable!
+
+    path = File.expand_path "#{Rails.root}/spec/fixtures/migrate/rename_table"
+
+    output = capture_stdout do
+      expect(lambda do
+        ActiveRecord::Migrator.up([path])
+      end).to raise_error(StandardError)
+    end
+
+    expect(output).to include("TableDropper")
+
+    expect { User.first }.not_to raise_error
     expect(User.first).not_to eq(nil)
   end
 
@@ -51,6 +69,7 @@ describe Migration::SafeMigrate do
     expect(output).to include("ColumnDropper")
 
     expect(User.first).not_to eq(nil)
+    expect { User.first.username }.not_to raise_error
   end
 
   it "bans all column renames" do
@@ -67,6 +86,7 @@ describe Migration::SafeMigrate do
     expect(output).to include("ColumnDropper")
 
     expect(User.first).not_to eq(nil)
+    expect { User.first.username }.not_to raise_error
   end
 
   it "supports being disabled" do
diff --git a/spec/components/migration/table_dropper_spec.rb b/spec/components/migration/table_dropper_spec.rb
index 3dcaf8c5d8..0b798f82bc 100644
--- a/spec/components/migration/table_dropper_spec.rb
+++ b/spec/components/migration/table_dropper_spec.rb
@@ -14,83 +14,193 @@ describe Migration::TableDropper do
     ActiveRecord::Base.exec_sql(sql).to_a.length > 0
   end
 
+  def update_first_migration_date(created_at)
+    ActiveRecord::Base.exec_sql(<<~SQL, created_at: created_at)
+        UPDATE schema_migration_details
+        SET created_at = :created_at
+        WHERE id = (SELECT MIN(id)
+                    FROM schema_migration_details)
+    SQL
+  end
+
+  def create_new_table
+    ActiveRecord::Base.exec_sql "CREATE TABLE table_with_new_name (topic_id INTEGER)"
+  end
+
   let(:migration_name) do
     ActiveRecord::Base
-      .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
+      .exec_sql("SELECT name FROM schema_migration_details ORDER BY id DESC LIMIT 1")
       .getvalue(0, 0)
   end
 
   before do
     ActiveRecord::Base.exec_sql "CREATE TABLE table_with_old_name (topic_id INTEGER)"
 
-    Topic.exec_sql("UPDATE schema_migration_details SET created_at = :created_at WHERE name = :name",
-                   name: migration_name, created_at: 15.minutes.ago)
+    ActiveRecord::Base.exec_sql(<<~SQL, name: migration_name, created_at: 15.minutes.ago)
+      UPDATE schema_migration_details
+      SET created_at = :created_at
+      WHERE name = :name
+    SQL
   end
 
-  describe "#delayed_rename" do
-    it "can drop a table after correct delay and when new table exists" do
-      dropped_proc_called = false
+  context "first migration was a long time ago" do
+    before do
+      update_first_migration_date(2.years.ago)
+    end
 
-      described_class.delayed_rename(
-        old_name: 'table_with_old_name',
-        new_name: 'table_with_new_name',
-        after_migration: migration_name,
-        delay: 20.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
+    describe ".delayed_rename" do
+      it "can drop a table after correct delay and when new table exists" do
+        dropped_proc_called = false
 
-      expect(table_exists?('table_with_old_name')).to eq(true)
-      expect(dropped_proc_called).to eq(false)
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 20.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
 
-      described_class.delayed_rename(
-        old_name: 'table_with_old_name',
-        new_name: 'table_with_new_name',
-        after_migration: migration_name,
-        delay: 10.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
 
-      expect(table_exists?('table_with_old_name')).to eq(true)
-      expect(dropped_proc_called).to eq(false)
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
 
-      ActiveRecord::Base.exec_sql "CREATE TABLE table_with_new_name (topic_id INTEGER)"
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
 
-      described_class.delayed_rename(
-        old_name: 'table_with_old_name',
-        new_name: 'table_with_new_name',
-        after_migration: migration_name,
-        delay: 10.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
+        create_new_table
 
-      expect(table_exists?('table_with_old_name')).to eq(false)
-      expect(dropped_proc_called).to eq(true)
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(false)
+        expect(dropped_proc_called).to eq(true)
+
+        dropped_proc_called = false
+
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        # it should call "on_drop" only when there is a table to drop
+        expect(dropped_proc_called).to eq(false)
+      end
+    end
+
+    describe ".delayed_drop" do
+      it "can drop a table after correct delay" do
+        dropped_proc_called = false
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 20.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(false)
+        expect(dropped_proc_called).to eq(true)
+
+        dropped_proc_called = false
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 10.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        # it should call "on_drop" only when there is a table to drop
+        expect(dropped_proc_called).to eq(false)
+      end
     end
   end
 
-  describe "#delayed_drop" do
-    it "can drop a table after correct delay" do
-      dropped_proc_called = false
+  context "first migration was a less than 10 minutes ago" do
+    describe ".delayed_rename" do
+      it "can drop a table after correct delay and when new table exists" do
+        dropped_proc_called = false
+        update_first_migration_date(11.minutes.ago)
+        create_new_table
 
-      described_class.delayed_drop(
-        table_name: 'table_with_old_name',
-        after_migration: migration_name,
-        delay: 20.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 30.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
 
-      expect(table_exists?('table_with_old_name')).to eq(true)
-      expect(dropped_proc_called).to eq(false)
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
 
-      described_class.delayed_drop(
-        table_name: 'table_with_old_name',
-        after_migration: migration_name,
-        delay: 10.minutes,
-        on_drop: ->() { dropped_proc_called = true }
-      )
+        update_first_migration_date(9.minutes.ago)
 
-      expect(table_exists?('table_with_old_name')).to eq(false)
-      expect(dropped_proc_called).to eq(true)
+        described_class.delayed_rename(
+          old_name: 'table_with_old_name',
+          new_name: 'table_with_new_name',
+          after_migration: migration_name,
+          delay: 30.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(false)
+        expect(dropped_proc_called).to eq(true)
+      end
+    end
+
+    describe ".delayed_drop" do
+      it "immediately drops the table" do
+        dropped_proc_called = false
+        update_first_migration_date(11.minutes.ago)
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 30.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(true)
+        expect(dropped_proc_called).to eq(false)
+
+        update_first_migration_date(9.minutes.ago)
+
+        described_class.delayed_drop(
+          table_name: 'table_with_old_name',
+          after_migration: migration_name,
+          delay: 30.minutes,
+          on_drop: ->() { dropped_proc_called = true }
+        )
+
+        expect(table_exists?('table_with_old_name')).to eq(false)
+        expect(dropped_proc_called).to eq(true)
+      end
     end
   end
 end
diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb
index 65aee5054f..22218a67dc 100644
--- a/spec/components/new_post_manager_spec.rb
+++ b/spec/components/new_post_manager_spec.rb
@@ -115,6 +115,18 @@ describe NewPostManager do
       end
     end
 
+    context 'with staged moderation setting enabled' do
+      before do
+        SiteSetting.approve_unless_staged = true
+        topic.user.staged = true
+      end
+      it "will return an enqueue result" do
+        result = NewPostManager.default_handler(manager)
+        expect(NewPostManager.queue_enabled?).to eq(true)
+        expect(result.action).to eq(:enqueued)
+      end
+    end
+
     context 'with a high trust level setting for new topics but post responds to existing topic' do
       before do
         SiteSetting.approve_new_topics_unless_trust_level = 4
diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb
index 601af265fc..b5ebd305ce 100644
--- a/spec/components/oneboxer_spec.rb
+++ b/spec/components/oneboxer_spec.rb
@@ -103,7 +103,7 @@ describe Oneboxer do
       post = Fabricate(:post, raw: Discourse.base_url + "/new?'class=black")
       cpp = CookedPostProcessor.new(post, invalidate_oneboxes: true)
       cpp.post_process_oneboxes
-      expect(cpp.html).to eq("<a href=\"#{Discourse.base_url}/new?%27class=black\">http://test.localhost/new?%27class=black</a>")
+      expect(cpp.html).to eq("<p><a href=\"#{Discourse.base_url}/new?%27class=black\">http://test.localhost/new?%27class=black</a></p>")
     end
   end
 
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 82e9cb3a2b..de6641218a 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -93,6 +93,15 @@ describe Plugin::Instance do
       expect(DiscoursePluginRegistry.mobile_stylesheets.count).to eq(0)
       expect(DiscoursePluginRegistry.stylesheets.count).to eq(2)
     end
+
+    it "remaps vendored_core_pretty_text asset" do
+      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
+      plugin.register_asset("moment.js", :vendored_core_pretty_text)
+
+      plugin.send :register_assets!
+
+      expect(DiscoursePluginRegistry.vendored_core_pretty_text.first).to eq("lib/javascripts/moment.js")
+    end
   end
 
   context "register service worker" do
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 6e3e0f1a50..7496f32801 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -32,7 +32,7 @@ describe PrettyText do
 
         topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
         expected = <<~HTML
-          <aside class="quote" data-post="2" data-topic="#{topic.id}">
+          <aside class="quote no-group" data-post="2" data-topic="#{topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
           <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/#{topic.id}/2">This is a test topic <img src="/images/emoji/twitter/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
@@ -55,7 +55,7 @@ describe PrettyText do
           [/quote]
         MD
         html = <<~HTML
-          <aside class="quote" data-post="123" data-topic="456" data-full="true">
+          <aside class="quote no-group" data-post="123" data-topic="456" data-full="true">
           <div class="title">
           <div class="quote-controls"></div>
           <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
@@ -77,7 +77,7 @@ describe PrettyText do
           [/quote]
         MD
         html = <<~HTML
-          <aside class="quote" data-post="123" data-topic="456" data-full="true">
+          <aside class="quote no-group" data-post="123" data-topic="456" data-full="true">
           <div class="title">
           <div class="quote-controls"></div>
           <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
@@ -98,7 +98,7 @@ describe PrettyText do
         MD
 
         html = <<~HTML
-          <aside class="quote" data-post="555" data-topic="666">
+          <aside class="quote no-group" data-post="555" data-topic="666">
           <div class="title">
           <div class="quote-controls"></div>
           <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
@@ -144,7 +144,7 @@ describe PrettyText do
       cooked = PrettyText.cook("[quote]te **s** t[/quote]")
 
       html = <<~HTML
-        <aside class="quote">
+        <aside class="quote no-group">
         <blockquote>
         <p>te <strong>s</strong> t</p>
         </blockquote>
diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb
index 8adf3c1556..77e9b735d6 100644
--- a/spec/components/site_setting_extension_spec.rb
+++ b/spec/components/site_setting_extension_spec.rb
@@ -586,4 +586,15 @@ describe SiteSettingExtension do
     end
   end
 
+  describe "get_hostname" do
+
+    it "properly extracts the hostname" do
+      expect(settings.send(:get_hostname, "discourse.org")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, " discourse.org ")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, "@discourse.org")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, "https://discourse.org")).to eq("discourse.org")
+    end
+
+  end
+
 end
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index ceb81d4e39..bb9586bfdb 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -60,6 +60,72 @@ describe TopicCreator do
       end
     end
 
+    context 'tags' do
+      let!(:tag1) { Fabricate(:tag, name: "fun") }
+      let!(:tag2) { Fabricate(:tag, name: "fun2") }
+
+      before do
+        SiteSetting.tagging_enabled = true
+        SiteSetting.min_trust_to_create_tag = 0
+        SiteSetting.min_trust_level_to_tag_topics = 0
+      end
+
+      context 'regular tags' do
+        it "user can add tags to topic" do
+          topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: [tag1.name]))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(1)
+        end
+      end
+
+      context 'staff-only tags' do
+        before do
+          SiteSetting.staff_tags = "alpha"
+        end
+
+        it "regular users can't add staff-only tags" do
+          expect do
+            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: ['alpha']))
+          end.to raise_error(ActiveRecord::Rollback)
+        end
+
+        it 'staff can add staff-only tags' do
+          topic = TopicCreator.create(admin, Guardian.new(admin), valid_attrs.merge(tags: ['alpha']))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(1)
+        end
+      end
+
+      context 'minimum_required_tags is present' do
+        let!(:category) { Fabricate(:category, name: "beta", minimum_required_tags: 2) }
+
+        it "fails for regular user if minimum_required_tags is not satisfied" do
+          expect do
+            TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: "beta"))
+          end.to raise_error(ActiveRecord::Rollback)
+        end
+
+        it "lets admin create a topic regardless of minimum_required_tags" do
+          topic = TopicCreator.create(admin, Guardian.new(admin), valid_attrs.merge(tags: [tag1.name], category: "beta"))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(1)
+        end
+
+        it "works for regular user if minimum_required_tags is satisfied" do
+          topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: [tag1.name, tag2.name], category: "beta"))
+          expect(topic).to be_valid
+          expect(topic.tags.length).to eq(2)
+        end
+
+        it "lets new user create a topic if they don't have sufficient trust level to tag topics" do
+          SiteSetting.min_trust_level_to_tag_topics = 1
+          new_user = Fabricate(:newuser)
+          topic = TopicCreator.create(new_user, Guardian.new(new_user), valid_attrs.merge(category: "beta"))
+          expect(topic).to be_valid
+        end
+      end
+    end
+
     context 'private message' do
 
       context 'success cases' do
diff --git a/spec/components/topic_publisher_spec.rb b/spec/components/topic_publisher_spec.rb
index 7f4dd740b1..43d33172f5 100644
--- a/spec/components/topic_publisher_spec.rb
+++ b/spec/components/topic_publisher_spec.rb
@@ -24,21 +24,30 @@ describe TopicPublisher do
       end
 
       it "will publish the topic properly" do
-        TopicPublisher.new(topic, moderator, shared_draft.category_id).publish!
+        published_at = 1.hour.from_now.change(usec: 0)
+        freeze_time(published_at) do
+          TopicPublisher.new(topic, moderator, shared_draft.category_id).publish!
 
-        topic.reload
-        expect(topic.category).to eq(category)
-        expect(topic).to be_visible
-        expect(topic.shared_draft).to be_blank
-        expect(UserHistory.where(
-          acting_user_id: moderator.id,
-          action: UserHistory.actions[:topic_published]
-        )).to be_present
-        op.reload
+          topic.reload
+          expect(topic.category).to eq(category)
+          expect(topic).to be_visible
+          expect(topic.created_at).to eq(published_at)
+          expect(topic.updated_at).to eq(published_at)
+          expect(topic.shared_draft).to be_blank
+          expect(UserHistory.where(
+            acting_user_id: moderator.id,
+            action: UserHistory.actions[:topic_published]
+          )).to be_present
+          op.reload
 
-        # Should delete any edits on the OP
-        expect(op.revisions.size).to eq(0)
-        expect(op.version).to eq(1)
+          # Should delete any edits on the OP
+          expect(op.revisions.size).to eq(0)
+          expect(op.version).to eq(1)
+          expect(op.public_version).to eq(1)
+          expect(op.created_at).to eq(published_at)
+          expect(op.updated_at).to eq(published_at)
+          expect(op.last_version_at).to eq(published_at)
+        end
       end
     end
 
diff --git a/spec/components/validators/post_validator_spec.rb b/spec/components/validators/post_validator_spec.rb
index 09cf5c2172..61c530cd8c 100644
--- a/spec/components/validators/post_validator_spec.rb
+++ b/spec/components/validators/post_validator_spec.rb
@@ -135,6 +135,49 @@ describe Validators::PostValidator do
     end
   end
 
+  context "too_many_images" do
+    before do
+      SiteSetting.min_trust_to_post_images = 0
+      SiteSetting.newuser_max_images = 2
+    end
+
+    it "should be invalid when new user exceeds max mentions limit" do
+      post.acting_user = build(:newuser)
+      post.expects(:image_count).returns(3)
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be > 0
+    end
+
+    it "should be valid when new user does not exceed max mentions limit" do
+      post.acting_user = build(:newuser)
+      post.expects(:image_count).returns(2)
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be(0)
+    end
+
+    it "should be invalid when user trust level is not sufficient" do
+      SiteSetting.min_trust_to_post_images = 4
+      post.acting_user = build(:leader)
+      post.expects(:image_count).returns(2)
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be > 0
+    end
+
+    it "should be valid for moderator in all cases" do
+      post.acting_user = build(:moderator)
+      post.expects(:image_count).never
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be(0)
+    end
+
+    it "should be valid for admin in all cases" do
+      post.acting_user = build(:admin)
+      post.expects(:image_count).never
+      validator.max_images_validator(post)
+      expect(post.errors.count).to be(0)
+    end
+  end
+
   context "invalid post" do
     it "should be invalid" do
       validator.validate(post)
diff --git a/spec/controllers/admin/backups_controller_spec.rb b/spec/controllers/admin/backups_controller_spec.rb
index d8adecf94d..4f7a6c7894 100644
--- a/spec/controllers/admin/backups_controller_spec.rb
+++ b/spec/controllers/admin/backups_controller_spec.rb
@@ -248,7 +248,12 @@ describe Admin::BackupsController do
             expect(response.status).to eq(200)
             expect(response.body).to eq("")
           ensure
-            File.delete(File.join(Backup.base_directory, filename))
+            begin
+              File.delete(
+                File.join(Backup.base_directory, 'tmp', 'test', "#{filename}.part1")
+              )
+            rescue Errno::ENOENT
+            end
           end
         end
       end
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
deleted file mode 100644
index e8ecd77c0a..0000000000
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-require 'rails_helper'
-
-describe Admin::GroupsController do
-  let(:user) { Fabricate(:user) }
-  let(:group) { Fabricate(:group) }
-
-  before do
-    @admin = log_in(:admin)
-  end
-
-  it "is a subclass of AdminController" do
-    expect(Admin::GroupsController < Admin::AdminController).to eq(true)
-  end
-
-  context ".bulk" do
-    it "can assign users to a group by email or username" do
-      group = Fabricate(:group, name: "test", primary_group: true, title: 'WAT', grant_trust_level: 3)
-      user = Fabricate(:user, trust_level: 2)
-      user2 = Fabricate(:user, trust_level: 4)
-
-      put :bulk_perform, params: {
-        group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
-      }, format: :json
-
-      expect(response).to be_success
-
-      user.reload
-      expect(user.primary_group).to eq(group)
-      expect(user.title).to eq("WAT")
-      expect(user.trust_level).to eq(3)
-
-      user2.reload
-      expect(user2.primary_group).to eq(group)
-      expect(user2.title).to eq("WAT")
-      expect(user2.trust_level).to eq(4)
-
-      # verify JSON response
-      json = ::JSON.parse(response.body)
-      expect(json['message']).to eq("2 users have been added to the group.")
-      expect(json['users_not_added'][0]).to eq("doesnt_exist")
-    end
-  end
-
-  context "#update" do
-    it 'should update a group' do
-      group.add_owner(user)
-
-      expect do
-        put :update, params: {
-          id: group.id,
-          group: {
-            visibility_level: Group.visibility_levels[:owners],
-            allow_membership_requests: "true"
-          }
-        }, format: :json
-
-      end.to change { GroupHistory.count }.by(2)
-
-      expect(response).to be_success
-
-      group.reload
-
-      expect(group.visibility_level).to eq(Group.visibility_levels[:owners])
-      expect(group.allow_membership_requests).to eq(true)
-    end
-
-    it "ignore name change on automatic group" do
-      put :update, params: { id: 1, group: { name: "WAT" } }, format: :json
-      expect(response).to be_success
-
-      group = Group.find(1)
-      expect(group.name).not_to eq("WAT")
-    end
-
-    it "doesn't launch the 'automatic group membership' job when it's not retroactive" do
-      Jobs.expects(:enqueue).never
-      group = Fabricate(:group)
-
-      put :update, params: {
-        id: group.id, group: { automatic_membership_retroactive: "false" }
-      }, format: :json
-
-      expect(response).to be_success
-    end
-
-    it "launches the 'automatic group membership' job when it's retroactive" do
-      group = Fabricate(:group)
-      Jobs.expects(:enqueue).with(:automatic_group_membership, group_id: group.id)
-
-      put :update, params: {
-        id: group.id, group: { automatic_membership_retroactive: "true" }
-      }, format: :json
-
-      expect(response).to be_success
-    end
-
-  end
-
-  context ".destroy" do
-
-    it "returns a 422 if the group is automatic" do
-      group = Fabricate(:group, automatic: true)
-      delete :destroy, params: { id: group.id }, format: :json
-      expect(response.status).to eq(422)
-      expect(Group.where(id: group.id).count).to eq(1)
-    end
-
-    it "is able to destroy a non-automatic group" do
-      group = Fabricate(:group)
-      delete :destroy, params: { id: group.id }, format: :json
-      expect(response.status).to eq(200)
-      expect(Group.where(id: group.id).count).to eq(0)
-    end
-
-  end
-
-  context ".refresh_automatic_groups" do
-
-    it "is able to refresh automatic groups" do
-      Group.expects(:refresh_automatic_groups!).returns(true)
-
-      post :refresh_automatic_groups, format: :json
-      expect(response.status).to eq(200)
-    end
-
-  end
-
-end
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
deleted file mode 100644
index 05b082a935..0000000000
--- a/spec/controllers/groups_controller_spec.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-require 'rails_helper'
-
-describe GroupsController do
-  let(:group) { Fabricate(:group) }
-
-  describe 'show' do
-    it "ensures the group can be seen" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      get :show, params: { id: group.name }, format: :json
-      expect(response).not_to be_success
-    end
-
-    it "responds with JSON" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      get :show, params: { id: group.name }, format: :json
-      expect(response).to be_success
-      expect(::JSON.parse(response.body)['basic_group']['id']).to eq(group.id)
-    end
-
-    it "works even with an upper case group name" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      get :show, params: { id: group.name.upcase }, format: :json
-      expect(response).to be_success
-      expect(::JSON.parse(response.body)['basic_group']['id']).to eq(group.id)
-    end
-  end
-
-  describe "posts" do
-    it "ensures the group can be seen" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      get :posts, params: { group_id: group.name }, format: :json
-      expect(response).not_to be_success
-    end
-
-    it "calls `posts_for` and responds with JSON" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      Group.any_instance.expects(:posts_for).returns(Group.none)
-      get :posts, params: { group_id: group.name }, format: :json
-      expect(response).to be_success
-    end
-  end
-
-  describe "members" do
-    it "ensures the group can be seen" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      get :members, params: { group_id: group.name }, format: :json
-      expect(response).not_to be_success
-    end
-
-    it "calls `posts_for` and responds with JSON" do
-      Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      get :posts, params: { group_id: group.name }, format: :json
-      expect(response).to be_success
-    end
-
-    it "ensures that membership can be paginated" do
-      5.times { group.add(Fabricate(:user)) }
-      usernames = group.users.map { |m| m.username }.sort
-
-      get :members, params: { group_id: group.name, limit: 3 }, format: :json
-      expect(response).to be_success
-      members = JSON.parse(response.body)["members"]
-      expect(members.map { |m| m['username'] }).to eq(usernames[0..2])
-
-      get :members, params: { group_id: group.name, limit: 3, offset: 3 }, format: :json
-      expect(response).to be_success
-      members = JSON.parse(response.body)["members"]
-      expect(members.map { |m| m['username'] }).to eq(usernames[3..4])
-    end
-  end
-
-  describe '.posts_feed' do
-    it 'renders RSS' do
-      get :posts_feed, params: { 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, params: { group_id: group.name }, format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'fails when disabled' do
-      SiteSetting.enable_mentions = false
-      get :mentions_feed, params: { group_id: group.name }, format: :rss
-      expect(response).not_to be_success
-    end
-  end
-
-end
diff --git a/spec/controllers/session_controller_spec.rb b/spec/controllers/session_controller_spec.rb
index 1f980a1fcb..b084051300 100644
--- a/spec/controllers/session_controller_spec.rb
+++ b/spec/controllers/session_controller_spec.rb
@@ -11,10 +11,12 @@ describe SessionController do
   describe '#become' do
     let!(:user) { Fabricate(:user) }
 
-    it "does not work when not in development mode" do
-      Rails.env.stubs(:development?).returns(false)
+    it "does not work when in production mode" do
+      Rails.env.stubs(:production?).returns(true)
       get :become, params: { session_id: user.username }, format: :json
-      expect(response).not_to be_redirect
+
+      expect(response.status).to eq(403)
+      expect(JSON.parse(response.body)["error_type"]).to eq("invalid_access")
       expect(session[:current_user_id]).to be_blank
     end
 
@@ -331,7 +333,7 @@ describe SessionController do
         expect(sso2.external_id).to eq(@user.id.to_s)
         expect(sso2.admin).to eq(true)
         expect(sso2.moderator).to eq(false)
-        expect(sso2.groups).to eq(@user.groups.pluck(:name))
+        expect(sso2.groups).to eq(@user.groups.pluck(:name).join(","))
       end
 
       it "successfully redirects user to return_sso_url when the user is logged in" do
diff --git a/spec/controllers/topic_controller_spec.rb b/spec/controllers/topic_controller_spec.rb
index 37e5c9cb30..16ecfc9e33 100644
--- a/spec/controllers/topic_controller_spec.rb
+++ b/spec/controllers/topic_controller_spec.rb
@@ -125,34 +125,6 @@ describe TopicsController do
     end
   end
 
-  describe "crawler" do
-    render_views
-
-    context "when not a crawler" do
-      it "renders with the application layout" do
-        get :show, params: { topic_id: topic.id, slug: topic.slug }
-
-        body = response.body
-
-        expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
-        expect(body).to have_tag(:meta, with: { name: 'fragment' })
-      end
-    end
-
-    context "when a crawler" do
-      it "renders with the crawler layout" do
-        request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
-        get :show, params: { topic_id: topic.id, slug: topic.slug }
-
-        body = response.body
-
-        expect(body).to have_tag(:body, with: { class: 'crawler' })
-        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
-      end
-    end
-
-  end
-
   describe "print" do
     render_views
 
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 62a9114441..8b3cfc4743 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -1541,12 +1541,14 @@ describe UsersController do
         it 'allows the update' do
           user2 = Fabricate(:user)
           user3 = Fabricate(:user)
+          tags = [Fabricate(:tag), Fabricate(:tag)]
 
           put :update, params: {
             username: user.username,
             name: 'Jim Tom',
             custom_fields: { test: :it },
-            muted_usernames: "#{user2.username},#{user3.username}"
+            muted_usernames: "#{user2.username},#{user3.username}",
+            watched_tags: "#{tags[0].name},#{tags[1].name}"
           }, format: :json
 
           expect(response).to be_success
@@ -1556,6 +1558,10 @@ describe UsersController do
           expect(user.name).to eq 'Jim Tom'
           expect(user.custom_fields['test']).to eq 'it'
           expect(user.muted_users.pluck(:username).sort).to eq [user2.username, user3.username].sort
+          expect(TagUser.where(
+            user: user,
+            notification_level: TagUser.notification_levels[:watching]
+          ).pluck(:tag_id)).to contain_exactly(tags[0].id, tags[1].id)
 
           theme = Theme.create(name: "test", user_selectable: true, user_id: -1)
 
diff --git a/spec/fabricators/web_crawler_request_fabricator.rb b/spec/fabricators/web_crawler_request_fabricator.rb
new file mode 100644
index 0000000000..ed678cc887
--- /dev/null
+++ b/spec/fabricators/web_crawler_request_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:web_crawler_request) do
+  user_agent { sequence(:ua) { |i| "Googlebot #{i}.0" } }
+  date Time.zone.now.to_date
+  count 0
+end
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index d9354fb59e..f44952891e 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -21,6 +21,9 @@ Fabricator(:wildcard_web_hook, from: :web_hook) do
   wildcard_web_hook true
 end
 
+Fabricator(:post_web_hook, from: :web_hook) do
+end
+
 Fabricator(:topic_web_hook, from: :web_hook) do
   transient topic_hook: WebHookEventType.find_by(name: 'topic')
 
@@ -36,3 +39,35 @@ Fabricator(:user_web_hook, from: :web_hook) do
     web_hook.web_hook_event_types = [transients[:user_hook]]
   end
 end
+
+Fabricator(:group_web_hook, from: :web_hook) do
+  transient group_hook: WebHookEventType.find_by(name: 'group')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:group_hook]]
+  end
+end
+
+Fabricator(:category_web_hook, from: :web_hook) do
+  transient category_hook: WebHookEventType.find_by(name: 'category')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:category_hook]]
+  end
+end
+
+Fabricator(:tag_web_hook, from: :web_hook) do
+  transient tag_hook: WebHookEventType.find_by(name: 'tag')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:tag_hook]]
+  end
+end
+
+Fabricator(:flag_web_hook, from: :web_hook) do
+  transient flag_hook: WebHookEventType.find_by(name: 'flag')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:flag_hook]]
+  end
+end
diff --git a/spec/fixtures/emails/unparsable_email_addresses.eml b/spec/fixtures/emails/unparsable_email_addresses.eml
new file mode 100644
index 0000000000..c94956d055
--- /dev/null
+++ b/spec/fixtures/emails/unparsable_email_addresses.eml
@@ -0,0 +1,7 @@
+Date: 27 Mar 2018 11:51:04 +0200
+From: alice@example.com
+To: foo@bar.com.
+CC: bob@example.com., carol@example.com.
+Subject: Email addresses ending with dot
+
+Lorem ipsum
diff --git a/spec/fixtures/migrate/rename_table/20990309014014_rename_table.rb b/spec/fixtures/migrate/rename_table/20990309014014_rename_table.rb
new file mode 100644
index 0000000000..7aca85e155
--- /dev/null
+++ b/spec/fixtures/migrate/rename_table/20990309014014_rename_table.rb
@@ -0,0 +1,9 @@
+class RenameTable < ActiveRecord::Migration[5.1]
+  def up
+    rename_table :users, :persons
+  end
+
+  def down
+    raise "not tested"
+  end
+end
diff --git a/spec/jobs/clean_up_crawler_stats_spec.rb b/spec/jobs/clean_up_crawler_stats_spec.rb
new file mode 100644
index 0000000000..46c069e9e6
--- /dev/null
+++ b/spec/jobs/clean_up_crawler_stats_spec.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+describe Jobs::CleanUpCrawlerStats do
+  subject { Jobs::CleanUpCrawlerStats.new.execute({}) }
+
+  it "deletes records older than 30 days old" do
+    freeze_time
+
+    today = Fabricate(:web_crawler_request, date: Time.zone.now.to_date)
+    yesterday = Fabricate(:web_crawler_request, date: 1.day.ago.to_date)
+    too_old = Fabricate(:web_crawler_request, date: 31.days.ago.to_date)
+
+    expect { subject }.to change { WebCrawlerRequest.count }.by(-1)
+    expect(WebCrawlerRequest.where(id: too_old.id)).to_not exist
+  end
+
+  it "keeps only the top records from the previous day" do
+    freeze_time
+
+    WebCrawlerRequest.stubs(:max_records_per_day).returns(3)
+
+    req1 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 100)
+    req4 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 30)
+    req3 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 40)
+    req2 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 50)
+    req5 = Fabricate(:web_crawler_request, date: 1.day.ago.to_date, count: 1)
+
+    expect { subject }.to change { WebCrawlerRequest.count }.by(-2)
+    expect(WebCrawlerRequest.all).to contain_exactly(req1, req2, req3)
+  end
+end
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index b7e1cca39d..29be1e6925 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -56,9 +56,14 @@ describe Jobs::EmitWebHookEvent do
       stub_request(:post, "https://meta.discourse.org/webhook_listener")
         .to_return(body: 'OK', status: 200)
 
-      expect do
-        subject.execute(web_hook_id: post_hook.id, event_type: 'post', post_id: post.id)
-      end.to change(WebHookEvent, :count).by(1)
+      WebHookEventType.all.pluck(:name).each do |name|
+        web_hook_id = Fabricate("#{name}_web_hook").id
+        object_id = Fabricate(name).id
+
+        expect do
+          subject.execute(web_hook_id: web_hook_id, event_type: name, "#{name}_id": object_id)
+        end.to change(WebHookEvent, :count).by(1)
+      end
     end
 
     it 'skips silently on missing post' do
diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb
index 7ec26fd604..da544278bc 100644
--- a/spec/jobs/jobs_spec.rb
+++ b/spec/jobs/jobs_spec.rb
@@ -55,34 +55,30 @@ describe Jobs do
           Jobs::ProcessPost.any_instance.stubs(:execute).returns(true)
         end
 
-        it 'should not execute the job' do
-          Jobs::ProcessPost.any_instance.expects(:execute).never
-          Jobs.enqueue(:process_post, post_id: 1, current_site_id: 'test_db') rescue nil
-        end
-
         it 'should raise an exception' do
+          Jobs::ProcessPost.any_instance.expects(:execute).never
+          RailsMultisite::ConnectionManagement.expects(:establish_connection).never
+
           expect {
             Jobs.enqueue(:process_post, post_id: 1, current_site_id: 'test_db')
           }.to raise_error(ArgumentError)
         end
-
-        it 'should not connect to the given database' do
-          RailsMultisite::ConnectionManagement.expects(:establish_connection).never
-          Jobs.enqueue(:process_post, post_id: 1, current_site_id: 'test_db') rescue nil
-        end
       end
     end
 
   end
 
   describe 'cancel_scheduled_job' do
+    let(:scheduled_jobs) { Sidekiq::ScheduledSet.new }
+
+    after do
+      scheduled_jobs.clear
+    end
 
     it 'deletes the matching job' do
       SiteSetting.queue_jobs = true
 
       Sidekiq::Testing.disable! do
-        scheduled_jobs = Sidekiq::ScheduledSet.new
-
         expect(scheduled_jobs.size).to eq(0)
 
         Jobs.enqueue_in(1.year, :run_heartbeat, topic_id: 123)
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 9f756f394f..51992b1ce5 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -368,6 +368,17 @@ describe Category do
     end
   end
 
+  describe 'new' do
+    subject { Fabricate.build(:category, user: Fabricate(:user)) }
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.save! }.last
+
+      expect(event[:event_name]).to eq(:category_created)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
+
   describe "update" do
     it "should enforce uniqueness of slug" do
       Fabricate(:category, slug: "the-slug")
@@ -384,14 +395,21 @@ describe Category do
       @category_id = @category.id
       @topic_id = @category.topic_id
       SiteSetting.shared_drafts_category = @category.id.to_s
-      @category.destroy
     end
 
     it 'is deleted correctly' do
+      @category.destroy
       expect(Category.exists?(id: @category_id)).to be false
       expect(Topic.exists?(id: @topic_id)).to be false
       expect(SiteSetting.shared_drafts_category).to be_blank
     end
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { @category.destroy }.first
+
+      expect(event[:event_name]).to eq(:category_destroyed)
+      expect(event[:params].first).to eq(@category)
+    end
   end
 
   describe 'latest' do
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index d204ae5d37..ff22598ebe 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -121,6 +121,39 @@ describe DiscourseSingleSignOn do
     expect(admin_group.users.where('users.id = ?', user.id).exists?).to eq(true)
   end
 
+  it "can force a list of groups with the groups attribute" do
+    user = Fabricate(:user)
+    group1 = Fabricate(:group, name: 'group1')
+    group2 = Fabricate(:group, name: 'group2')
+
+    sso = DiscourseSingleSignOn.new
+    sso.username = "bobsky"
+    sso.name = "Bob"
+    sso.email = user.email
+    sso.external_id = "A"
+
+    sso.groups = "#{group2.name.capitalize},group4,badname,trust_level_4"
+    sso.lookup_or_create_user(ip_address)
+
+    SiteSetting.sso_overrides_groups = true
+
+    group1.reload
+    expect(group1.usernames).to eq("")
+    expect(group2.usernames).to eq("")
+
+    group1.add(user)
+    group1.save
+
+    sso.lookup_or_create_user(ip_address)
+    expect(group1.usernames).to eq("")
+    expect(group2.usernames).to eq(user.username)
+
+    sso.groups = "badname,trust_level_4"
+    sso.lookup_or_create_user(ip_address)
+    expect(group1.usernames).to eq("")
+    expect(group2.usernames).to eq("")
+  end
+
   it "can specify groups" do
 
     user = Fabricate(:user)
@@ -466,6 +499,7 @@ describe DiscourseSingleSignOn do
       old_id = user.uploaded_avatar_id
       Upload.destroy(old_id)
 
+      FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
       user = sso.lookup_or_create_user(ip_address)
       user.reload
       avatar_id = user.uploaded_avatar_id
@@ -473,32 +507,32 @@ describe DiscourseSingleSignOn do
       expect(avatar_id).to_not eq(nil)
       expect(old_id).to_not eq(avatar_id)
 
-      FileHelper.stubs(:download) { raise "should not be called" }
-      sso.avatar_url = "https://some.new/avatar.png"
-      user = sso.lookup_or_create_user(ip_address)
-      user.reload
-
-      # avatar updated but no override specified ...
-      expect(user.uploaded_avatar_id).to eq(avatar_id)
-
-      sso.avatar_force_update = true
-      FileHelper.stubs(:download).returns(file_from_fixtures("logo-dev.png"))
-      user = sso.lookup_or_create_user(ip_address)
-      user.reload
-
-      # we better have a new avatar
-      expect(user.uploaded_avatar_id).not_to eq(avatar_id)
-      expect(user.uploaded_avatar_id).not_to eq(nil)
-
-      avatar_id = user.uploaded_avatar_id
-
-      sso.avatar_force_update = true
-      FileHelper.stubs(:download) { raise "not found" }
-      user = sso.lookup_or_create_user(ip_address)
-      user.reload
-
-      # we better have the same avatar
-      expect(user.uploaded_avatar_id).to eq(avatar_id)
+      # FileHelper.stubs(:download) { raise "should not be called" }
+      # sso.avatar_url = "https://some.new/avatar.png"
+      # user = sso.lookup_or_create_user(ip_address)
+      # user.reload
+      #
+      # # avatar updated but no override specified ...
+      # expect(user.uploaded_avatar_id).to eq(avatar_id)
+      #
+      # sso.avatar_force_update = true
+      # FileHelper.stubs(:download).returns(file_from_fixtures("logo-dev.png"))
+      # user = sso.lookup_or_create_user(ip_address)
+      # user.reload
+      #
+      # # we better have a new avatar
+      # expect(user.uploaded_avatar_id).not_to eq(avatar_id)
+      # expect(user.uploaded_avatar_id).not_to eq(nil)
+      #
+      # avatar_id = user.uploaded_avatar_id
+      #
+      # sso.avatar_force_update = true
+      # FileHelper.stubs(:download) { raise "not found" }
+      # user = sso.lookup_or_create_user(ip_address)
+      # user.reload
+      #
+      # # we better have the same avatar
+      # expect(user.uploaded_avatar_id).to eq(avatar_id)
     end
 
   end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 20b1e242d1..d4d6e5a954 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -5,6 +5,47 @@ describe Group do
   let(:user) { Fabricate(:user) }
   let(:group) { Fabricate(:group) }
 
+  context 'validations' do
+    describe '#grant_trust_level' do
+      describe 'when trust level is not valid' do
+        it 'should not be valid' do
+          group.grant_trust_level = 123456
+
+          expect(group.valid?).to eq(false)
+
+          expect(group.errors.full_messages.join(",")).to eq(I18n.t(
+            'groups.errors.grant_trust_level_not_valid',
+            trust_level: 123456
+          ))
+        end
+      end
+    end
+
+    describe '#username' do
+      context 'when a user with a similar name exists' do
+        it 'should not be valid' do
+          new_group = Fabricate.build(:group, name: admin.username.upcase)
+
+          expect(new_group).to_not be_valid
+
+          expect(new_group.errors.full_messages.first)
+            .to include(I18n.t("activerecord.errors.messages.taken"))
+        end
+      end
+
+      context 'when a group with a similar name exists' do
+        it 'should not be valid' do
+          new_group = Fabricate.build(:group, name: group.name.upcase)
+
+          expect(new_group).to_not be_valid
+
+          expect(new_group.errors.full_messages.first)
+            .to include(I18n.t("activerecord.errors.messages.taken"))
+        end
+      end
+    end
+  end
+
   describe "#posts_for" do
     it "returns the post in the group" do
       p = Fabricate(:post)
@@ -411,17 +452,37 @@ describe Group do
     expect(g.usernames.split(",").sort).to eq usernames.split(",").sort
   end
 
-  it "correctly destroys groups" do
+  describe 'new' do
+    subject { Fabricate.build(:group) }
 
-    g = Fabricate(:group)
-    u1 = Fabricate(:user)
-    g.add(u1)
-    g.save!
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.save! }.first
 
-    g.destroy
+      expect(event[:event_name]).to eq(:group_created)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
 
-    expect(User.where(id: u1.id).count).to eq 1
-    expect(GroupUser.where(group_id: g.id).count).to eq 0
+  describe 'destroy' do
+    let(:user) { Fabricate(:user) }
+    let(:group) { Fabricate(:group, users: [user]) }
+
+    before do
+      group.add(user)
+    end
+
+    it "it deleted correctly" do
+      group.destroy!
+      expect(User.where(id: user.id).count).to eq 1
+      expect(GroupUser.where(group_id: group.id).count).to eq 0
+    end
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { group.destroy! }.first
+
+      expect(event[:event_name]).to eq(:group_destroyed)
+      expect(event[:params].first).to eq(group)
+    end
   end
 
   it "has custom fields" do
@@ -480,50 +541,83 @@ describe Group do
     end
   end
 
-  it "correctly grants a trust level to members" do
-    group = Fabricate(:group, grant_trust_level: 2)
-    u0 = Fabricate(:user, trust_level: 0)
-    u3 = Fabricate(:user, trust_level: 3)
+  describe 'trust level management' do
+    it "correctly grants a trust level to members" do
+      group = Fabricate(:group, grant_trust_level: 2)
+      u0 = Fabricate(:user, trust_level: 0)
+      u3 = Fabricate(:user, trust_level: 3)
 
-    group.add(u0)
-    expect(u0.reload.trust_level).to eq(2)
+      group.add(u0)
+      expect(u0.reload.trust_level).to eq(2)
 
-    group.add(u3)
-    expect(u3.reload.trust_level).to eq(3)
-  end
+      group.add(u3)
+      expect(u3.reload.trust_level).to eq(3)
+    end
 
-  it "adjusts the user trust level" do
-    g0 = Fabricate(:group, grant_trust_level: 2)
-    g1 = Fabricate(:group, grant_trust_level: 3)
-    g2 = Fabricate(:group)
+    describe 'when a user has qualified for trust level 1' do
+      let(:user) do
+        Fabricate(:user,
+          trust_level: 1,
+          created_at: Time.zone.now - 10.years
+        )
+      end
 
-    user = Fabricate(:user, trust_level: 0)
+      let(:group) { Fabricate(:group, grant_trust_level: 1) }
+      let(:group2) { Fabricate(:group, grant_trust_level: 0) }
 
-    # Add a group without one to consider `NULL` check
-    g2.add(user)
-    expect(user.group_locked_trust_level).to be_nil
-    expect(user.manual_locked_trust_level).to be_nil
+      before do
+        user.user_stat.update!(
+          topics_entered: 999,
+          posts_read_count: 999,
+          time_read: 999
+        )
+      end
 
-    g0.add(user)
-    expect(user.reload.trust_level).to eq(2)
-    expect(user.group_locked_trust_level).to eq(2)
-    expect(user.manual_locked_trust_level).to be_nil
+      it "should not demote the user" do
+        group.add(user)
+        group2.add(user)
 
-    g1.add(user)
-    expect(user.reload.trust_level).to eq(3)
-    expect(user.group_locked_trust_level).to eq(3)
-    expect(user.manual_locked_trust_level).to be_nil
+        expect(user.reload.trust_level).to eq(1)
 
-    g1.remove(user)
-    expect(user.reload.trust_level).to eq(2)
-    expect(user.group_locked_trust_level).to eq(2)
-    expect(user.manual_locked_trust_level).to be_nil
+        group.remove(user)
 
-    g0.remove(user)
-    user.reload
-    expect(user.manual_locked_trust_level).to be_nil
-    expect(user.group_locked_trust_level).to be_nil
-    expect(user.trust_level).to eq(0)
+        expect(user.reload.trust_level).to eq(0)
+      end
+    end
+
+    it "adjusts the user trust level" do
+      g0 = Fabricate(:group, grant_trust_level: 2)
+      g1 = Fabricate(:group, grant_trust_level: 3)
+      g2 = Fabricate(:group)
+
+      user = Fabricate(:user, trust_level: 0)
+
+      # Add a group without one to consider `NULL` check
+      g2.add(user)
+      expect(user.group_locked_trust_level).to be_nil
+      expect(user.manual_locked_trust_level).to be_nil
+
+      g0.add(user)
+      expect(user.reload.trust_level).to eq(2)
+      expect(user.group_locked_trust_level).to eq(2)
+      expect(user.manual_locked_trust_level).to be_nil
+
+      g1.add(user)
+      expect(user.reload.trust_level).to eq(3)
+      expect(user.group_locked_trust_level).to eq(3)
+      expect(user.manual_locked_trust_level).to be_nil
+
+      g1.remove(user)
+      expect(user.reload.trust_level).to eq(2)
+      expect(user.group_locked_trust_level).to eq(2)
+      expect(user.manual_locked_trust_level).to be_nil
+
+      g0.remove(user)
+      user.reload
+      expect(user.manual_locked_trust_level).to be_nil
+      expect(user.group_locked_trust_level).to be_nil
+      expect(user.trust_level).to eq(0)
+    end
   end
 
   it 'should cook the bio' do
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 18a38e484a..da30be3cc9 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -418,12 +418,17 @@ describe PostAction do
       post = create_post
       walterwhite = Fabricate(:walter_white)
 
+      SiteSetting.queue_jobs = true
       SiteSetting.flags_required_to_hide_post = 2
       Discourse.stubs(:site_contact_user).returns(admin)
 
       PostAction.act(eviltrout, post, PostActionType.types[:spam])
       PostAction.act(walterwhite, post, PostActionType.types[:spam])
 
+      job_args = Jobs::SendSystemMessage.jobs.last["args"].first
+      expect(job_args["user_id"]).to eq(post.user.id)
+      expect(job_args["message_type"]).to eq("post_hidden")
+
       post.reload
 
       expect(post.hidden).to eq(true)
@@ -443,6 +448,10 @@ describe PostAction do
       PostAction.act(eviltrout, post, PostActionType.types[:spam])
       PostAction.act(walterwhite, post, PostActionType.types[:off_topic])
 
+      job_args = Jobs::SendSystemMessage.jobs.last["args"].first
+      expect(job_args["user_id"]).to eq(post.user.id)
+      expect(job_args["message_type"]).to eq("post_hidden_again")
+
       post.reload
 
       expect(post.hidden).to eq(true)
@@ -701,4 +710,36 @@ describe PostAction do
     end
   end
 
+  describe "triggers webhook events" do
+    let(:post) { Fabricate(:post) }
+
+    it 'flag created' do
+      event = DiscourseEvent.track_events { PostAction.act(eviltrout, post, PostActionType.types[:spam]) }.last
+      expect(event[:event_name]).to eq(:flag_created)
+    end
+
+    context "resolving flags" do
+      before do
+        @flag = PostAction.act(eviltrout, post, PostActionType.types[:spam])
+      end
+
+      it 'flag agreed' do
+        event = DiscourseEvent.track_events { PostAction.agree_flags!(post, moderator) }.last
+        expect(event[:event_name]).to eq(:flag_agreed)
+        expect(event[:params].first).to eq(@flag)
+      end
+
+      it 'flag disagreed' do
+        event = DiscourseEvent.track_events { PostAction.clear_flags!(post, moderator) }.last
+        expect(event[:event_name]).to eq(:flag_disagreed)
+        expect(event[:params].first).to eq(@flag)
+      end
+
+      it 'flag deferred' do
+        event = DiscourseEvent.track_events { PostAction.defer_flags!(post, moderator) }.last
+        expect(event[:event_name]).to eq(:flag_deferred)
+        expect(event[:params].first).to eq(@flag)
+      end
+    end
+  end
 end
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index 937b47687c..f7e20efc1e 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -176,6 +176,11 @@ describe PostAnalyzer do
       expect(post_analyzer.link_count).to eq(0)
     end
 
+    it "returns links with href=''" do
+      post_analyzer = PostAnalyzer.new('<a href="">Hello world</a>', nil)
+      expect(post_analyzer.link_count).to eq(1)
+    end
+
     it "finds links from markdown" do
       Oneboxer.stubs :onebox
       post_analyzer = PostAnalyzer.new(raw_post_one_link_md, default_topic_id)
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 9336d2ad1b..2c1d237b8a 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -410,7 +410,6 @@ describe Post do
     end
 
     it "finds links from HTML" do
-
       expect(post_two_links.link_count).to eq(2)
     end
 
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index a7e5fc8bbb..0d0d8201b0 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -166,7 +166,7 @@ describe Report do
   end
 
   describe 'private messages' do
-    let(:report) { Report.find('user_to_user_private_messages') }
+    let(:report) { Report.find('user_to_user_private_messages_with_replies') }
 
     it 'topic report).to not include private messages' do
       Fabricate(:private_message_topic, created_at: 1.hour.ago)
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 1d792c10a2..c7cc72496b 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -18,6 +18,28 @@ describe Tag do
     SiteSetting.min_trust_level_to_tag_topics = 0
   end
 
+  describe 'new' do
+    subject { Fabricate.build(:tag) }
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.save! }.last
+
+      expect(event[:event_name]).to eq(:tag_created)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
+
+  describe 'destroy' do
+    subject { Fabricate(:tag) }
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.destroy! }.last
+
+      expect(event[:event_name]).to eq(:tag_destroyed)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
+
   it "can delete tags on deleted topics" do
     topic.trash!
     expect { tag.destroy }.to change { Tag.count }.by(-1)
@@ -94,6 +116,24 @@ describe Tag do
         expect(described_class.top_tags.sort).to eq([@tags[0].name, @tags[1].name, @tags[2].name].sort)
       end
     end
+
+    context "with hidden tags" do
+      let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+      let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+      let!(:topic2) { Fabricate(:topic, tags: [tag, hidden_tag]) }
+
+      it "returns all tags to staff" do
+        expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:admin)))).to include(hidden_tag.name)
+      end
+
+      it "doesn't return hidden tags to anon" do
+        expect(Tag.top_tags).to_not include(hidden_tag.name)
+      end
+
+      it "doesn't return hidden tags to non-staff" do
+        expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:user)))).to_not include(hidden_tag.name)
+      end
+    end
   end
 
   describe '#pm_tags' do
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 0f9677780b..8ec0a5249b 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -21,6 +21,22 @@ HTML
     expect(field.error).to eq(nil)
   end
 
+  it "allows us to use theme settings in handlebars templates" do
+    html = <<HTML
+<script type='text/x-handlebars' data-template-name='my-template'>
+    <div class="testing-div">{{themeSettings.string_setting}}</div>
+</script>
+HTML
+
+    ThemeField.create!(theme_id: 1, target_id: 3, name: "yaml", value: "string_setting: \"test text \\\" 123!\"")
+    baked_value = ThemeField.create!(theme_id: 1, target_id: 0, name: "head_tag", value: html).value_baked
+
+    expect(baked_value).to include("testing-div")
+    expect(baked_value).to include("theme-setting-injector")
+    expect(baked_value).to include("string_setting")
+    expect(baked_value).to include("test text \\\\\\\\u0022 123!")
+  end
+
   it "correctly generates errors for transpiled css" do
     css = "body {"
     field = ThemeField.create!(theme_id: 1, target_id: 0, name: "scss", value: css)
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index 66e2c94380..ad18f42147 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -5,7 +5,7 @@ describe TopicConverter do
   context 'convert_to_public_topic' do
     let(:admin) { Fabricate(:admin) }
     let(:author) { Fabricate(:user) }
-    let(:category) { Fabricate(:category) }
+    let(:category) { Fabricate(:category, topic_count: 1) }
     let(:private_message) { Fabricate(:private_message_topic, user: author) } # creates a topic without a first post
     let(:first_post) { Fabricate(:post, topic: private_message, user: author) }
     let(:other_user) { private_message.topic_allowed_users.find { |u| u.user != author }.user }
@@ -19,6 +19,7 @@ describe TopicConverter do
         expect(topic).to be_valid
         expect(topic.archetype).to eq("regular")
         expect(topic.category_id).to eq(SiteSetting.uncategorized_category_id)
+        expect(topic.category.topic_count).to eq(1)
       end
 
       describe 'when uncategorized category is not allowed' do
@@ -38,6 +39,7 @@ describe TopicConverter do
             .where(read_restricted: false).order('id asc').first
 
           expect(topic.category_id).to eq(first_category.id)
+          expect(topic.category.topic_count).to eq(2)
         end
       end
 
@@ -46,6 +48,7 @@ describe TopicConverter do
           topic = TopicConverter.new(private_message, admin).convert_to_public_topic(category.id)
 
           expect(topic.reload.category).to eq(category)
+          expect(topic.category.topic_count).to eq(2)
         end
       end
 
@@ -86,13 +89,16 @@ describe TopicConverter do
   context 'convert_to_private_message' do
     let(:admin) { Fabricate(:admin) }
     let(:author) { Fabricate(:user) }
-    let(:topic) { Fabricate(:topic, user: author) }
+    let(:category) { Fabricate(:category) }
+    let(:topic) { Fabricate(:topic, user: author, category_id: category.id) }
 
     context 'success' do
       it "converts regular topic to private message" do
         private_message = topic.convert_to_private_message(admin)
         expect(private_message).to be_valid
         expect(topic.archetype).to eq("private_message")
+        expect(topic.category_id).to eq(nil)
+        expect(category.reload.topic_count).to eq(0)
       end
 
       it "updates user stats" do
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index a88441bb75..6a17b19bec 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1975,12 +1975,21 @@ describe Topic do
     expect(topic.message_archived?(user)).to eq(false)
 
     group = Fabricate(:group)
+    group2 = Fabricate(:group)
+
     group.add(user)
 
     TopicAllowedGroup.create!(topic_id: topic.id, group_id: group.id)
+    TopicAllowedGroup.create!(topic_id: topic.id, group_id: group2.id)
     GroupArchivedMessage.create!(topic_id: topic.id, group_id: group.id)
 
     expect(topic.message_archived?(user)).to eq(true)
+
+    # here is a pickle, we add another group, make the user a
+    # member of that new group... now this message is not properly archived
+    # for the user any more
+    group2.add(user)
+    expect(topic.message_archived?(user)).to eq(false)
   end
 
   it 'will trigger :topic_status_updated' do
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index eb7f723064..75f31ac8db 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -46,6 +46,9 @@ describe UserAvatar do
 
     describe 'when avatar url returns an invalid status code' do
       it 'should not do anything' do
+        stub_request(:get, "http://thisfakesomething.something.com/")
+          .to_return(status: 500, body: "", headers: {})
+
         url = "http://thisfakesomething.something.com/"
 
         UserAvatar.import_url_for_user(url, user)
diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb
index 0fffc455aa..ea5aacf327 100644
--- a/spec/models/user_profile_spec.rb
+++ b/spec/models/user_profile_spec.rb
@@ -118,7 +118,8 @@ describe UserProfile do
     end
 
     it 'supports emoji images' do
-      expect(user.user_profile.bio_excerpt(500, keep_emoji_images: true)).to eq("hello <img src=\"/uploads/default/original/1X/f588830852fc8091a094cf0be0be0e6559dc8304.png?v=5\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> <img src=\"/images/emoji/twitter/woman_scientist/5.png?v=5\" title=\":woman_scientist:t5:\" class=\"emoji\" alt=\":woman_scientist:t5:\"> <img src=\"/images/emoji/twitter/thinking.png?v=5\" title=\":thinking:\" class=\"emoji\" alt=\":thinking:\">")
+
+      expect(user.user_profile.bio_excerpt(500, keep_emoji_images: true)).to eq("hello <img src=\"/uploads/default/original/1X/#{Upload.find(1).sha1}.png?v=5\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> <img src=\"/images/emoji/twitter/woman_scientist/5.png?v=5\" title=\":woman_scientist:t5:\" class=\"emoji\" alt=\":woman_scientist:t5:\"> <img src=\"/images/emoji/twitter/thinking.png?v=5\" title=\":thinking:\" class=\"emoji\" alt=\":thinking:\">")
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2f0f117312..fe2299cb7b 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -5,10 +5,36 @@ describe User do
   let(:user) { Fabricate(:user) }
 
   context 'validations' do
-    it { is_expected.to validate_presence_of :username }
-    it { is_expected.to validate_presence_of :primary_email }
+    describe '#username' do
+      it { is_expected.to validate_presence_of :username }
+
+      describe 'when username already exists' do
+        it 'should not be valid' do
+          new_user = Fabricate.build(:user, username: user.username.upcase)
+
+          expect(new_user).to_not be_valid
+
+          expect(new_user.errors.full_messages.first)
+            .to include(I18n.t(:'user.username.unique'))
+        end
+      end
+
+      describe 'when group with a same name already exists' do
+        it 'should not be valid' do
+          group = Fabricate(:group)
+          new_user = Fabricate.build(:user, username: group.name.upcase)
+
+          expect(new_user).to_not be_valid
+
+          expect(new_user.errors.full_messages.first)
+            .to include(I18n.t(:'user.username.unique'))
+        end
+      end
+    end
 
     describe 'emails' do
+      it { is_expected.to validate_presence_of :primary_email }
+
       let(:user) { Fabricate.build(:user) }
 
       describe 'when record has a valid email' do
diff --git a/spec/models/web_crawler_request_spec.rb b/spec/models/web_crawler_request_spec.rb
new file mode 100644
index 0000000000..03f8da5a86
--- /dev/null
+++ b/spec/models/web_crawler_request_spec.rb
@@ -0,0 +1,114 @@
+require 'rails_helper'
+
+describe WebCrawlerRequest do
+  before do
+    WebCrawlerRequest.last_flush = Time.now.utc
+    WebCrawlerRequest.clear_cache!
+  end
+
+  after do
+    WebCrawlerRequest.clear_cache!
+  end
+
+  def inc(user_agent, opts = nil)
+    WebCrawlerRequest.increment!(user_agent, opts)
+  end
+
+  def disable_date_flush!
+    freeze_time(Time.now)
+    WebCrawlerRequest.last_flush = Time.now.utc
+  end
+
+  def web_crawler_request(user_agent)
+    WebCrawlerRequest.where(user_agent: user_agent).first
+  end
+
+  it 'works even if redis is in readonly' do
+    disable_date_flush!
+
+    inc('Googlebot')
+    inc('Googlebot')
+
+    $redis.without_namespace.stubs(:incr).raises(Redis::CommandError.new("READONLY"))
+    $redis.without_namespace.stubs(:eval).raises(Redis::CommandError.new("READONLY"))
+
+    inc('Googlebot', autoflush: 3)
+    WebCrawlerRequest.write_cache!
+
+    $redis.without_namespace.unstub(:incr)
+    $redis.without_namespace.unstub(:eval)
+
+    inc('Googlebot', autoflush: 3)
+    expect(web_crawler_request('Googlebot').count).to eq(3)
+  end
+
+  it 'logs nothing for an unflushed increment' do
+    WebCrawlerRequest.increment!('Googlebot')
+    expect(WebCrawlerRequest.count).to eq(0)
+  end
+
+  it 'can automatically flush' do
+    disable_date_flush!
+
+    inc('Googlebot', autoflush: 3)
+    expect(web_crawler_request('Googlebot')).to_not be_present
+    expect(WebCrawlerRequest.count).to eq(0)
+    inc('Googlebot', autoflush: 3)
+    expect(web_crawler_request('Googlebot')).to_not be_present
+    inc('Googlebot', autoflush: 3)
+    expect(web_crawler_request('Googlebot').count).to eq(3)
+    expect(WebCrawlerRequest.count).to eq(1)
+
+    3.times { inc('Googlebot', autoflush: 3) }
+    expect(web_crawler_request('Googlebot').count).to eq(6)
+    expect(WebCrawlerRequest.count).to eq(1)
+  end
+
+  it 'can flush based on time' do
+    t1 = Time.now.utc.at_midnight
+    freeze_time(t1)
+    WebCrawlerRequest.write_cache!
+    inc('Googlebot')
+    expect(WebCrawlerRequest.count).to eq(0)
+
+    freeze_time(t1 + WebCrawlerRequest.autoflush_seconds + 1)
+    inc('Googlebot')
+
+    expect(WebCrawlerRequest.count).to eq(1)
+  end
+
+  it 'flushes yesterdays results' do
+    t1 = Time.now.utc.at_midnight
+    freeze_time(t1)
+    inc('Googlebot')
+    freeze_time(t1.tomorrow)
+    inc('Googlebot')
+
+    WebCrawlerRequest.write_cache!
+    expect(WebCrawlerRequest.count).to eq(2)
+  end
+
+  it 'clears cache correctly' do
+    inc('Googlebot')
+    inc('Twitterbot')
+    WebCrawlerRequest.clear_cache!
+    WebCrawlerRequest.write_cache!
+
+    expect(WebCrawlerRequest.count).to eq(0)
+  end
+
+  it 'logs a few counts once flushed' do
+    time = Time.now.at_midnight
+    freeze_time(time)
+
+    3.times { inc('Googlebot') }
+    2.times { inc('Twitterbot') }
+    4.times { inc('Bingbot') }
+
+    WebCrawlerRequest.write_cache!
+
+    expect(web_crawler_request('Googlebot').count).to eq(3)
+    expect(web_crawler_request('Twitterbot').count).to eq(2)
+    expect(web_crawler_request('Bingbot').count).to eq(4)
+  end
+end
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index e7f50fbf11..20caa5b645 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Admin::GroupsController do
         }
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       group = Group.last
 
@@ -50,4 +50,68 @@ RSpec.describe Admin::GroupsController do
         .to contain_exactly(user, admin)
     end
   end
+
+  describe "#bulk_perform" do
+    let(:group) do
+      Fabricate(:group,
+        name: "test",
+        primary_group: true,
+        title: 'WAT',
+        grant_trust_level: 3
+      )
+    end
+
+    let(:user) { Fabricate(:user, trust_level: 2) }
+    let(:user2) { Fabricate(:user, trust_level: 4) }
+
+    it "can assign users to a group by email or username" do
+      put "/admin/groups/bulk.json", params: {
+        group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
+      }
+
+      expect(response.status).to eq(200)
+
+      user.reload
+      expect(user.primary_group).to eq(group)
+      expect(user.title).to eq("WAT")
+      expect(user.trust_level).to eq(3)
+
+      user2.reload
+      expect(user2.primary_group).to eq(group)
+      expect(user2.title).to eq("WAT")
+      expect(user2.trust_level).to eq(4)
+
+      json = ::JSON.parse(response.body)
+      expect(json['message']).to eq("2 users have been added to the group.")
+      expect(json['users_not_added'][0]).to eq("doesnt_exist")
+    end
+  end
+
+  context "#destroy" do
+    it 'should return the right response for an invalid group_id' do
+      delete "/admin/groups/123.json"
+
+      expect(response.status).to eq(404)
+    end
+
+    describe 'when group is automatic' do
+      it "returns the right response" do
+        group.update!(automatic: true)
+
+        delete "/admin/groups/#{group.id}.json"
+
+        expect(response.status).to eq(422)
+        expect(Group.find(group.id)).to eq(group)
+      end
+    end
+
+    describe 'for a non automatic group' do
+      it "returns the right response" do
+        delete "/admin/groups/#{group.id}.json"
+
+        expect(response.status).to eq(200)
+        expect(Group.find_by(id: group.id)).to eq(nil)
+      end
+    end
+  end
 end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
new file mode 100644
index 0000000000..2896d6e22e
--- /dev/null
+++ b/spec/requests/application_controller_spec.rb
@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+RSpec.describe ApplicationController do
+  describe '#redirect_to_login_if_required' do
+    let(:admin) { Fabricate(:admin) }
+
+    before do
+      admin  # to skip welcome wizard at home page `/`
+      SiteSetting.login_required = true
+    end
+
+    it "should carry-forward authComplete param to login page redirect" do
+      get "/?authComplete=true"
+      expect(response).to redirect_to('/login?authComplete=true')
+    end
+  end
+end
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
new file mode 100644
index 0000000000..9934db2450
--- /dev/null
+++ b/spec/requests/categories_controller_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe GroupsController do
+  let(:admin) { Fabricate(:admin) }
+  let(:category) { Fabricate(:category, user: admin) }
+
+  before do
+    category
+    sign_in(admin)
+  end
+
+  it "triggers a extensibility event" do
+    event = DiscourseEvent.track_events {
+      put "/categories/#{category.id}.json", params: {
+        name: 'hello',
+        color: 'ff0',
+        text_color: 'fff'
+      }
+    }.last
+
+    expect(event[:event_name]).to eq(:category_updated)
+    expect(event[:params].first).to eq(category)
+  end
+end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index f859a8058d..d1279fe23f 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -4,6 +4,8 @@ describe GroupsController do
   let(:user) { Fabricate(:user) }
   let(:group) { Fabricate(:group, users: [user]) }
   let(:moderator_group_id) { Group::AUTO_GROUPS[:moderators] }
+  let(:admin) { Fabricate(:admin) }
+  let(:moderator) { Fabricate(:moderator) }
 
   describe '#index' do
     let(:staff_group) do
@@ -11,11 +13,32 @@ describe GroupsController do
     end
 
     context 'when group directory is disabled' do
-      it 'should deny access' do
+      before do
         SiteSetting.enable_group_directory = false
+      end
 
+      it 'should deny access for an anon user' do
         get "/groups.json"
-        expect(response).to be_forbidden
+        expect(response.status).to eq(403)
+      end
+
+      it 'should deny access for a normal user' do
+        get "/groups.json"
+        expect(response.status).to eq(403)
+      end
+
+      it 'should not deny access for an admin' do
+        sign_in(admin)
+        get "/groups.json"
+
+        expect(response.status).to eq(200)
+      end
+
+      it 'should not deny access for a moderator' do
+        sign_in(moderator)
+        get "/groups.json"
+
+        expect(response.status).to eq(200)
       end
     end
 
@@ -206,6 +229,47 @@ describe GroupsController do
   end
 
   describe '#show' do
+    it "ensures the group can be seen" do
+      sign_in(Fabricate(:user))
+      group.update!(visibility_level: Group.visibility_levels[:owners])
+
+      get "/groups/#{group.name}.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "returns the right response" do
+      sign_in(user)
+      get "/groups/#{group.name}.json"
+
+      expect(response.status).to eq(200)
+
+      response_body = JSON.parse(response.body)
+
+      expect(response_body['group']['id']).to eq(group.id)
+      expect(response_body['extras']["visible_group_names"]).to eq([group.name])
+    end
+
+    context 'as an admin' do
+      it "returns the right response" do
+        sign_in(Fabricate(:admin))
+        get "/groups/#{group.name}.json"
+
+        expect(response.status).to eq(200)
+
+        response_body = JSON.parse(response.body)
+
+        expect(response_body['group']['id']).to eq(group.id)
+
+        groups = Group::AUTO_GROUPS.keys
+        groups.delete(:everyone)
+        groups.push(group.name)
+
+        expect(response_body['extras']["visible_group_names"])
+          .to contain_exactly(*groups.map(&:to_s))
+      end
+    end
+
     it 'should respond to HTML' do
       group.update_attribute(:bio_cooked, 'testing group bio')
 
@@ -228,13 +292,91 @@ describe GroupsController do
 
         expect(response.status).to eq(200)
 
-        response_body = JSON.parse(response.body)['basic_group']
+        response_body = JSON.parse(response.body)['group']
 
         expect(response_body["id"]).to eq(group.id)
       end
     end
   end
 
+  describe "#posts" do
+    it "ensures the group can be seen" do
+      sign_in(Fabricate(:user))
+      group.update!(visibility_level: Group.visibility_levels[:owners])
+
+      get "/groups/#{group.name}/posts.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "calls `posts_for` and responds with JSON" do
+      sign_in(user)
+      post = Fabricate(:post, user: user)
+      get "/groups/#{group.name}/posts.json"
+
+      expect(response.status).to eq(200)
+      expect(JSON.parse(response.body).first["id"]).to eq(post.id)
+    end
+  end
+
+  describe "#members" do
+    it "ensures the group can be seen" do
+      sign_in(Fabricate(:user))
+      group.update!(visibility_level: Group.visibility_levels[:owners])
+
+      get "/groups/#{group.name}/members.json"
+
+      expect(response.status).to eq(403)
+    end
+
+    it "ensures that membership can be paginated" do
+      5.times { group.add(Fabricate(:user)) }
+      usernames = group.users.map { |m| m.username }.sort
+
+      get "/groups/#{group.name}/members.json", params: { limit: 3 }
+
+      expect(response.status).to eq(200)
+
+      members = JSON.parse(response.body)["members"]
+
+      expect(members.map { |m| m['username'] }).to eq(usernames[0..2])
+
+      get "/groups/#{group.name}/members.json", params: { limit: 3, offset: 3 }
+
+      expect(response.status).to eq(200)
+
+      members = JSON.parse(response.body)["members"]
+
+      expect(members.map { |m| m['username'] }).to eq(usernames[3..5])
+    end
+  end
+
+  describe '#posts_feed' do
+    it 'renders RSS' do
+      get "/groups/#{group.name}/posts.rss"
+
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+  end
+
+  describe '#mentions_feed' do
+    it 'renders RSS' do
+      get "/groups/#{group.name}/mentions.rss"
+
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+
+    it 'fails when disabled' do
+      SiteSetting.enable_mentions = false
+
+      get "/groups/#{group.name}/mentions.rss"
+
+      expect(response.status).to eq(404)
+    end
+  end
+
   describe '#mentionable' do
     it "should return the right response" do
       sign_in(user)
@@ -274,11 +416,28 @@ describe GroupsController do
       end
 
       it "should be able update the group" do
-        group.update!(allow_membership_requests: false)
+        group.update!(
+          allow_membership_requests: false,
+          visibility_level: 2,
+          mentionable_level: 2,
+          messageable_level: 2,
+          default_notification_level: 0,
+          grant_trust_level: 0,
+          automatic_membership_retroactive: false
+        )
 
         expect do
           put "/groups/#{group.id}.json", params: {
             group: {
+              mentionable_level: 1,
+              messageable_level: 1,
+              visibility_level: 1,
+              automatic_membership_email_domains: 'test.org',
+              automatic_membership_retroactive: true,
+              title: 'haha',
+              primary_group: true,
+              grant_trust_level: 1,
+              incoming_email: 'test@mail.org',
               flair_bg_color: 'FFF',
               flair_color: 'BBB',
               flair_url: 'fa-adjust',
@@ -288,11 +447,13 @@ describe GroupsController do
               public_exit: true,
               allow_membership_requests: true,
               membership_request_template: 'testing',
+              default_notification_level: 1,
+              name: 'testing'
             }
           }
-        end.to change { GroupHistory.count }.by(9)
+        end.to change { GroupHistory.count }.by(13)
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         group.reload
 
@@ -305,7 +466,29 @@ describe GroupsController do
         expect(group.public_exit).to eq(true)
         expect(group.allow_membership_requests).to eq(true)
         expect(group.membership_request_template).to eq('testing')
-        expect(GroupHistory.last.subject).to eq('membership_request_template')
+        expect(group.name).to eq('test')
+        expect(group.visibility_level).to eq(2)
+        expect(group.mentionable_level).to eq(1)
+        expect(group.messageable_level).to eq(1)
+        expect(group.default_notification_level).to eq(1)
+        expect(group.automatic_membership_email_domains).to eq(nil)
+        expect(group.automatic_membership_retroactive).to eq(false)
+        expect(group.title).to eq('haha')
+        expect(group.primary_group).to eq(false)
+        expect(group.incoming_email).to eq(nil)
+        expect(group.grant_trust_level).to eq(0)
+      end
+
+      it 'should not be allowed to update automatic groups' do
+        group = Group.find(Group::AUTO_GROUPS[:admins])
+
+        put "/groups/#{group.id}.json", params: {
+          group: {
+            messageable_level: 1
+          }
+        }
+
+        expect(response.status).to eq(403)
       end
     end
 
@@ -313,13 +496,84 @@ describe GroupsController do
       before do
         user.update_attributes!(admin: true)
         sign_in(user)
+        SiteSetting.queue_jobs = true
       end
 
       it 'should be able to update the group' do
-        put "/groups/#{group.id}.json", params: { group: { flair_color: 'BBB' } }
+        group.update!(
+          visibility_level: 2,
+          automatic_membership_retroactive: false,
+          grant_trust_level: 0
+        )
 
-        expect(response).to be_success
-        expect(group.reload.flair_color).to eq('BBB')
+        put "/groups/#{group.id}.json", params: {
+          group: {
+            flair_color: 'BBB',
+            name: 'testing',
+            incoming_email: 'test@mail.org',
+            primary_group: true,
+            automatic_membership_email_domains: 'test.org',
+            automatic_membership_retroactive: true,
+            grant_trust_level: 2,
+            visibility_level: 1
+          }
+        }
+
+        expect(response.status).to eq(200)
+
+        group.reload
+        expect(group.flair_color).to eq('BBB')
+        expect(group.name).to eq('testing')
+        expect(group.incoming_email).to eq("test@mail.org")
+        expect(group.primary_group).to eq(true)
+        expect(group.visibility_level).to eq(1)
+        expect(group.automatic_membership_email_domains).to eq('test.org')
+        expect(group.automatic_membership_retroactive).to eq(true)
+        expect(group.grant_trust_level).to eq(2)
+
+        expect(Jobs::AutomaticGroupMembership.jobs.first["args"].first["group_id"])
+          .to eq(group.id)
+      end
+
+      it "should be able to update an automatic group" do
+        group = Group.find(Group::AUTO_GROUPS[:admins])
+
+        group.update!(
+          visibility_level: 2,
+          mentionable_level: 2,
+          messageable_level: 2,
+          default_notification_level: 2
+        )
+
+        put "/groups/#{group.id}.json", params: {
+          group: {
+            flair_color: 'BBB',
+            name: 'testing',
+            visibility_level: 1,
+            mentionable_level: 1,
+            messageable_level: 1,
+            default_notification_level: 1
+          }
+        }
+
+        expect(response.status).to eq(200)
+
+        group.reload
+        expect(group.flair_color).to eq(nil)
+        expect(group.name).to eq('admins')
+        expect(group.visibility_level).to eq(1)
+        expect(group.mentionable_level).to eq(1)
+        expect(group.messageable_level).to eq(1)
+        expect(group.default_notification_level).to eq(1)
+      end
+
+      it 'triggers a extensibility event' do
+        event = DiscourseEvent.track_events {
+          put "/groups/#{group.id}.json", params: { group: { flair_color: 'BBB' } }
+        }.last
+
+        expect(event[:event_name]).to eq(:group_updated)
+        expect(event[:params].first).to eq(group)
       end
     end
 
@@ -579,7 +833,8 @@ describe GroupsController do
         end
 
         it 'fails when multiple member already exists' do
-          user3 = Fabricate(:user)
+          user2.update!(username: 'alice')
+          user3 = Fabricate(:user, username: 'bob')
           [user2, user3].each { |user| group.add(user) }
 
           expect do
@@ -591,7 +846,7 @@ describe GroupsController do
 
           expect(JSON.parse(response.body)["errors"]).to include(I18n.t(
             "groups.errors.member_already_exist",
-            username: "#{user2.username}, #{user3.username}",
+            username: "alice, bob",
             count: 2
           ))
         end
@@ -750,7 +1005,7 @@ describe GroupsController do
     end
   end
 
-  describe "group histories" do
+  describe "#histories" do
     context 'when user is not signed in' do
       it 'should raise the right error' do
         get "/groups/#{group.name}/logs.json"
@@ -770,18 +1025,20 @@ describe GroupsController do
       end
     end
 
-    describe 'viewing history' do
-      context 'public group' do
-        before do
-          group.add_owner(user)
+    describe 'when user is a group owner' do
+      before do
+        group.add_owner(user)
+        sign_in(user)
+      end
 
+      describe 'when viewing a public group' do
+        before do
           group.update_attributes!(
             public_admission: true,
             public_exit: true
           )
 
           GroupActionLogger.new(user, group).log_change_group_settings
-          sign_in(user)
         end
 
         it 'should allow group owner to view history' do
@@ -798,40 +1055,56 @@ describe GroupsController do
         end
       end
 
-      context 'admin' do
-        let(:admin) { Fabricate(:admin) }
+      it 'should not be allowed to view history of an automatic group' do
+        group = Group.find_by(id: Group::AUTO_GROUPS[:admins])
 
-        before do
-          sign_in(admin)
-        end
+        get "/groups/#{group.name}/logs.json"
 
-        it 'should be able to view history' do
-          GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
+        expect(response.status).to eq(403)
+      end
+    end
 
-          get "/groups/#{group.name}/logs.json"
+    context 'when user is an admin' do
+      let(:admin) { Fabricate(:admin) }
 
-          expect(response).to be_success
+      before do
+        sign_in(admin)
+      end
 
-          result = JSON.parse(response.body)["logs"].first
+      it 'should be able to view history' do
+        GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
 
-          expect(result["action"]).to eq(GroupHistory.actions[3].to_s)
-        end
+        get "/groups/#{group.name}/logs.json"
 
-        it 'should be able to filter through the history' do
-          GroupActionLogger.new(admin, group).log_add_user_to_group(user)
-          GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
+        expect(response).to be_success
 
-          get "/groups/#{group.name}/logs.json", params: {
-            filters: { "action" => "add_user_to_group" }
-          }
+        result = JSON.parse(response.body)["logs"].first
 
-          expect(response).to be_success
+        expect(result["action"]).to eq(GroupHistory.actions[3].to_s)
+      end
 
-          logs = JSON.parse(response.body)["logs"]
+      it 'should be able to view history of automatic groups' do
+        group = Group.find_by(id: Group::AUTO_GROUPS[:admins])
 
-          expect(logs.count).to eq(1)
-          expect(logs.first["action"]).to eq(GroupHistory.actions[2].to_s)
-        end
+        get "/groups/#{group.name}/logs.json"
+
+        expect(response.status).to eq(200)
+      end
+
+      it 'should be able to filter through the history' do
+        GroupActionLogger.new(admin, group).log_add_user_to_group(user)
+        GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
+
+        get "/groups/#{group.name}/logs.json", params: {
+          filters: { "action" => "add_user_to_group" }
+        }
+
+        expect(response).to be_success
+
+        logs = JSON.parse(response.body)["logs"]
+
+        expect(logs.count).to eq(1)
+        expect(logs.first["action"]).to eq(GroupHistory.actions[2].to_s)
       end
     end
   end
@@ -973,4 +1246,34 @@ describe GroupsController do
       end
     end
   end
+
+  describe '#new' do
+    describe 'for an anon user' do
+      it 'should return 404' do
+        get '/groups/custom/new'
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    describe 'for a normal user' do
+      before { sign_in(user) }
+
+      it 'should return 404' do
+        get '/groups/custom/new'
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    describe 'for an admin user' do
+      before { sign_in(Fabricate(:admin)) }
+
+      it 'should return 404' do
+        get '/groups/custom/new'
+
+        expect(response.status).to eq(200)
+      end
+    end
+  end
 end
diff --git a/spec/requests/robots_txt_controller_spec.rb b/spec/requests/robots_txt_controller_spec.rb
index 68d5912be4..87232518cb 100644
--- a/spec/requests/robots_txt_controller_spec.rb
+++ b/spec/requests/robots_txt_controller_spec.rb
@@ -2,11 +2,84 @@ require 'rails_helper'
 
 RSpec.describe RobotsTxtController do
   describe '#index' do
-    it "returns index when indexing is allowed" do
-      SiteSetting.allow_index_in_robots_txt = true
-      get '/robots.txt'
 
-      expect(response.body).to include("Disallow: /u/")
+    context 'subfolder' do
+      it 'prefixes the rules with the directory' do
+        Discourse.stubs(:base_uri).returns('/forum')
+        get '/robots.txt'
+        expect(response.body).to include("\nDisallow: /forum/admin")
+      end
+    end
+
+    context 'crawl delay' do
+      it 'allows you to set crawl delay on particular bots' do
+        SiteSetting.allow_index_in_robots_txt = true
+        SiteSetting.slow_down_crawler_rate = 17
+        SiteSetting.slow_down_crawler_user_agents = 'bingbot|googlebot'
+        get '/robots.txt'
+        expect(response.body).to include("\nUser-agent: bingbot\nCrawl-delay: 17")
+        expect(response.body).to include("\nUser-agent: googlebot\nCrawl-delay: 17")
+      end
+    end
+
+    context 'allow_index_in_robots_txt is true' do
+
+      def expect_allowed_and_disallowed_sections(allow_index, disallow_index)
+        expect(allow_index).to be_present
+        expect(disallow_index).to be_present
+
+        allow_section = allow_index < disallow_index ?
+          response.body[allow_index...disallow_index] : response.body[allow_index..-1]
+
+        expect(allow_section).to include('Disallow: /u/')
+        expect(allow_section).to_not include("Disallow: /\n")
+
+        disallowed_section = allow_index < disallow_index ?
+          response.body[disallow_index..-1] : response.body[disallow_index...allow_index]
+        expect(disallowed_section).to include("Disallow: /\n")
+      end
+
+      it "returns index when indexing is allowed" do
+        SiteSetting.allow_index_in_robots_txt = true
+        get '/robots.txt'
+
+        i = response.body.index('User-agent: *')
+        expect(i).to be_present
+        expect(response.body[i..-1]).to include("Disallow: /u/")
+      end
+
+      it "can whitelist user agents" do
+        SiteSetting.whitelisted_crawler_user_agents = "Googlebot|Twitterbot"
+        get '/robots.txt'
+        expect(response.body).to include('User-agent: Googlebot')
+        expect(response.body).to include('User-agent: Twitterbot')
+
+        allowed_index = [response.body.index('User-agent: Googlebot'), response.body.index('User-agent: Twitterbot')].min
+        disallow_all_index = response.body.index('User-agent: *')
+
+        expect_allowed_and_disallowed_sections(allowed_index, disallow_all_index)
+      end
+
+      it "can blacklist user agents" do
+        SiteSetting.blacklisted_crawler_user_agents = "Googlebot|Twitterbot"
+        get '/robots.txt'
+        expect(response.body).to include('User-agent: Googlebot')
+        expect(response.body).to include('User-agent: Twitterbot')
+
+        disallow_index = [response.body.index('User-agent: Googlebot'), response.body.index('User-agent: Twitterbot')].min
+        allow_index = response.body.index('User-agent: *')
+
+        expect_allowed_and_disallowed_sections(allow_index, disallow_index)
+      end
+
+      it "ignores blacklist if whitelist is set" do
+        SiteSetting.whitelisted_crawler_user_agents = "Googlebot|Twitterbot"
+        SiteSetting.blacklisted_crawler_user_agents = "Bananabot"
+        get '/robots.txt'
+        expect(response.body).to_not include('Bananabot')
+        expect(response.body).to include('User-agent: Googlebot')
+        expect(response.body).to include('User-agent: Twitterbot')
+      end
     end
 
     it "returns noindex when indexing is disallowed" do
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index f77f8ee312..1c6ca7d811 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -54,6 +54,29 @@ describe TagsController do
     end
   end
 
+  describe "#update" do
+    let(:tag) { Fabricate(:tag) }
+    let(:admin) { Fabricate(:admin) }
+
+    before do
+      tag
+      sign_in(admin)
+    end
+
+    it "triggers a extensibility event" do
+      event = DiscourseEvent.track_events {
+        put "/tags/#{tag.name}.json", params: {
+          tag: {
+            id: 'hello'
+          }
+        }
+      }.last
+
+      expect(event[:event_name]).to eq(:tag_updated)
+      expect(event[:params].first).to eq(tag)
+    end
+  end
+
   describe '#personal_messages' do
     let(:regular_user) { Fabricate(:trust_level_4) }
     let(:moderator) { Fabricate(:moderator) }
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index d5573e23fd..64d11da2c4 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -538,4 +538,71 @@ RSpec.describe TopicsController do
     end
   end
 
+  describe "crawler" do
+
+    context "when not a crawler" do
+      it "renders with the application layout" do
+        get topic.url
+
+        body = response.body
+
+        expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
+        expect(body).to have_tag(:meta, with: { name: 'fragment' })
+      end
+    end
+
+    context "when a crawler" do
+      it "renders with the crawler layout, and handles proper pagination" do
+
+        page1_time = 3.months.ago
+        page2_time = 2.months.ago
+        page3_time = 1.month.ago
+
+        freeze_time page1_time
+
+        topic = Fabricate(:topic)
+        Fabricate(:post, topic_id: topic.id)
+        Fabricate(:post, topic_id: topic.id)
+
+        freeze_time page2_time
+        Fabricate(:post, topic_id: topic.id)
+        Fabricate(:post, topic_id: topic.id)
+
+        freeze_time page3_time
+        Fabricate(:post, topic_id: topic.id)
+
+        # ugly, but no inteface to set this and we don't want to create
+        # 100 posts to test this thing
+        TopicView.stubs(:chunk_size).returns(2)
+
+        user_agent = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
+
+        get topic.url, env: { "HTTP_USER_AGENT" => user_agent }
+
+        body = response.body
+
+        expect(body).to have_tag(:body, with: { class: 'crawler' })
+        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+        expect(body).to include('<link rel="next" href="' + topic.relative_url + "?page=2")
+
+        expect(response.headers['Last-Modified']).to eq(page1_time.httpdate)
+
+        get topic.url + "?page=2", env: { "HTTP_USER_AGENT" => user_agent }
+        body = response.body
+
+        expect(response.headers['Last-Modified']).to eq(page2_time.httpdate)
+
+        expect(body).to include('<link rel="prev" href="' + topic.relative_url)
+        expect(body).to include('<link rel="next" href="' + topic.relative_url + "?page=3")
+
+        get topic.url + "?page=3", env: { "HTTP_USER_AGENT" => user_agent }
+        body = response.body
+
+        expect(response.headers['Last-Modified']).to eq(page3_time.httpdate)
+        expect(body).to include('<link rel="prev" href="' + topic.relative_url + "?page=2")
+      end
+    end
+
+  end
+
 end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index bd5f961f1f..6f8be029cf 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -436,7 +436,7 @@ RSpec.describe UsersController do
             SiteSetting.enable_local_logins = false
 
             post "/users/second_factors.json", params: {
-              password: 'somecomplicatedpassword'
+              password: 'myawesomepassword'
             }
 
             expect(response.status).to eq(404)
@@ -449,7 +449,7 @@ RSpec.describe UsersController do
             SiteSetting.enable_sso = true
 
             post "/users/second_factors.json", params: {
-              password: 'somecomplicatedpassword'
+              password: 'myawesomepassword'
             }
 
             expect(response.status).to eq(404)
@@ -461,7 +461,7 @@ RSpec.describe UsersController do
           user.user_second_factor.update!(data: "abcdefghijklmnop")
 
           post "/users/second_factors.json", params: {
-            password: 'somecomplicatedpassword'
+            password: 'myawesomepassword'
           }
 
           expect(response.status).to eq(200)
diff --git a/spec/serializers/post_revision_serializer_spec.rb b/spec/serializers/post_revision_serializer_spec.rb
new file mode 100644
index 0000000000..9bed7723e0
--- /dev/null
+++ b/spec/serializers/post_revision_serializer_spec.rb
@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+describe PostRevisionSerializer do
+  let(:post) { Fabricate(:post, version: 2) }
+
+  context 'hidden tags' do
+    let(:public_tag) { Fabricate(:tag, name: 'public') }
+    let(:public_tag2) { Fabricate(:tag, name: 'visible') }
+    let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+    let(:hidden_tag2) { Fabricate(:tag, name: 'secret') }
+
+    let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name, hidden_tag2.name]) }
+
+    let(:post_revision) do
+      Fabricate(:post_revision,
+        post: post,
+        modifications: { 'tags' => [['public', 'hidden'], ['visible', 'hidden']] }
+      )
+    end
+
+    let(:post_revision2) do
+      Fabricate(:post_revision,
+        post: post,
+        modifications: { 'tags' => [['visible', 'hidden', 'secret'], ['visible', 'hidden']] }
+      )
+    end
+
+    before do
+      SiteSetting.tagging_enabled = true
+      staff_tag_group
+      post.topic.tags = [public_tag2, hidden_tag]
+    end
+
+    it 'returns all tag changes to staff' do
+      json = PostRevisionSerializer.new(post_revision, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
+      expect(json[:tags_changes][:previous]).to include(public_tag.name)
+      expect(json[:tags_changes][:previous]).to include(hidden_tag.name)
+      expect(json[:tags_changes][:current]).to include(public_tag2.name)
+      expect(json[:tags_changes][:current]).to include(hidden_tag.name)
+    end
+
+    it 'does not return hidden tags to non-staff' do
+      json = PostRevisionSerializer.new(post_revision, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+      expect(json[:tags_changes][:previous]).to eq([public_tag.name])
+      expect(json[:tags_changes][:current]).to eq([public_tag2.name])
+    end
+
+    it 'does not show tag modificiatons if changes are not visible to the user' do
+      json = PostRevisionSerializer.new(post_revision2, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+      expect(json[:tags_changes]).to_not be_present
+    end
+  end
+end
diff --git a/spec/serializers/suggested_topic_serializer_spec.rb b/spec/serializers/suggested_topic_serializer_spec.rb
index b9fcdb6d52..da29757bf9 100644
--- a/spec/serializers/suggested_topic_serializer_spec.rb
+++ b/spec/serializers/suggested_topic_serializer_spec.rb
@@ -2,11 +2,12 @@ require 'rails_helper'
 
 describe SuggestedTopicSerializer do
   let(:user) { Fabricate(:user) }
+  let(:admin) { Fabricate(:admin) }
 
   describe '#featured_link and #featured_link_root_domain' do
     let(:featured_link) { 'http://meta.discourse.org' }
     let(:topic) { Fabricate(:topic, featured_link: featured_link, category: Fabricate(:category, topic_featured_link_allowed: true)) }
-    subject(:json) { described_class.new(topic, scope: Guardian.new(user), root: false).as_json }
+    subject(:json) { SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json }
 
     context 'when topic featured link is disable' do
       before do
@@ -32,4 +33,26 @@ describe SuggestedTopicSerializer do
       end
     end
   end
+
+  describe 'hidden tags' do
+    let(:topic) { Fabricate(:topic) }
+    let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+    let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+    before do
+      SiteSetting.tagging_enabled = true
+      staff_tag_group
+      topic.tags << hidden_tag
+    end
+
+    it 'returns hidden tag to staff' do
+      json = SuggestedTopicSerializer.new(topic, scope: Guardian.new(admin), root: false).as_json
+      expect(json[:tags]).to eq([hidden_tag.name])
+    end
+
+    it 'does not return hidden tag to non-staff' do
+      json = SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json
+      expect(json[:tags]).to eq([])
+    end
+  end
 end
diff --git a/spec/serializers/topic_list_item_serializer_spec.rb b/spec/serializers/topic_list_item_serializer_spec.rb
index 86f599e30d..319d8f02c6 100644
--- a/spec/serializers/topic_list_item_serializer_spec.rb
+++ b/spec/serializers/topic_list_item_serializer_spec.rb
@@ -43,4 +43,25 @@ describe TopicListItemSerializer do
       expect(serialized[:featured_link_root_domain]).to eq(nil)
     end
   end
+
+  describe 'hidden tags' do
+    let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+    let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+    before do
+      SiteSetting.tagging_enabled = true
+      staff_tag_group
+      topic.tags << hidden_tag
+    end
+
+    it 'returns hidden tag to staff' do
+      json = TopicListItemSerializer.new(topic, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
+      expect(json[:tags]).to eq([hidden_tag.name])
+    end
+
+    it 'does not return hidden tag to non-staff' do
+      json = TopicListItemSerializer.new(topic, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+      expect(json[:tags]).to eq([])
+    end
+  end
 end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index a4b88a1a1c..8a6e27b056 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -1,13 +1,14 @@
 require 'rails_helper'
 
 describe TopicViewSerializer do
-  def serialize_topic(topic, user)
-    topic_view = TopicView.new(topic.id, user)
-    described_class.new(topic_view, scope: Guardian.new(user), root: false).as_json
+  def serialize_topic(topic, user_arg)
+    topic_view = TopicView.new(topic.id, user_arg)
+    described_class.new(topic_view, scope: Guardian.new(user_arg), root: false).as_json
   end
 
   let(:topic) { Fabricate(:topic) }
   let(:user) { Fabricate(:user) }
+  let(:admin) { Fabricate(:admin) }
 
   describe '#featured_link and #featured_link_root_domain' do
     let(:featured_link) { 'http://meta.discourse.org' }
@@ -69,7 +70,6 @@ describe TopicViewSerializer do
 
   describe 'when tags added to private message topics' do
     let(:moderator) { Fabricate(:moderator) }
-    let(:admin) { Fabricate(:admin) }
     let(:tag) { Fabricate(:tag) }
     let(:pm) do
       Fabricate(:private_message_topic, tags: [tag], topic_allowed_users: [
@@ -104,4 +104,25 @@ describe TopicViewSerializer do
       end
     end
   end
+
+  describe 'with hidden tags' do
+    let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
+    let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+
+    before do
+      SiteSetting.tagging_enabled = true
+      staff_tag_group
+      topic.tags << hidden_tag
+    end
+
+    it 'returns hidden tag to staff' do
+      json = serialize_topic(topic, admin)
+      expect(json[:tags]).to eq([hidden_tag.name])
+    end
+
+    it 'does not return hidden tag to non-staff' do
+      json = serialize_topic(topic, user)
+      expect(json[:tags]).to eq([])
+    end
+  end
 end
diff --git a/spec/services/destroy_task_spec.rb b/spec/services/destroy_task_spec.rb
new file mode 100644
index 0000000000..1319393853
--- /dev/null
+++ b/spec/services/destroy_task_spec.rb
@@ -0,0 +1,76 @@
+require 'rails_helper'
+
+describe DestroyTask do
+
+  describe 'destroy topics' do
+    let!(:c) { Fabricate(:category) }
+    let!(:t) { Fabricate(:topic, category_id: c.id) }
+    let!(:p) { Fabricate(:post, topic_id: t.id) }
+    let!(:c2) { Fabricate(:category) }
+    let!(:t2) { Fabricate(:topic, category_id: c2.id) }
+    let!(:p2) { Fabricate(:post, topic_id: t2.id) }
+
+    it 'destroys all topics in a category' do
+      before_count = Topic.where(category_id: c.id).count
+      DestroyTask.destroy_topics(c.slug)
+      expect(Topic.where(category_id: c.id).count).to eq before_count - 1
+    end
+
+    it "doesn't destroy system topics" do
+      DestroyTask.destroy_topics(c2.slug)
+      expect(Topic.where(category_id: c2.id).count).to eq 1
+    end
+
+    it 'destroys topics in all categories' do
+      DestroyTask.destroy_topics_all_categories
+      expect(Post.where(topic_id: [t.id, t2.id]).count).to eq 0
+    end
+  end
+
+  describe 'private messages' do
+    let!(:pm) { Fabricate(:private_message_post) }
+    let!(:pm2) { Fabricate(:private_message_post) }
+
+    it 'destroys all private messages' do
+      DestroyTask.destroy_private_messages
+      expect(Topic.where(archetype: "private_message").count).to eq 0
+    end
+  end
+
+  describe 'groups' do
+    let!(:g) { Fabricate(:group) }
+    let!(:g2) { Fabricate(:group) }
+
+    it 'destroys all groups' do
+      DestroyTask.destroy_groups
+      expect(Group.where(automatic: false).count).to eq 0
+    end
+
+    it "doesn't destroy default groups" do
+      before_count = Group.count
+      DestroyTask.destroy_groups
+      expect(Group.count).to eq before_count - 2
+    end
+  end
+
+  describe 'users' do
+    it 'destroys all non-admin users' do
+      before_count = User.count
+
+      Fabricate(:user)
+      Fabricate(:user)
+      Fabricate(:admin)
+
+      DestroyTask.destroy_users
+      expect(User.where(admin: false).count).to eq 0
+      # admin does not get detroyed
+      expect(User.count).to eq before_count + 1
+    end
+  end
+
+  describe 'stats' do
+    it 'destroys all site stats' do
+      DestroyTask.destroy_stats
+    end
+  end
+end
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 8682d72811..e36d603df0 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -21,6 +21,8 @@ RSpec::Matchers.define :add_notification do |user, notification_type|
   supports_block_expectations
 end
 
+RSpec::Matchers.define_negated_matcher :not_add_notification, :add_notification
+
 describe PostAlerter do
 
   let!(:evil_trout) { Fabricate(:evil_trout) }
@@ -115,6 +117,46 @@ describe PostAlerter do
 
       expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(3)
     end
+
+    it 'notifies flaggers when flagged post gets unhidden by edit' do
+      post = create_post
+      walterwhite = Fabricate(:walter_white)
+      coding_horror = Fabricate(:coding_horror)
+
+      PostActionNotifier.enable
+      SiteSetting.flags_required_to_hide_post = 2
+
+      PostAction.act(evil_trout, post, PostActionType.types[:spam])
+      PostAction.act(walterwhite, post, PostActionType.types[:spam])
+
+      post.reload
+      expect(post.hidden).to eq(true)
+
+      expect {
+        post.revise(post.user, raw: post.raw + " ha I edited it ")
+      }.to add_notification(evil_trout, :edited)
+        .and add_notification(walterwhite, :edited)
+
+      post.reload
+      expect(post.hidden).to eq(false)
+
+      notification = walterwhite.notifications.last
+      expect(notification.topic_id).to eq(post.topic.id)
+      expect(notification.post_number).to eq(post.post_number)
+      expect(notification.data_hash["display_username"]).to eq(post.user.username)
+
+      PostAction.act(coding_horror, post, PostActionType.types[:spam])
+      PostAction.act(walterwhite, post, PostActionType.types[:off_topic])
+
+      post.reload
+      expect(post.hidden).to eq(true)
+
+      expect {
+        post.revise(post.user, raw: post.raw + " ha I edited it again ")
+      }.to not_add_notification(evil_trout, :edited)
+        .and not_add_notification(coding_horror, :edited)
+        .and not_add_notification(walterwhite, :edited)
+    end
   end
 
   context 'likes' do
@@ -370,6 +412,14 @@ describe PostAlerter do
 
     let(:alice) { Fabricate(:user, username: 'alice') }
     let(:bob) { Fabricate(:user, username: 'bob') }
+    let(:carol) { Fabricate(:admin, username: 'carol') }
+    let(:dave) { Fabricate(:user, username: 'dave') }
+    let(:eve) { Fabricate(:user, username: 'eve') }
+    let(:group) { Fabricate(:group, name: 'group', mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
+
+    before do
+      group.bulk_add([alice.id, carol.id])
+    end
 
     def create_post_with_alerts(args = {})
       post = Fabricate(:post, args)
@@ -421,6 +471,21 @@ describe PostAlerter do
               args = { user: bob, topic: pm_topic, raw: 'Hello @alice' }
               expect { create_post_with_alerts(args) }.to add_notification(alice, :mentioned)
             end
+
+            it "notifies about @username mentions by non-human users" do
+              args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @alice' }
+              expect { create_post_with_alerts(args) }.to add_notification(alice, :mentioned)
+            end
+
+            it "notifies about @group mention" do
+              args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+              expect { create_post_with_alerts(args) }.to add_notification(alice, :group_mentioned)
+            end
+
+            it "notifies about @group mentions by non-human users" do
+              args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @group' }
+              expect { create_post_with_alerts(args) }.to add_notification(alice, :group_mentioned)
+            end
           end
         end
 
@@ -433,21 +498,44 @@ describe PostAlerter do
             args = { user: bob, topic: pm_topic, raw: 'Hello @alice' }
             expect { create_post_with_alerts(args) }.to_not add_notification(alice, :mentioned)
           end
+
+          it "does not notify about @group mention" do
+            args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+            expect { create_post_with_alerts(args) }.to_not add_notification(alice, :group_mentioned)
+          end
         end
       end
 
       context "when mentioned user is not part of conversation" do
         it "notifies about @username mention when mentioned user is allowed to see message" do
-          carol = Fabricate(:admin, username: 'carol')
           args = { user: bob, topic: pm_topic, raw: 'Hello @carol' }
           expect { create_post_with_alerts(args) }.to add_notification(carol, :mentioned)
         end
 
+        it "does not notify about @username mention by non-human user even though mentioned user is allowed to see message" do
+          args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @carol' }
+          expect { create_post_with_alerts(args) }.to_not add_notification(carol, :mentioned)
+        end
+
         it "does not notify about @username mention when mentioned user is not allowed to see message" do
-          dave = Fabricate(:user, username: 'dave')
           args = { user: bob, topic: pm_topic, raw: 'Hello @dave' }
           expect { create_post_with_alerts(args) }.to_not add_notification(dave, :mentioned)
         end
+
+        it "notifies about @group mention when mentioned user is allowed to see message" do
+          args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+          expect { create_post_with_alerts(args) }.to add_notification(carol, :group_mentioned)
+        end
+
+        it "does not notify about @group mention by non-human user even though mentioned user is allowed to see message" do
+          args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @group' }
+          expect { create_post_with_alerts(args) }.to_not add_notification(carol, :group_mentioned)
+        end
+
+        it "does not notify about @group mention when mentioned user is not allowed to see message" do
+          args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+          expect { create_post_with_alerts(args) }.to_not add_notification(dave, :group_mentioned)
+        end
       end
     end
 
@@ -455,7 +543,8 @@ describe PostAlerter do
       let(:pm_topic) do
         Fabricate(:private_message_topic, user: alice, topic_allowed_users: [
           Fabricate.build(:topic_allowed_user, user: alice),
-          Fabricate.build(:topic_allowed_user, user: bob)
+          Fabricate.build(:topic_allowed_user, user: bob),
+          Fabricate.build(:topic_allowed_user, user: eve)
         ])
       end
       let(:first_post) { Fabricate(:post, topic: pm_topic, user: pm_topic.user) }
@@ -464,14 +553,20 @@ describe PostAlerter do
     end
 
     context "group message" do
-      let(:group) { Fabricate(:group) }
+      let(:some_group) { Fabricate(:group, name: 'some_group') }
       let(:pm_topic) do
         Fabricate(:private_message_topic, user: alice, topic_allowed_groups: [
-          Fabricate.build(:topic_allowed_group, group: group)
+          Fabricate.build(:topic_allowed_group, group: some_group)
+        ], topic_allowed_users: [
+          Fabricate.build(:topic_allowed_user, user: eve)
         ])
       end
       let(:first_post) { Fabricate(:post, topic: pm_topic, user: pm_topic.user) }
 
+      before do
+        some_group.add(alice)
+      end
+
       include_context "message"
     end
   end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index ccf428dc62..e958136b9d 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -125,17 +125,10 @@ describe UserDestroyer do
           @user.stubs(:first_post_created_at).returns(Time.zone.now)
         end
 
-        it 'should not delete the user' do
-          expect { destroy rescue nil }.to_not change { User.count }
-        end
-
-        it 'should raise an error' do
-          expect { destroy }.to raise_error(UserDestroyer::PostsExistError)
-        end
-
-        it 'should not log the action' do
+        it 'should raise the right error' do
           StaffActionLogger.any_instance.expects(:log_user_deletion).never
-          destroy rescue nil
+          expect { destroy }.to raise_error(UserDestroyer::PostsExistError)
+          expect(user.reload.id).to be_present
         end
       end
 
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index a1003ab4f9..a65004ed7e 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -27,6 +27,10 @@ describe UserUpdater do
   end
 
   describe '#update' do
+    let(:category) { Fabricate(:category) }
+    let(:tag) { Fabricate(:tag) }
+    let(:tag2) { Fabricate(:tag) }
+
     it 'saves user' do
       user = Fabricate(:user, name: 'Billy Bob')
       updater = UserUpdater.new(acting_user, user)
@@ -37,18 +41,21 @@ describe UserUpdater do
     end
 
     it 'can update categories and tags' do
-      category = Fabricate(:category)
-      tag = Fabricate(:tag)
-
       user = Fabricate(:user)
       updater = UserUpdater.new(acting_user, user)
-      updater.update(watched_tags: [tag.name], muted_category_ids: [category.id])
+      updater.update(watched_tags: "#{tag.name},#{tag2.name}", muted_category_ids: [category.id])
 
       expect(TagUser.where(
         user_id: user.id,
         tag_id: tag.id,
         notification_level: TagUser.notification_levels[:watching]
-      ).count).to eq(1)
+      ).exists?).to eq(true)
+
+      expect(TagUser.where(
+        user_id: user.id,
+        tag_id: tag2.id,
+        notification_level: TagUser.notification_levels[:watching]
+      ).exists?).to eq(true)
 
       expect(CategoryUser.where(
         user_id: user.id,
@@ -58,6 +65,18 @@ describe UserUpdater do
 
     end
 
+    it "doesn't remove notification prefs when updating something else" do
+      user = Fabricate(:user)
+      TagUser.create!(user: user, tag: tag, notification_level: TagUser.notification_levels[:watching])
+      CategoryUser.create!(user: user, category: category, notification_level: CategoryUser.notification_levels[:muted])
+
+      updater = UserUpdater.new(acting_user, user)
+      updater.update(name: "Steve Dave")
+
+      expect(TagUser.where(user: user).count).to eq(1)
+      expect(CategoryUser.where(user: user).count).to eq(1)
+    end
+
     it 'updates various fields' do
       user = Fabricate(:user)
       updater = UserUpdater.new(acting_user, user)
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index ceea993555..94d245caae 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -24,11 +24,7 @@ module IntegrationHelpers
   end
 
   def sign_in(user)
-    password = 'somecomplicatedpassword'
-    user.update!(password: password)
-    Fabricate(:email_token, confirmed: true, user: user)
-    post "/session.json", params: { login: user.username, password: password }
-    expect(response).to be_success
+    get "/session/#{user.username}/become"
     user
   end
 end
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index e35505eca6..bd60b6cbb7 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 
 acceptance("Composer", {
   loggedIn: true,
@@ -335,3 +335,39 @@ QUnit.test("Composer draft with dirty reply can toggle to edit", assert => {
     assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
   });
 });
+
+acceptance("Composer and uncategorized is not allowed", {
+  loggedIn: true,
+  settings: {
+    enable_whispers: true,
+    allow_uncategorized_topics: false
+  }
+});
+
+QUnit.test("Disable body until category is selected", assert => {
+  replaceCurrentUser({ admin: false, staff: false, trust_level: 1 });
+
+  visit("/");
+  click('#create-topic');
+  andThen(() => {
+    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
+    assert.ok(exists('.title-input .popup-tip.bad.hide'), 'title errors are hidden by default');
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.bad.hide'), 'body errors are hidden by default');
+    assert.ok(exists('.d-editor-textarea-wrapper.disabled'), 'textarea is disabled');
+  });
+
+  const categoryChooser = selectKit('.category-chooser');
+
+  categoryChooser.expand().selectRowByValue(2);
+
+  andThen(() => {
+    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is enabled');
+  });
+
+  fillIn('.d-editor-input', 'Now I can type stuff');
+  categoryChooser.expand().selectRowByValue('__none__');
+
+  andThen(() => {
+    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is still enabled');
+  });
+});
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js.es6
index d8083623f2..60bd14487e 100644
--- a/test/javascripts/acceptance/composer-topic-links-test.js.es6
+++ b/test/javascripts/acceptance/composer-topic-links-test.js.es6
@@ -1,4 +1,4 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 
 acceptance("Composer topic featured links", {
   loggedIn: true,
@@ -76,3 +76,30 @@ QUnit.test("onebox with title but extra words in title field", assert => {
     assert.equal(find('.title-input input').val(), "http://www.example.com/has-title.html test", "title is unchanged");
   });
 });
+
+acceptance("Composer topic featured links when uncategorized is not allowed", {
+  loggedIn: true,
+  settings: {
+    topic_featured_link_enabled: true,
+    max_topic_title_length: 80,
+    enable_markdown_linkify: true,
+    allow_uncategorized_topics: false
+  }
+});
+
+QUnit.test("Pasting a link enables the text input area", assert => {
+  replaceCurrentUser({ admin: false, staff: false, trust_level: 1 });
+
+  visit("/");
+  click('#create-topic');
+  andThen(() => {
+    assert.ok(find('.d-editor-textarea-wrapper.disabled').length, 'textarea is disabled');
+  });
+  fillIn('#reply-title', "http://www.example.com/has-title.html");
+  andThen(() => {
+    assert.ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
+    assert.equal(find('.title-input input').val(), "An interesting article", "title is from the oneboxed article");
+    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is enabled');
+  });
+});
diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js.es6
index 5e21fc8b60..19a0d39c6b 100644
--- a/test/javascripts/acceptance/forgot-password-test.js.es6
+++ b/test/javascripts/acceptance/forgot-password-test.js.es6
@@ -25,14 +25,14 @@ QUnit.test("requesting password reset", assert => {
 
   andThen(() => {
     assert.equal(
-      find('button[title="Reset Password"]').attr("disabled"),
+      find('.forgot-password-reset').attr("disabled"),
       "disabled",
       'it should disable the button until the field is filled'
     );
   });
 
   fillIn("#username-or-email", 'someuser');
-  click('button[title="Reset Password"]');
+  click('.forgot-password-reset');
 
   andThen(() => {
     assert.equal(
@@ -43,7 +43,7 @@ QUnit.test("requesting password reset", assert => {
   });
 
   fillIn("#username-or-email", 'someuser@gmail.com');
-  click('button[title="Reset Password"]');
+  click('.forgot-password-reset');
 
   andThen(() => {
     assert.equal(
@@ -59,7 +59,7 @@ QUnit.test("requesting password reset", assert => {
     userFound = true;
   });
 
-  click('button[title="Reset Password"]');
+  click('.forgot-password-reset');
 
   andThen(() => {
     assert.notOk(exists(find(".alert-error")), 'it should remove the flash error when succeeding');
@@ -75,7 +75,7 @@ QUnit.test("requesting password reset", assert => {
   click("header .login-button");
   click('#forgot-password-link');
   fillIn("#username-or-email", 'someuser@gmail.com');
-  click('button[title="Reset Password"]');
+  click('.forgot-password-reset');
 
   andThen(() => {
     assert.equal(
diff --git a/test/javascripts/acceptance/group-edit-test.js.es6 b/test/javascripts/acceptance/group-edit-test.js.es6
deleted file mode 100644
index a03cb17629..0000000000
--- a/test/javascripts/acceptance/group-edit-test.js.es6
+++ /dev/null
@@ -1,61 +0,0 @@
-import { acceptance, logIn } from "helpers/qunit-helpers";
-
-acceptance("Editing Group");
-
-QUnit.test("Editing group", assert => {
-  logIn();
-  Discourse.reset();
-
-  visit("/groups/discourse/edit");
-
-  andThen(() => {
-    assert.ok(find('.group-flair-inputs').length === 1, 'it should display avatar flair inputs');
-    assert.ok(find('.group-edit-bio').length === 1, 'it should display group bio input');
-    assert.ok(find('.group-edit-full-name').length === 1, 'it should display group full name input');
-
-    assert.ok(
-      find('.group-edit-public-admission').length === 1,
-      'it should display group public admission input'
-    );
-
-    assert.ok(
-      find('.group-edit-public-exit').length === 1,
-      'it should display group public exit input'
-    );
-
-    assert.ok(find('.group-edit-allow-membership-requests').length === 1, 'it should display group allow_membership_requets input');
-
-    assert.ok(
-      find('.group-edit-allow-membership-requests[disabled]').length === 1,
-      'it should disable group allow_membership_request input'
-    );
-  });
-
-  click('.group-edit-public-admission');
-  click('.group-edit-allow-membership-requests');
-
-  andThen(() => {
-    assert.ok(
-      find('.group-edit-public-admission[disabled]').length === 1,
-      'it should disable group public admission input'
-    );
-
-    assert.ok(
-      find('.group-edit-public-exit[disabled]').length === 0,
-      'it should not disable group public exit input'
-    );
-
-    assert.equal(
-      find('.group-edit-membership-request-template').length, 1,
-      'it should display the membership request template field'
-    );
-  });
-});
-
-QUnit.test("Editing group as an anonymous user", assert => {
-  visit("/groups/discourse/edit");
-
-  andThen(() => {
-    assert.ok(count('.group-members tr') > 0, "it should redirect to members page for an anonymous user");
-  });
-});
diff --git a/test/javascripts/acceptance/group-index-test.js.es6 b/test/javascripts/acceptance/group-index-test.js.es6
index cfd52691af..caa0a3b8d9 100644
--- a/test/javascripts/acceptance/group-index-test.js.es6
+++ b/test/javascripts/acceptance/group-index-test.js.es6
@@ -9,11 +9,6 @@ QUnit.test("Viewing Members as anon user", assert => {
     assert.ok(count('.avatar-flair .fa-adjust') === 1, "it displays the group's avatar flair");
     assert.ok(count('.group-members tr') > 0, "it lists group members");
 
-    assert.ok(
-      count('.group-navigation-dropdown') === 0,
-      'it should not display the group navigation dropdown menu'
-    );
-
     assert.ok(
       count('.group-member-dropdown') === 0,
       'it does not allow anon user to manage group members'
@@ -34,11 +29,6 @@ QUnit.test("Viewing Members as an admin user", assert => {
   visit("/groups/discourse");
 
   andThen(() => {
-    assert.ok(
-      count('.group-navigation-dropdown') === 1,
-      'it should display the group navigation dropdown menu'
-    );
-
     assert.ok(
       count('.group-member-dropdown') > 0,
       'it allows admin user to manage group members'
@@ -50,23 +40,4 @@ QUnit.test("Viewing Members as an admin user", assert => {
       'it should display the right filter placehodler'
     );
   });
-
-  selectKit('.group-navigation-dropdown').expand().selectRowByValue('manageMembership');
-
-  andThen(() => {
-    assert.ok(
-      count('.group-membership') === 1,
-      'it should display the right modal'
-    );
-
-    assert.ok(
-      count('#group-membership-user-selector') === 1,
-      'it should display the user selector'
-    );
-
-    assert.ok(
-      count(".group-membership-make-owner input[type='checkbox']") === 1,
-      'it should display the input to set users as owners'
-    );
-  });
 });
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js.es6 b/test/javascripts/acceptance/group-manage-interaction-test.js.es6
new file mode 100644
index 0000000000..59793c1a8e
--- /dev/null
+++ b/test/javascripts/acceptance/group-manage-interaction-test.js.es6
@@ -0,0 +1,71 @@
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
+
+acceptance("Managing Group Interaction Settings", {
+  loggedIn: true,
+  settings: {
+    email_in: true
+  }
+});
+
+QUnit.test("As an admin", assert => {
+  visit("/groups/discourse/manage/interaction");
+
+  andThen(() => {
+    assert.equal(
+      find('.groups-form-visibility-level').length, 1,
+      'it should display visibility level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-mentionable-level').length, 1,
+      'it should display mentionable level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-messageable-level').length, 1,
+      'it should display messageable level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-incoming-email').length, 1,
+      'it should display incoming email input'
+    );
+
+    assert.equal(
+      find('.groups-form-default-notification-level').length, 1,
+      'it should display default notification level input'
+    );
+  });
+});
+
+QUnit.test("As a group owner", assert => {
+  replaceCurrentUser({ admin: false, staff: false });
+  visit("/groups/discourse/manage/interaction");
+
+  andThen(() => {
+    assert.equal(
+      find('.groups-form-visibility-level').length, 0,
+      'it should display visibility level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-mentionable-level').length, 1,
+      'it should display mentionable level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-messageable-level').length, 1,
+      'it should display messageable level selector'
+    );
+
+    assert.equal(
+      find('.groups-form-incoming-email').length, 0,
+      'it should not display incoming email input'
+    );
+
+    assert.equal(
+      find('.groups-form-default-notification-level').length, 1,
+      'it should display default notification level input'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/group-logs-test.js.es6 b/test/javascripts/acceptance/group-manage-logs-test.js.es6
similarity index 65%
rename from test/javascripts/acceptance/group-logs-test.js.es6
rename to test/javascripts/acceptance/group-manage-logs-test.js.es6
index 86d760cb0c..95c76dc70a 100644
--- a/test/javascripts/acceptance/group-logs-test.js.es6
+++ b/test/javascripts/acceptance/group-manage-logs-test.js.es6
@@ -1,6 +1,6 @@
 import { acceptance } from "helpers/qunit-helpers";
 
-acceptance("Group Logs", {
+acceptance("Group logs", {
   loggedIn: true,
   beforeEach() {
     const response = object => {
@@ -12,7 +12,7 @@ acceptance("Group Logs", {
     };
 
     server.get('/groups/snorlax.json', () => { // eslint-disable-line no-undef
-      return response({"basic_group":{"id":41,"automatic":false,"name":"snorlax","user_count":1,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":true,"title":"Team Snorlax","grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":"","flair_bg_color":"","flair_color":"","bio_raw":"","bio_cooked":null,"public":true,"is_group_user":true,"is_group_owner":true}});
+      return response({"group":{"id":41,"automatic":false,"name":"snorlax","user_count":1,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":true,"title":"Team Snorlax","grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":"","flair_bg_color":"","flair_color":"","bio_raw":"","bio_cooked":null,"public":true,"is_group_user":true,"is_group_owner":true}});
     });
 
     // Workaround while awaiting https://github.com/tildeio/route-recognizer/issues/53
@@ -27,14 +27,14 @@ acceptance("Group Logs", {
 });
 
 QUnit.test("Browsing group logs", assert => {
-  visit("/groups/snorlax/logs");
+  visit("/groups/snorlax/manage/logs");
 
   andThen(() => {
-    assert.ok(find('tr.group-logs-row').length === 2, 'it should display the right number of logs');
-    click(find(".group-logs-row button")[0]);
+    assert.ok(find('tr.group-manage-logs-row').length === 2, 'it should display the right number of logs');
+    click(find(".group-manage-logs-row button")[0]);
   });
 
   andThen(() => {
-    assert.ok(find('tr.group-logs-row').length === 1, 'it should display the right number of logs');
+    assert.ok(find('tr.group-manage-logs-row').length === 1, 'it should display the right number of logs');
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js.es6 b/test/javascripts/acceptance/group-manage-membership-test.js.es6
new file mode 100644
index 0000000000..5b1dad16e5
--- /dev/null
+++ b/test/javascripts/acceptance/group-manage-membership-test.js.es6
@@ -0,0 +1,119 @@
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
+
+acceptance("Managing Group Membership", {
+  loggedIn: true
+});
+
+QUnit.test("As an admin", assert => {
+  visit("/groups/discourse/manage/membership");
+
+  andThen(() => {
+    assert.ok(
+      find('label[for="automatic_membership"]').length === 1,
+      'it should display automatic membership label'
+    );
+
+    assert.ok(
+      find('.groups-form-automatic-membership-retroactive').length === 1,
+      'it should display automatic membership retroactive checkbox'
+    );
+
+    assert.ok(
+      find('.groups-form-primary-group').length === 1,
+      'it should display set as primary group checkbox'
+    );
+
+    assert.ok(
+      find('.groups-form-grant-trust-level').length === 1,
+      'it should display grant trust level selector'
+    );
+
+    assert.ok(
+      find('.group-form-public-admission').length === 1,
+      'it should display group public admission input'
+    );
+
+    assert.ok(
+      find('.group-form-public-exit').length === 1,
+      'it should display group public exit input'
+    );
+
+    assert.ok(
+      find('.group-form-allow-membership-requests').length === 1,
+      'it should display group allow_membership_request input'
+    );
+
+    assert.ok(
+      find('.group-form-allow-membership-requests[disabled]').length === 1,
+      'it should disable group allow_membership_request input'
+    );
+  });
+
+  click('.group-form-public-admission');
+  click('.group-form-allow-membership-requests');
+
+  andThen(() => {
+    assert.ok(
+      find('.group-form-public-admission[disabled]').length === 1,
+      'it should disable group public admission input'
+    );
+
+    assert.ok(
+      find('.group-form-public-exit[disabled]').length === 0,
+      'it should not disable group public exit input'
+    );
+
+    assert.equal(
+      find('.group-form-membership-request-template').length, 1,
+      'it should display the membership request template field'
+    );
+  });
+});
+
+QUnit.test("As a group owner", assert => {
+  replaceCurrentUser({ staff: false, admin: false });
+
+  visit("/groups/discourse/manage/membership");
+
+  andThen(() => {
+    assert.ok(
+      find('label[for="automatic_membership"]').length === 0,
+      'it should not display automatic membership label'
+    );
+
+    assert.ok(
+      find('.groups-form-automatic-membership-retroactive').length === 0,
+      'it should not display automatic membership retroactive checkbox'
+    );
+
+    assert.ok(
+      find('.groups-form-primary-group').length === 0,
+      'it should not display set as primary group checkbox'
+    );
+
+    assert.ok(
+      find('.groups-form-grant-trust-level').length === 0,
+      'it should not display grant trust level selector'
+    );
+
+    assert.ok(
+      find('.group-form-public-admission').length === 1,
+      'it should display group public admission input'
+    );
+
+    assert.ok(
+      find('.group-form-public-exit').length === 1,
+      'it should display group public exit input'
+    );
+
+    assert.ok(
+      find('.group-form-allow-membership-requests').length === 1,
+      'it should display group allow_membership_request input'
+    );
+
+    assert.ok(
+      find('.group-form-allow-membership-requests[disabled]').length === 1,
+      'it should disable group allow_membership_request input'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js.es6 b/test/javascripts/acceptance/group-manage-profile-test.js.es6
new file mode 100644
index 0000000000..f8e42d2972
--- /dev/null
+++ b/test/javascripts/acceptance/group-manage-profile-test.js.es6
@@ -0,0 +1,40 @@
+import { acceptance, logIn, replaceCurrentUser } from "helpers/qunit-helpers";
+
+acceptance("Managing Group Profile");
+
+QUnit.test("As an admin", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse/manage/profile");
+
+  andThen(() => {
+    assert.ok(find('.group-flair-inputs').length === 1, 'it should display avatar flair inputs');
+    assert.ok(find('.group-form-bio').length === 1, 'it should display group bio input');
+    assert.ok(find('.group-form-name').length === 1, 'it should display group name input');
+    assert.ok(find('.group-form-full-name').length === 1, 'it should display group full name input');
+  });
+});
+
+QUnit.test("As a group owner", assert => {
+  logIn();
+  Discourse.reset();
+  replaceCurrentUser({ staff: false, admin: false });
+
+  visit("/groups/discourse/manage/profile");
+
+  andThen(() => {
+    assert.equal(
+      find('.group-form-name').length, 0,
+      'it should not display group name input'
+    );
+  });
+});
+
+QUnit.test("As an anonymous user", assert => {
+  visit("/groups/discourse/manage/profile");
+
+  andThen(() => {
+    assert.ok(count('.group-members tr') > 0, "it should redirect to members page for an anonymous user");
+  });
+});
diff --git a/test/javascripts/acceptance/group-test.js.es6 b/test/javascripts/acceptance/group-test.js.es6
new file mode 100644
index 0000000000..5a83bc4f37
--- /dev/null
+++ b/test/javascripts/acceptance/group-test.js.es6
@@ -0,0 +1,169 @@
+import { acceptance, logIn } from "helpers/qunit-helpers";
+
+acceptance("Group");
+
+const response = object => {
+  return [
+    200,
+    { "Content-Type": "application/json" },
+    object
+  ];
+};
+
+QUnit.test("Anonymous Viewing Group", assert => {
+  visit("/groups/discourse");
+
+  andThen(() => {
+    assert.equal(
+      count(".nav-pills li a[title='Messages']"),
+      0,
+      'it deos not show group messages navigation link'
+    );
+  });
+
+  click(".nav-pills li a[title='Activity']");
+
+  andThen(() => {
+    assert.ok(count('.group-post') > 0, "it lists stream items");
+  });
+
+  click(".group-activity-nav li a[href='/groups/discourse/activity/topics']");
+
+  andThen(() => {
+    assert.ok(find('.topic-list'), "it shows the topic list");
+    assert.equal(count('.topic-list-item'), 2, "it lists stream items");
+  });
+
+  click(".group-activity-nav li a[href='/groups/discourse/activity/mentions']");
+
+  andThen(() => {
+    assert.ok(count('.group-post') > 0, "it lists stream items");
+  });
+
+  andThen(() => {
+    assert.ok(find(".nav-pills li a[title='Edit Group']").length === 0, 'it should not show messages tab if user is not admin');
+    assert.ok(find(".nav-pills li a[title='Logs']").length === 0, 'it should not show Logs tab if user is not admin');
+    assert.ok(count('.group-post') > 0, "it lists stream items");
+  });
+
+  selectKit('.group-dropdown').expand();
+
+  andThen(() => {
+    assert.equal(
+      find('.select-kit-row').text().trim(), 'discourse',
+      'it displays the right row'
+    );
+  });
+});
+
+QUnit.test("Anonymous Viewing Automatic Group", assert => {
+  visit("/groups/moderators");
+
+  andThen(() => {
+    assert.equal(
+      count(".nav-pills li a[title='Manage']"),
+      0,
+      'it deos not show group messages navigation link'
+    );
+  });
+});
+
+QUnit.test("User Viewing Group", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups");
+  click('.group-index-request');
+
+  server.post('/groups/Macdonald/request_membership', () => { // eslint-disable-line no-undef
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      { relative_url: '/t/internationalization-localization/280' }
+    ];
+  });
+
+  andThen(() => {
+    assert.equal(find('.modal-header').text().trim(), I18n.t(
+      'groups.membership_request.title', { group_name: 'Macdonald' }
+    ));
+
+    assert.equal(find('.request-group-membership-form textarea').val(), 'Please add me');
+  });
+
+  click('.modal-footer .btn-primary');
+
+  andThen(() => {
+    assert.equal(
+      find('.fancy-title').text().trim(),
+      "Internationalization / localization"
+    );
+  });
+
+  visit("/groups/discourse");
+
+  click('.group-message-button');
+
+  andThen(() => {
+    assert.ok(count('#reply-control') === 1, 'it opens the composer');
+    assert.equal(find('.ac-wrap .item').text(), 'discourse', 'it prefills the group name');
+  });
+});
+
+QUnit.test("Admin viewing group messages when there are no messages", assert => {
+  server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
+    return response({ topic_list: { topics: [] } });
+  });
+
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse");
+
+  click(".nav-pills li a[title='Messages']");
+
+  andThen(() => {
+    assert.equal(
+      find(".alert").text().trim(),
+      I18n.t('choose_topic.none_found'),
+      'it should display the right alert'
+    );
+  });
+});
+
+QUnit.test("Admin viewing group messages", assert => {
+  server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
+    return response({"users":[{"id":2, "username":"bruce1", "avatar_template":"/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"}, {"id":3, "username":"CodingHorror", "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5245.png"}], "primary_groups":[], "topic_list":{"can_create_topic":true, "draft":null, "draft_key":"new_topic", "draft_sequence":0, "per_page":30, "topics":[{"id":12199, "title":"This is a private message 1", "fancy_title":"This is a private message 1", "slug":"this-is-a-private-message-1", "posts_count":0, "reply_count":0, "highest_post_number":0, "image_url":null, "created_at":"2018-03-16T03:38:45.583Z", "last_posted_at":null, "bumped":true, "bumped_at":"2018-03-16T03:38:45.583Z", "unseen":false, "pinned":false, "unpinned":null, "visible":true, "closed":false, "archived":false, "bookmarked":null, "liked":null, "views":0, "like_count":0, "has_summary":false, "archetype":"private_message", "last_poster_username":"bruce1", "category_id":null, "pinned_globally":false, "featured_link":null, "posters":[{"extras":"latest single", "description":"Original Poster, Most Recent Poster", "user_id":2, "primary_group_id":null}], "participants":[{"extras":"latest", "description":null, "user_id":2, "primary_group_id":null}, {"extras":null, "description":null, "user_id":3, "primary_group_id":null}]}]}});
+  });
+
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse");
+  click(".nav-pills li a[title='Messages']");
+
+  andThen(() => {
+    assert.equal(
+      find(".topic-list-item .link-top-line").text().trim(),
+      "This is a private message 1",
+      'it should display the list of group topics'
+    );
+  });
+});
+
+QUnit.test("Admin Viewing Group", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse");
+
+  andThen(() => {
+    assert.ok(
+      find(".nav-pills li a[title='Manage']").length === 1,
+      'it should show manage group tab if user is admin'
+    );
+
+    assert.equal(count('.group-message-button'), 1, 'it displays show group message button');
+    assert.equal(find('.group-info-name').text(), 'Awesome Team', 'it should display the group name');
+  });
+});
diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js.es6
new file mode 100644
index 0000000000..503372269f
--- /dev/null
+++ b/test/javascripts/acceptance/groups-index-test.js.es6
@@ -0,0 +1,43 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Groups");
+
+QUnit.test("Browsing Groups", assert => {
+  visit("/groups");
+
+  andThen(() => {
+    assert.equal(count('.groups-table-row'), 2, 'it displays visible groups');
+    assert.equal(find('.group-index-join').length, 1, 'it shows button to join group');
+    assert.equal(find('.group-index-request').length, 1, 'it shows button to request for group membership');
+  });
+
+  click('.group-index-join');
+
+  andThen(() => {
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
+  });
+
+  click('.login-modal .close');
+
+  andThen(() => {
+    assert.ok(invisible('.modal.login-modal'), 'it closes the login modal');
+  });
+
+  click('.group-index-request');
+
+  andThen(() => {
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
+  });
+
+  click("a[href='/groups/discourse/members']");
+
+  andThen(() => {
+    assert.equal(find('.group-info-name').text().trim(), 'Awesome Team', "it displays the group page");
+  });
+
+  click('.group-index-join');
+
+  andThen(() => {
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
+  });
+});
diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js.es6
new file mode 100644
index 0000000000..423f189abd
--- /dev/null
+++ b/test/javascripts/acceptance/groups-new-test.js.es6
@@ -0,0 +1,80 @@
+import { acceptance, logIn } from "helpers/qunit-helpers";
+
+acceptance("New Group");
+
+QUnit.test("As an anon user", assert => {
+  visit("/groups");
+
+  andThen(() => {
+    assert.equal(
+      find('.groups-header-new').length, 0,
+      'it should not display the button to create a group'
+    );
+  });
+});
+
+QUnit.test("Creating a new group", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups");
+
+  click(".groups-header-new");
+
+  andThen(() => {
+    assert.equal(
+      find('.group-form-save[disabled]').length, 1,
+      'save button should be disabled'
+    );
+  });
+
+  fillIn("input[name='name']", '1');
+
+  andThen(() => {
+    assert.equal(
+      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.too_short"),
+      'it should show the right validation tooltip'
+    );
+
+    assert.ok(
+      find(".group-form-save:disabled").length === 1,
+      'it should disable the save button'
+    );
+  });
+
+  fillIn("input[name='name']", 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+
+  andThen(() => {
+    assert.equal(
+      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.too_long"),
+      'it should show the right validation tooltip'
+    );
+  });
+
+  fillIn("input[name='name']", '');
+
+  andThen(() => {
+    assert.equal(
+      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.blank"),
+      'it should show the right validation tooltip'
+    );
+  });
+
+  fillIn("input[name='name']", 'goodusername');
+
+  andThen(() => {
+    assert.equal(
+      find('.tip.good').text().trim(), I18n.t("admin.groups.new.name.available"),
+      'it should show the right validation tooltip'
+    );
+  });
+
+  click(".group-form-public-admission");
+
+  andThen(() => {
+    assert.equal(
+      find('groups-new-allow-membership-requests').length, 0,
+      'it should disable the membership requests checkbox'
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/groups-test.js.es6 b/test/javascripts/acceptance/groups-test.js.es6
deleted file mode 100644
index 0c3e94dded..0000000000
--- a/test/javascripts/acceptance/groups-test.js.es6
+++ /dev/null
@@ -1,201 +0,0 @@
-import { acceptance, logIn } from "helpers/qunit-helpers";
-
-const response = object => {
-  return [
-    200,
-    { "Content-Type": "application/json" },
-    object
-  ];
-};
-
-acceptance("Groups", {
-  beforeEach() {
-    server.get('/groups/snorlax.json', () => { // eslint-disable-line no-undef
-      return response({"basic_group":{"id":41,"automatic":false,"name":"snorlax","user_count":1,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":true,"title":"Team Snorlax","grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":"","flair_bg_color":"","flair_color":"","bio_raw":"","bio_cooked":null,"public":true,"is_group_user":true,"is_group_owner":true}});
-    });
-
-    // Workaround while awaiting https://github.com/tildeio/route-recognizer/issues/53
-    server.get('/groups/snorlax/logs.json', request => { // eslint-disable-line no-undef
-      if (request.queryParams["filters[action]"]) {
-        return response({"logs":[{"action":"change_group_setting","subject":"title","prev_value":null,"new_value":"Team Snorlax","created_at":"2016-12-12T08:27:46.408Z","acting_user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"target_user":null}],"all_loaded":true});
-      } else {
-        return response({"logs":[{"action":"change_group_setting","subject":"title","prev_value":null,"new_value":"Team Snorlax","created_at":"2016-12-12T08:27:46.408Z","acting_user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"target_user":null},{"action":"add_user_to_group","subject":null,"prev_value":null,"new_value":null,"created_at":"2016-12-12T08:27:27.725Z","acting_user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"target_user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"}}],"all_loaded":true});
-      }
-    });
-  }
-});
-
-QUnit.test("Browsing Groups", assert => {
-  visit("/groups");
-
-  andThen(() => {
-    assert.equal(count('.groups-table-row'), 2, 'it displays visible groups');
-    assert.equal(find('.group-index-join').length, 1, 'it shows button to join group');
-    assert.equal(find('.group-index-request').length, 1, 'it shows button to request for group membership');
-  });
-
-  click('.group-index-join');
-
-  andThen(() => {
-    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
-  });
-
-  click('.login-modal .close');
-
-  andThen(() => {
-    assert.ok(invisible('.modal.login-modal'), 'it closes the login modal');
-  });
-
-  click('.group-index-request');
-
-  andThen(() => {
-    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
-  });
-
-  click("a[href='/groups/discourse/members']");
-
-  andThen(() => {
-    assert.equal(find('.group-info-name').text().trim(), 'Awesome Team', "it displays the group page");
-  });
-
-  click('.group-index-join');
-
-  andThen(() => {
-    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
-  });
-});
-
-QUnit.test("Anonymous Viewing Group", assert => {
-  visit("/groups/discourse");
-
-  andThen(() => {
-    assert.equal(
-      count(".nav-pills li a[title='Messages']"),
-      0,
-      'it deos not show group messages navigation link'
-    );
-  });
-
-  click(".nav-pills li a[title='Activity']");
-
-  andThen(() => {
-    assert.ok(count('.group-post') > 0, "it lists stream items");
-  });
-
-  click(".group-activity-nav li a[href='/groups/discourse/activity/topics']");
-
-  andThen(() => {
-    assert.ok(find('.topic-list'), "it shows the topic list");
-    assert.equal(count('.topic-list-item'), 2, "it lists stream items");
-  });
-
-  click(".group-activity-nav li a[href='/groups/discourse/activity/mentions']");
-
-  andThen(() => {
-    assert.ok(count('.group-post') > 0, "it lists stream items");
-  });
-
-  andThen(() => {
-    assert.ok(find(".nav-pills li a[title='Edit Group']").length === 0, 'it should not show messages tab if user is not admin');
-    assert.ok(find(".nav-pills li a[title='Logs']").length === 0, 'it should not show Logs tab if user is not admin');
-    assert.ok(count('.group-post') > 0, "it lists stream items");
-  });
-});
-
-QUnit.test("User Viewing Group", assert => {
-  logIn();
-  Discourse.reset();
-
-  visit("/groups");
-  click('.group-index-request');
-
-  server.post('/groups/Macdonald/request_membership', () => { // eslint-disable-line no-undef
-    return [
-      200,
-      { "Content-Type": "application/json" },
-      { relative_url: '/t/internationalization-localization/280' }
-    ];
-  });
-
-  andThen(() => {
-    assert.equal(find('.modal-header').text().trim(), I18n.t(
-      'groups.membership_request.title', { group_name: 'Macdonald' }
-    ));
-
-    assert.equal(find('.request-group-membership-form textarea').val(), 'Please add me');
-  });
-
-  click('.modal-footer .btn-primary');
-
-  andThen(() => {
-    assert.equal(
-      find('.fancy-title').text().trim(),
-      "Internationalization / localization"
-    );
-  });
-
-  visit("/groups/discourse");
-
-  click('.group-message-button');
-
-  andThen(() => {
-    assert.ok(count('#reply-control') === 1, 'it opens the composer');
-    assert.equal(find('.ac-wrap .item').text(), 'discourse', 'it prefills the group name');
-  });
-});
-
-QUnit.test("Admin viewing group messages when there are no messages", assert => {
-  server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
-    return response({ topic_list: { topics: [] } });
-  });
-
-  logIn();
-  Discourse.reset();
-
-  visit("/groups/discourse");
-
-  click(".nav-pills li a[title='Messages']");
-
-  andThen(() => {
-    assert.equal(
-      find(".alert").text().trim(),
-      I18n.t('choose_topic.none_found'),
-      'it should display the right alert'
-    );
-  });
-});
-
-QUnit.test("Admin viewing group messages", assert => {
-  server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
-    return response({"users":[{"id":2, "username":"bruce1", "avatar_template":"/letter_avatar_proxy/v2/letter/b/9de053/{size}.png"}, {"id":3, "username":"CodingHorror", "avatar_template":"/letter_avatar_proxy/v2/letter/c/e8c25b/{size}.png"}], "primary_groups":[], "topic_list":{"can_create_topic":true, "draft":null, "draft_key":"new_topic", "draft_sequence":0, "per_page":30, "topics":[{"id":12199, "title":"This is a private message 1", "fancy_title":"This is a private message 1", "slug":"this-is-a-private-message-1", "posts_count":0, "reply_count":0, "highest_post_number":0, "image_url":null, "created_at":"2018-03-16T03:38:45.583Z", "last_posted_at":null, "bumped":true, "bumped_at":"2018-03-16T03:38:45.583Z", "unseen":false, "pinned":false, "unpinned":null, "visible":true, "closed":false, "archived":false, "bookmarked":null, "liked":null, "views":0, "like_count":0, "has_summary":false, "archetype":"private_message", "last_poster_username":"bruce1", "category_id":null, "pinned_globally":false, "featured_link":null, "posters":[{"extras":"latest single", "description":"Original Poster, Most Recent Poster", "user_id":2, "primary_group_id":null}], "participants":[{"extras":"latest", "description":null, "user_id":2, "primary_group_id":null}, {"extras":null, "description":null, "user_id":3, "primary_group_id":null}]}]}});
-  });
-
-  logIn();
-  Discourse.reset();
-
-  visit("/groups/discourse");
-
-  click(".nav-pills li a[title='Messages']");
-
-  andThen(() => {
-    assert.equal(
-      find(".topic-list-item .link-top-line").text().trim(),
-      "This is a private message 1",
-      'it should display the list of group topics'
-    );
-  });
-});
-
-QUnit.test("Admin Viewing Group", assert => {
-  logIn();
-  Discourse.reset();
-
-  visit("/groups/discourse");
-
-  andThen(() => {
-    assert.ok(find(".nav-pills li a[title='Edit Group']").length === 1, 'it should show edit group tab if user is admin');
-    assert.ok(find(".nav-pills li a[title='Logs']").length === 1, 'it should show Logs tab if user is admin');
-    assert.equal(count('.group-message-button'), 1, 'it displays show group message button');
-    assert.equal(find('.group-info-name').text(), 'Awesome Team', 'it should display the group name');
-  });
-});
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index 5176eed55c..ac9dd14529 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -121,3 +121,19 @@ QUnit.test("second factor", assert => {
     );
   });
 });
+
+acceptance("User Preferences when badges are disabled", {
+  loggedIn: true,
+  settings: {
+    enable_badges: false
+  }
+});
+
+QUnit.test("visit my preferences", assert => {
+  visit("/u/eviltrout/preferences");
+  andThen(() => {
+    assert.ok($('body.user-preferences-page').length, "has the body class");
+    assert.equal(currentURL(), '/u/eviltrout/preferences/account', "defaults to account tab");
+    assert.ok(exists('.user-preferences'), 'it shows the preferences');
+  });
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6
index 8027f64823..eb528a7ed6 100644
--- a/test/javascripts/acceptance/search-full-test.js.es6
+++ b/test/javascripts/acceptance/search-full-test.js.es6
@@ -40,45 +40,34 @@ acceptance("Search - Full Page", {
   }
 });
 
+
 QUnit.test("perform various searches", assert => {
   visit("/search");
 
   andThen(() => {
     assert.ok($('body.search-page').length, "has body class");
     assert.ok(exists('.search-container'), "has container class");
-    assert.ok(find('input.search').length > 0);
+    assert.ok(find('.search-query').length > 0);
     assert.ok(find('.fps-topic').length === 0);
   });
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search .btn-primary');
+  fillIn('.search-query', 'none');
+  click('.search-cta');
 
   andThen(() => {
     assert.ok(find('.fps-topic').length === 0, 'has no results');
     assert.ok(find('.no-results-suggestion .google-search-form'));
   });
 
-  fillIn('.search input.full-page-search', 'posts');
-  click('.search .btn-primary');
+  fillIn('.search-query', 'posts');
+  click('.search-cta');
 
   andThen(() => assert.ok(find('.fps-topic').length === 1, 'has one post'));
 });
 
-QUnit.test("open advanced search", assert => {
-  visit("/search");
-
-  andThen(() => assert.ok(exists('.search .search-advanced'), 'shows advanced search panel'));
-
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
-
-  andThen(() => assert.ok(visible('.search-advanced .search-advanced-options'), '"search-advanced-options" is visible'));
-});
-
 QUnit.test("escape search term", (assert) => {
   visit("/search");
-  fillIn('.search input.full-page-search', '@<script>prompt(1337)</script>gmail.com');
-  click('.search-advanced-btn');
+  fillIn('.search-query', '@<script>prompt(1337)</script>gmail.com');
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options span:contains("<script>prompt(1337)</script>gmail.com")'), 'it escapes search term');
@@ -87,8 +76,7 @@ QUnit.test("escape search term", (assert) => {
 
 QUnit.test("update username through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   fillIn('.search-advanced-options .user-selector', 'admin');
   click('.search-advanced-options .user-selector');
   keyEvent('.search-advanced-options .user-selector', 'keydown', 8);
@@ -102,7 +90,7 @@ QUnit.test("update username through advanced search ui", assert => {
 
       andThen(() => {
         assert.ok(exists('.search-advanced-options span:contains("admin")'), 'has "admin" pre-populated');
-        assert.equal(find('.search input.full-page-search').val(), "none @admin", 'has updated search term to "none user:admin"');
+        assert.equal(find('.search-query').val(), "none @admin", 'has updated search term to "none user:admin"');
       });
     });
   });
@@ -113,20 +101,19 @@ QUnit.test("update category through advanced search ui", assert => {
 
   visit("/search");
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   categoryChooser.expand().fillInFilter('faq').selectRowByValue(4);
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .badge-category:contains("faq")'), 'has "faq" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none #faq", 'has updated search term to "none #faq"');
+    assert.equal(find('.search-query').val(), "none #faq", 'has updated search term to "none #faq"');
   });
 });
 
 // test("update group through advanced search ui", assert => {
 //   visit("/search");
-//   fillIn('.search input.full-page-search', 'none');
-//   click('.search-advanced-btn');
+//   fillIn('.search-query', 'none');
+//
 //   fillIn('.search-advanced-options .group-selector', 'moderators');
 //   click('.search-advanced-options .group-selector');
 //   keyEvent('.search-advanced-options .group-selector', 'keydown', 8);
@@ -140,7 +127,7 @@ QUnit.test("update category through advanced search ui", assert => {
 //
 //       andThen(() => {
 //         assert.ok(exists('.search-advanced-options span:contains("moderators")'), 'has "moderators" pre-populated');
-//         assert.equal(find('.search input.full-page-search').val(), "none group:moderators", 'has updated search term to "none group:moderators"');
+//         assert.equal(find('.search-query').val(), "none group:moderators", 'has updated search term to "none group:moderators"');
 //       });
 //     });
 //   });
@@ -148,8 +135,8 @@ QUnit.test("update category through advanced search ui", assert => {
 
 // test("update badges through advanced search ui", assert => {
 //   visit("/search");
-//   fillIn('.search input.full-page-search', 'none');
-//   click('.search-advanced-btn');
+//   fillIn('.search-query', 'none');
+//
 //   fillIn('.search-advanced-options .badge-names', 'Reader');
 //   click('.search-advanced-options .badge-names');
 //   keyEvent('.search-advanced-options .badge-names', 'keydown', 8);
@@ -163,7 +150,7 @@ QUnit.test("update category through advanced search ui", assert => {
 //
 //       andThen(() => {
 //         assert.ok(exists('.search-advanced-options span:contains("Reader")'), 'has "Reader" pre-populated');
-//         assert.equal(find('.search input.full-page-search').val(), "none badge:Reader", 'has updated search term to "none badge:Reader"');
+//         assert.equal(find('.search-query').val(), "none badge:Reader", 'has updated search term to "none badge:Reader"');
 //       });
 //     });
 //   });
@@ -171,8 +158,8 @@ QUnit.test("update category through advanced search ui", assert => {
 
 // test("update tags through advanced search ui", assert => {
 //   visit("/search");
-//   fillIn('.search input.full-page-search', 'none');
-//   click('.search-advanced-btn');
+//   fillIn('.search-query', 'none');
+//
 //
 //   keyEvent('.search-advanced-options .tag-chooser input.select2-input', 'keydown', 110);
 //   fillIn('.search-advanced-options .tag-chooser input.select2-input', 'monkey');
@@ -183,7 +170,7 @@ QUnit.test("update category through advanced search ui", assert => {
 //       click('li.select2-result-selectable:first');
 //       andThen(() => {
 //         assert.ok(exists('.search-advanced-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated');
-//         assert.equal(find('.search input.full-page-search').val(), "none tags:monkey", 'has updated search term to "none tags:monkey"');
+//         assert.equal(find('.search-query').val(), "none tags:monkey", 'has updated search term to "none tags:monkey"');
 //       });
 //     });
 //   });
@@ -191,38 +178,35 @@ QUnit.test("update category through advanced search ui", assert => {
 
 QUnit.test("update in:likes filter through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   click('.search-advanced-options .in-likes');
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none in:likes", 'has updated search term to "none in:likes"');
+    assert.equal(find('.search-query').val(), "none in:likes", 'has updated search term to "none in:likes"');
   });
 });
 
 QUnit.test("update in:private filter through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   click('.search-advanced-options .in-private');
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .in-private:checked'), 'has "are in my messages" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none in:private", 'has updated search term to "none in:private"');
+    assert.equal(find('.search-query').val(), "none in:private", 'has updated search term to "none in:private"');
   });
 });
 
 QUnit.test("update in:seen filter through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   click('.search-advanced-options .in-seen');
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .in-seen:checked'), 'it should check the right checkbox');
 
-    assert.equal(find('.search input.full-page-search').val(), "none in:seen",
+    assert.equal(find('.search-query').val(), "none in:seen",
       'it should update the search term'
     );
   });
@@ -233,13 +217,12 @@ QUnit.test("update in filter through advanced search ui", assert => {
 
   visit("/search");
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   inSelector.expand().selectRowByValue('bookmarks');
 
   andThen(() => {
     assert.ok(inSelector.rowByName("I bookmarked").exists(), 'has "I bookmarked" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none in:bookmarks", 'has updated search term to "none in:bookmarks"');
+    assert.equal(find('.search-query').val(), "none in:bookmarks", 'has updated search term to "none in:bookmarks"');
   });
 });
 
@@ -248,13 +231,12 @@ QUnit.test("update status through advanced search ui", assert => {
 
   visit("/search");
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   statusSelector.expand().selectRowByValue('closed');
 
   andThen(() => {
     assert.ok(statusSelector.rowByName("are closed").exists(), 'has "are closed" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none status:closed", 'has updated search term to "none status:closed"');
+    assert.equal(find('.search-query').val(), "none status:closed", 'has updated search term to "none status:closed"');
   });
 });
 
@@ -263,26 +245,24 @@ QUnit.test("update post time through advanced search ui", assert => {
 
   visit("/search");
 
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   fillIn('#search-post-date .date-picker', '2016-10-05');
   postTimeSelector.expand().selectRowByValue('after');
 
   andThen(() => {
     assert.ok(postTimeSelector.rowByName("after").exists(), 'has "after" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
+    assert.equal(find('.search-query').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
   });
 });
 
 QUnit.test("update min post count through advanced search ui", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'none');
-  click('.search-advanced-btn');
+  fillIn('.search-query', 'none');
   fillIn('#search-min-post-count', '5');
 
   andThen(() => {
     assert.equal(find('.search-advanced-options #search-min-post-count').val(), "5", 'has "5" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none min_post_count:5", 'has updated search term to "none min_post_count:5"');
+    assert.equal(find('.search-query').val(), "none min_post_count:5", 'has updated search term to "none min_post_count:5"');
   });
 });
 
@@ -292,6 +272,6 @@ QUnit.test("validate advanced search when initially empty", assert => {
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" populated');
-    assert.equal(find('.search input.full-page-search').val(), "in:likes", 'has updated search term to "in:likes"');
+    assert.equal(find('.search-query').val(), "in:likes", 'has updated search term to "in:likes"');
   });
 });
diff --git a/test/javascripts/components/category-chooser-test.js.es6 b/test/javascripts/components/category-chooser-test.js.es6
index bb129c872b..ad94f675b0 100644
--- a/test/javascripts/components/category-chooser-test.js.es6
+++ b/test/javascripts/components/category-chooser-test.js.es6
@@ -35,9 +35,9 @@ componentTest('with scopedCategoryId', {
     this.get('subject').expand();
 
     andThen(() => {
-      assert.equal(this.get('subject').rowByIndex(0).title(), 'feature');
+      assert.equal(this.get('subject').rowByIndex(0).title(), 'Discussion about features or potential features of Discourse: how they work, why they work, etc.');
       assert.equal(this.get('subject').rowByIndex(0).value(), 2);
-      assert.equal(this.get('subject').rowByIndex(1).title(), 'spec');
+      assert.equal(this.get('subject').rowByIndex(1).title(), 'My idea here is to have mini specs for features we would like built but have no bandwidth to build');
       assert.equal(this.get('subject').rowByIndex(1).value(), 26);
       assert.equal(this.get('subject').rows().length, 2);
     });
diff --git a/test/javascripts/components/combo-box-test.js.es6 b/test/javascripts/components/combo-box-test.js.es6
index e1237ccc3f..45af48de9a 100644
--- a/test/javascripts/components/combo-box-test.js.es6
+++ b/test/javascripts/components/combo-box-test.js.es6
@@ -192,3 +192,20 @@ componentTest('with empty string as value', {
     });
   }
 });
+
+componentTest('with noneLabel', {
+  template: '{{combo-box content=items allowAutoSelectFirst=false noneLabel=noneLabel}}',
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {none: 'none'};
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('noneLabel', 'test.none');
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), 'none', 'it displays noneLabel as the header name');
+    });
+  }
+});
diff --git a/test/javascripts/components/multi-select-test.js.es6 b/test/javascripts/components/multi-select-test.js.es6
index 349b26d7c6..c829b3ea53 100644
--- a/test/javascripts/components/multi-select-test.js.es6
+++ b/test/javascripts/components/multi-select-test.js.es6
@@ -160,3 +160,44 @@ componentTest('with limitMatches', {
     andThen(() => assert.equal(this.get('subject').el().find(".select-kit-row").length, 2));
   }
 });
+
+componentTest('with minimum', {
+  template: '{{multi-select content=content minimum=1}}',
+
+  beforeEach() {
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item.'));
+
+    this.get('subject').selectRowByValue('sam');
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().label(), 'sam');
+    });
+  }
+});
+
+componentTest('with minimumLabel', {
+  template: '{{multi-select content=content minimum=1 minimumLabel="test.minimum"}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { minimum: 'min %{count}' };
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').validationMessage(), 'min 1'));
+
+    this.get('subject').selectRowByValue('jeff');
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().label(), 'jeff');
+    });
+  }
+});
diff --git a/test/javascripts/components/single-select-test.js.es6 b/test/javascripts/components/single-select-test.js.es6
index 3cf74cd51a..e7a1080290 100644
--- a/test/javascripts/components/single-select-test.js.es6
+++ b/test/javascripts/components/single-select-test.js.es6
@@ -501,3 +501,44 @@ componentTest('with limitMatches', {
     andThen(() => assert.equal(this.get('subject').el().find(".select-kit-row").length, 2));
   }
 });
+
+componentTest('with minimum', {
+  template: '{{single-select content=content minimum=1 allowAutoSelectFirst=false}}',
+
+  beforeEach() {
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item.'));
+
+    this.get('subject').selectRowByValue('sam');
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().label(), 'sam');
+    });
+  }
+});
+
+componentTest('with minimumLabel', {
+  template: '{{single-select content=content minimum=1 minimumLabel="test.minimum" allowAutoSelectFirst=false}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { minimum: 'min %{count}' };
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').validationMessage(), 'min 1'));
+
+    this.get('subject').selectRowByValue('jeff');
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().label(), 'jeff');
+    });
+  }
+});
diff --git a/test/javascripts/controllers/admin-group-test.js.es6 b/test/javascripts/controllers/admin-group-test.js.es6
deleted file mode 100644
index 01d77cb5ee..0000000000
--- a/test/javascripts/controllers/admin-group-test.js.es6
+++ /dev/null
@@ -1,41 +0,0 @@
-moduleFor("controller:admin-group", {
-  needs: ['controller:adminGroupsType']
-});
-
-QUnit.test("disablePublicSetting", function(assert) {
-  this.subject().setProperties({
-    model: { visibility_level: 1, allow_membership_requests: false }
-  });
-
-  assert.equal(this.subject().get("disablePublicSetting"), true, "it should disable setting");
-
-  this.subject().set("model.visibility_level", 0);
-
-  assert.equal(this.subject().get("disablePublicSetting"), false, "it should enable setting");
-
-  this.subject().set("model.allow_membership_requests", true);
-
-  assert.equal(this.subject().get("disablePublicSetting"), true, "it should disable setting");
-});
-
-QUnit.test("disableMembershipRequestSetting", function(assert) {
-  this.subject().setProperties({
-    model: { visibility_level: 1, public_admission: false, canEveryoneMention: true }
-  });
-
-  assert.equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disable setting");
-
-  this.subject().set("model.visibility_level", 0);
-
-  assert.equal(
-    this.subject().get("disableMembershipRequestSetting"), false,
-    "it should enable setting"
-  );
-
-  this.subject().set("model.public_admission", true);
-
-  assert.equal(
-    this.subject().get("disableMembershipRequestSetting"), true,
-    "it should disable setting"
-  );
-});
diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js.es6
index 27a4a6bbf1..4493e65df7 100644
--- a/test/javascripts/fixtures/group-fixtures.js.es6
+++ b/test/javascripts/fixtures/group-fixtures.js.es6
@@ -1,6 +1,39 @@
 export default {
+  "/groups/moderators.json":{
+    "group": {
+      "id": 50,
+      "automatic": true,
+      "name": "moderators",
+      "display_name": "moderators",
+      "mentionable_level": 0,
+      "messageable_level": 99,
+      "visibility_level": 0,
+      "automatic_membership_email_domains": null,
+      "automatic_membership_retroactive": false,
+      "primary_group": false,
+      "title": null,
+      "grant_trust_level": null,
+      "incoming_email": null,
+      "has_messages": true,
+      "flair_url": null,
+      "flair_bg_color": null,
+      "flair_color": null,
+      "bio_raw": null,
+      "bio_cooked": null,
+      "public_admission": false,
+      "public_exit": false,
+      "allow_membership_requests": false,
+      "full_name": null,
+      "default_notification_level": 2,
+      "membership_request_template": null,
+      "is_group_user": true,
+      "is_group_owner": true,
+      "mentionable": false,
+      "messageable": true
+    },
+  },
   "/groups/discourse.json":{
-    "basic_group":{
+    "group":{
       "id":47,
       "automatic":false,
       "name":"discourse",
@@ -14,6 +47,9 @@ export default {
       "is_group_owner":true,
       "mentionable":true,
       "messageable":true
+    },
+    "extras": {
+      "visible_group_names": ["discourse"]
     }
   },
   "/topics/groups/discourse.json":{
@@ -21,12 +57,12 @@ export default {
       {
         "id":2,
         "username":"bruce1",
-        "avatar_template":"/letter_avatar_proxy/v2/letter/b/9de053/{size}.png"
+        "avatar_template":"/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"
       },
       {
         "id":1,
         "username":"bruce0",
-        "avatar_template":"/letter_avatar_proxy/v2/letter/b/90ced4/{size}.png"
+        "avatar_template":"/user_avatar/meta.discourse.org/bruce0/{size}/5245.png"
       }
     ],
     "primary_groups":[],
diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js.es6
index fa940ccec9..dbccd58c34 100644
--- a/test/javascripts/fixtures/session-fixtures.js.es6
+++ b/test/javascripts/fixtures/session-fixtures.js.es6
@@ -1,4 +1,3 @@
 export default {
   "/session/current.json": {"current_user":{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/localhost/eviltrout/{size}/5275.png","name":"Robin Ward","total_unread_notifications":205,"unread_notifications":0,"unread_private_messages":0,"admin":true,"notification_channel_position":null,"site_flagged_posts_count":1,"moderator":true,"staff":true,"title":"co-founder","reply_count":859,"topic_count":36,"enable_quoting":true,"external_links_in_new_tab":false,"dynamic_favicon":true,"trust_level":4,"can_edit":true,"can_invite_to_forum":true,"should_be_redirected_to_top":false,"disable_jump_reply":false,"custom_fields":{},"muted_category_ids":[],"dismissed_banner_key":null,"akismet_review_count":0}}
 };
-
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 541c174320..678d4a782c 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -308,6 +308,10 @@ export default function() {
       return response(200, fixturesByUrl['/groups/discourse/posts.json']);
     });
 
+    this.get("/groups/moderators/members.json", () => {
+      return response(200, fixturesByUrl['/groups/discourse/members.json']);
+    });
+
     this.get('/t/:topic_id/posts.json', request => {
       const postIds = request.queryParams.post_ids;
       const posts = postIds.map(p => ({id: parseInt(p), post_number: parseInt(p) }));
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index 3e5125ad9a..1a267c8c43 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -15,6 +15,12 @@ export function currentUser() {
   return Discourse.User.create(sessionFixtures['/session/current.json'].current_user);
 }
 
+export function replaceCurrentUser(properties) {
+  const user = Discourse.User.current();
+  user.setProperties(properties);
+  Discourse.User.resetCurrent(user);
+}
+
 export function logIn() {
   Discourse.User.resetCurrent(currentUser());
 }
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index 17f5c578c7..a215bdd75b 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -63,6 +63,7 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
     return {
       value: function() { return header.attr('data-value'); },
       name: function() { return header.attr('data-name'); },
+      label: function() { return header.text().trim(); },
       icon: function() { return header.find('.icon'); },
       title: function() { return header.attr('title'); },
       el: function() { return header; }
@@ -183,6 +184,16 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
       return rowHelper(find(selector).find('.select-kit-row.none'));
     },
 
+    validationMessage: function() {
+      var validationMessage = find(selector).find('.validation-message');
+
+      if (validationMessage.length) {
+        return validationMessage.html().trim();
+      } else {
+        return null;
+      }
+    },
+
     selectedRow: function() {
       return rowHelper(find(selector).find('.select-kit-row.is-selected'));
     },
diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js.es6
index d86f1260e8..e042053882 100644
--- a/test/javascripts/helpers/store-pretender.js.es6
+++ b/test/javascripts/helpers/store-pretender.js.es6
@@ -53,7 +53,7 @@ export default function(helpers) {
   this.get('/widgets/:widget_id', function(request) {
     const w = _widgets.findBy('id', parseInt(request.params.widget_id));
     if (w) {
-      return response({widget: w});
+      return response({ widget: w, extras: { hello: 'world' }});
     } else {
       return response(404);
     }
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6
index 8d1d7afb2a..a78e958d4a 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -235,7 +235,7 @@ QUnit.test("Quotes", assert => {
 
   assert.cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line\n[/quote]",
                 { topicId: 2 },
-    `<aside class=\"quote\" data-post=\"1\">
+    `<aside class=\"quote no-group\" data-post=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  eviltrout:</div>
@@ -249,7 +249,7 @@ QUnit.test("Quotes", assert => {
 
   assert.cookedOptions("[quote=\"bob, post:1\"]\nmy quote\n[/quote]",
                 { topicId: 2, lookupAvatar: function() { } },
-    `<aside class=\"quote\" data-post=\"1\">
+    `<aside class=\"quote no-group\" data-post=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  bob:</div>
@@ -260,10 +260,10 @@ QUnit.test("Quotes", assert => {
                 "includes no avatar if none is found");
 
   assert.cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`,
-    `<aside class=\"quote\">
+    `<aside class=\"quote no-group\">
 <blockquote>
 <p>a</p>
-<aside class=\"quote\">
+<aside class=\"quote no-group\">
 <blockquote>
 <p>b</p>
 </blockquote>
@@ -722,22 +722,22 @@ QUnit.test("quotes", assert => {
               "it escapes the contents of the quote");
 
   assert.cooked("[quote]\ntest\n[/quote]",
-         "<aside class=\"quote\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>",
+         "<aside class=\"quote no-group\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>",
          "it supports quotes without params");
 
   assert.cooked("[quote]\n*test*\n[/quote]",
-         "<aside class=\"quote\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>",
+         "<aside class=\"quote no-group\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>",
          "it doesn't insert a new line for italics");
 
   assert.cooked("[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
-         "<aside class=\"quote\">\n<blockquote></blockquote>\n</aside>",
+         "<aside class=\"quote no-group\">\n<blockquote></blockquote>\n</aside>",
          "It will not create a script tag within an attribute");
 });
 
 QUnit.test("quote formatting", assert => {
 
   assert.cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\n[sam]\n[/quote]",
-`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+`<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  EvilTrout:</div>
@@ -748,7 +748,7 @@ QUnit.test("quote formatting", assert => {
           "it allows quotes with [] inside");
 
   assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  eviltrout:</div>
@@ -759,7 +759,7 @@ QUnit.test("quote formatting", assert => {
          "renders quotes properly");
 
   assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]\nhello",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  eviltrout:</div>
@@ -771,12 +771,12 @@ QUnit.test("quote formatting", assert => {
          "handles new lines properly");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
 <blockquote>
-<aside class=\"quote\" data-post=\"2\" data-topic=\"1\">
+<aside class=\"quote no-group\" data-post=\"2\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Bob:</div>
@@ -788,7 +788,7 @@ QUnit.test("quote formatting", assert => {
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]",
 `<p>[quote=&quot;Alice, post:1, topic:1&quot;]</p>
-<aside class=\"quote\" data-post=\"2\" data-topic=\"1\">
+<aside class=\"quote no-group\" data-post=\"2\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Bob:</div>
@@ -798,7 +798,7 @@ QUnit.test("quote formatting", assert => {
          "handles mismatched nested quote tags (non greedy)");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
@@ -811,7 +811,7 @@ var bar = 'bar';
           "quotes can have code blocks without leading newline");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
@@ -827,7 +827,7 @@ var bar = 'bar';
 QUnit.test("quotes with trailing formatting", assert => {
   const result = new PrettyText(defaultOpts).cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\nhello\n[/quote]\n*Test*");
   assert.equal(result,
-`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+`<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  EvilTrout:</div>
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6
index 232055bb28..e62d77dc4e 100644
--- a/test/javascripts/models/store-test.js.es6
+++ b/test/javascripts/models/store-test.js.es6
@@ -49,14 +49,17 @@ QUnit.test('createRecord with a record as attributes returns that record from th
 
 QUnit.test('find', assert => {
   const store = createStore();
+
   return store.find('widget', 123).then(function(w) {
     assert.equal(w.get('name'), 'Trout Lure');
     assert.equal(w.get('id'), 123);
     assert.ok(!w.get('isNew'), 'found records are not new');
+    assert.equal(w.get('extras.hello'), 'world', "extra attributes are set");
 
     // A second find by id returns the same object
     store.find('widget', 123).then(function(w2) {
       assert.equal(w, w2);
+      assert.equal(w.get('extras.hello'), 'world', "extra attributes are set");
     });
   });
 });
diff --git a/vendor/assets/javascripts/run-qunit.js b/vendor/assets/javascripts/run-qunit.js
index 78b157590b..58e986ad5f 100644
--- a/vendor/assets/javascripts/run-qunit.js
+++ b/vendor/assets/javascripts/run-qunit.js
@@ -18,13 +18,19 @@ const CDP = require('chrome-remote-interface');
 (function() {
 
   function launchChrome() {
-    return chromeLauncher.launch({
+    const options = {
       chromeFlags: [
         '--disable-gpu',
        '--headless',
        '--no-sandbox'
       ]
-    });
+    }
+
+    if (process.env.REMOTE_DEBUG) {
+      options.port = 9222;
+    }
+
+    return chromeLauncher.launch(options);
   }
 
   launchChrome().then(chrome => {