diff --git a/.gitignore b/.gitignore
index 4268486d7b..25f45fa7f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,9 +30,9 @@ config/discourse.pill
 config/discourse.conf
 
 # Ignore the default SQLite database and db dumps
+*.sql
+*.sql.gz
 /db/*.sqlite3
-/dbs/*.sql
-/dbs/*.sql.gz
 /db/structure.sql
 
 # Ignore all logfiles and tempfiles.
diff --git a/Gemfile.lock b/Gemfile.lock
index 8fd86089c4..48c8b97299 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,7 +147,7 @@ GEM
     librarian (0.1.2)
       highline
       thor (~> 0.15)
-    libv8 (5.0.71.48.3)
+    libv8 (5.3.332.38.1)
     listen (0.7.3)
     logster (1.2.5)
     loofah (2.0.3)
@@ -162,8 +162,8 @@ GEM
     method_source (0.8.2)
     mime-types (2.99.2)
     mini_portile2 (2.1.0)
-    mini_racer (0.1.3)
-      libv8 (~> 5.0)
+    mini_racer (0.1.7)
+      libv8 (~> 5.3)
     minitest (5.9.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
@@ -501,4 +501,4 @@ DEPENDENCIES
   unicorn
 
 BUNDLED WITH
-   1.13.4
+   1.13.6
diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index f9be641640..561ebc6d8a 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -1,8 +1,9 @@
 /* global ace:true */
 import loadScript from 'discourse/lib/load-script';
 import { escapeExpression } from 'discourse/lib/utilities';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(bufferedRender({
   mode: 'css',
   classNames: ['ace-wrapper'],
   _editor: null,
@@ -14,7 +15,7 @@ export default Ember.Component.extend({
     }
   }.observes('content'),
 
-  render(buffer) {
+  buildBuffer(buffer) {
     buffer.push("<div class='ace'>");
     if (this.get('content')) {
       buffer.push(escapeExpression(this.get('content')));
@@ -66,4 +67,4 @@ export default Ember.Component.extend({
     });
 
   }.on('didInsertElement')
-});
+}));
diff --git a/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
similarity index 76%
rename from app/assets/javascripts/admin/views/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/components/admin-backups-logs.js.es6
index 1929abf5a2..01f4547b17 100644
--- a/app/assets/javascripts/admin/views/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
@@ -1,18 +1,27 @@
 import debounce from 'discourse/lib/debounce';
 import { renderSpinner } from 'discourse/helpers/loading-spinner';
 import { escapeExpression } from 'discourse/lib/utilities';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.View.extend({
+export default Ember.Component.extend(bufferedRender({
   classNames: ["admin-backups-logs"],
 
-  _initialize: function() { this._reset(); }.on("init"),
+  init() {
+    this._super();
+    this._reset();
+  },
 
   _reset() {
     this.setProperties({ formattedLogs: "", index: 0 });
   },
 
+  _scrollDown() {
+    const $div = this.$()[0];
+    $div.scrollTop = $div.scrollHeight;
+  },
+
   _updateFormattedLogs: debounce(function() {
-    const logs = this.get("controller.model");
+    const logs = this.get("logs");
     if (logs.length === 0) {
       this._reset(); // reset the cached logs whenever the model is reset
     } else {
@@ -26,11 +35,12 @@ export default Ember.View.extend({
       // update the formatted logs & cache index
       this.setProperties({ formattedLogs: formattedLogs, index: logs.length });
       // force rerender
-      this.rerender();
+      this.rerenderBuffer();
     }
-  }, 150).observes("controller.model.[]"),
+    Ember.run.scheduleOnce('afterRender', this, this._scrollDown);
+  }, 150).observes("logs.[]").on('init'),
 
-  render(buffer) {
+  buildBuffer(buffer) {
     const formattedLogs = this.get("formattedLogs");
     if (formattedLogs && formattedLogs.length > 0) {
       buffer.push("<pre>");
@@ -40,14 +50,8 @@ export default Ember.View.extend({
       buffer.push("<p>" + I18n.t("admin.backups.logs.none") + "</p>");
     }
     // add a loading indicator
-    if (this.get("controller.status.model.isOperationRunning")) {
+    if (this.get("status.isOperationRunning")) {
       buffer.push(renderSpinner('small'));
     }
-  },
-
-  _forceScrollToBottom: function() {
-    const $div = this.$()[0];
-    $div.scrollTop = $div.scrollHeight;
-  }.on("didInsertElement")
-
-});
+  }
+}));
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
index c8438a65b7..d176b5a40a 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
+++ b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
@@ -1,8 +1,8 @@
 import computed from 'ember-addons/ember-computed-decorators';
-import StringBuffer from 'discourse/mixins/string-buffer';
 import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   classes: ["text-muted", "text-danger", "text-successful"],
   icons: ["circle-o", "times-circle", "circle"],
 
@@ -21,8 +21,8 @@ export default Ember.Component.extend(StringBuffer, {
     return classes[statusId - 1];
   },
 
-  renderString(buffer) {
+  buildBuffer(buffer) {
     buffer.push(iconHTML(this.get('icon'), { class: this.get('class') }));
     buffer.push(I18n.t(`admin.web_hooks.delivery_status.${this.get('status.name')}`));
   }
-});
+}));
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index ea2f02cfa0..73a46eded3 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,3 +1,5 @@
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
 /*global Resumable:true */
 
 /**
@@ -10,7 +12,7 @@
         uploadText="UPLOAD"
     }}
 **/
-const ResumableUploadComponent = Ember.Component.extend(Discourse.StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   tagName: "button",
   classNames: ["btn", "ru"],
   classNameBindings: ["isUploading"],
@@ -36,9 +38,9 @@ const ResumableUploadComponent = Ember.Component.extend(Discourse.StringBuffer,
     }
   }.property("isUploading", "progress"),
 
-  renderString: function(buffer) {
-    var icon = this.get("isUploading") ? "times" : "upload";
-    buffer.push("<i class='fa fa-" + icon + "'></i>");
+  buildBuffer(buffer) {
+    const icon = this.get("isUploading") ? "times" : "upload";
+    buffer.push(`<i class="fa fa-${icon}"></i>`);
     buffer.push("<span class='ru-label'>" + this.get("text") + "</span>");
     buffer.push("<span class='ru-progress' style='width:" + this.get("progress") + "%'></span>");
   },
@@ -117,6 +119,4 @@ const ResumableUploadComponent = Ember.Component.extend(Discourse.StringBuffer,
     }
   }.on("willDestroyElement")
 
-});
-
-export default ResumableUploadComponent;
+}));
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
index 82366d3bd7..529538263c 100644
--- a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
@@ -1,66 +1,30 @@
 import ApiKey from 'admin/models/api-key';
 
-/**
-  This controller supports the interface for dealing with API keys
-
-  @class AdminApiController
-  @extends Ember.ArrayController
-  @namespace Discourse
-  @module Discourse
-**/
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
 
   actions: {
-    /**
-      Generates a master api key
-
-      @method generateMasterKey
-    **/
-    generateMasterKey: function() {
-      var self = this;
-      ApiKey.generateMasterKey().then(function (key) {
-        self.get('model').pushObject(key);
-      });
+    generateMasterKey() {
+      ApiKey.generateMasterKey().then(key => this.get('model').pushObject(key));
     },
 
-    /**
-      Creates an API key instance with internal user object
-
-      @method regenerateKey
-      @param {ApiKey} key the key to regenerate
-    **/
-    regenerateKey: function(key) {
-      bootbox.confirm(I18n.t("admin.api.confirm_regen"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+    regenerateKey(key) {
+      bootbox.confirm(I18n.t("admin.api.confirm_regen"), I18n.t("no_value"), I18n.t("yes_value"), result => {
         if (result) {
           key.regenerate();
         }
       });
     },
 
-    /**
-      Revokes an API key
-
-      @method revokeKey
-      @param {ApiKey} key the key to revoke
-    **/
-    revokeKey: function(key) {
-      var self = this;
-      bootbox.confirm(I18n.t("admin.api.confirm_revoke"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+    revokeKey(key) {
+      bootbox.confirm(I18n.t("admin.api.confirm_revoke"), I18n.t("no_value"), I18n.t("yes_value"), result => {
         if (result) {
-          key.revoke().then(function() {
-            self.get('model').removeObject(key);
-          });
+          key.revoke().then(() => this.get('model').removeObject(key));
         }
       });
     }
   },
 
-  /**
-    Has a master key already been generated?
-
-    @property hasMasterKey
-    @type {Boolean}
-  **/
+  // Has a master key already been generated?
   hasMasterKey: function() {
     return !!this.get('model').findBy('user', null);
   }.property('model.[]')
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
index 98f76405a2..605ebe83af 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,19 +1,20 @@
 import { ajax } from 'discourse/lib/ajax';
-export default Ember.ArrayController.extend({
-  needs: ["adminBackups"],
-  status: Ember.computed.alias("controllers.adminBackups"),
+
+export default Ember.Controller.extend({
+  adminBackups: Ember.inject.controller(),
+  status: Ember.computed.alias('adminBackups.model'),
 
   uploadLabel: function() { return I18n.t("admin.backups.upload.label"); }.property(),
 
   restoreTitle: function() {
-    if (!this.get('status.model.allowRestore')) {
+    if (!this.get('status.allowRestore')) {
       return "admin.backups.operations.restore.is_disabled";
-    } else if (this.get("status.model.isOperationRunning")) {
+    } else if (this.get("status.isOperationRunning")) {
       return "admin.backups.operations.is_running";
     } else {
       return "admin.backups.operations.restore.title";
     }
-  }.property("status.model.{allowRestore,isOperationRunning}"),
+  }.property("status.{allowRestore,isOperationRunning}"),
 
   actions: {
 
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
index 1b3d90346a..38bdd6f571 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,4 +1,5 @@
-export default Ember.ArrayController.extend({
-  needs: ["adminBackups"],
-  status: Em.computed.alias("controllers.adminBackups")
+export default Ember.Controller.extend({
+  logs: [],
+  adminBackups: Ember.inject.controller(),
+  status: Em.computed.alias("adminBackups.model")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
index 5ec2cb4541..7d11fc8622 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -3,14 +3,14 @@ import BufferedContent from 'discourse/mixins/buffered-content';
 import { propertyNotEqual } from 'discourse/lib/computed';
 
 export default Ember.Controller.extend(BufferedContent, {
-  needs: ['admin-badges'],
+  adminBadges: Ember.inject.controller(),
   saving: false,
   savingStatus: '',
 
-  badgeTypes: Em.computed.alias('controllers.admin-badges.badgeTypes'),
-  badgeGroupings: Em.computed.alias('controllers.admin-badges.badgeGroupings'),
-  badgeTriggers: Em.computed.alias('controllers.admin-badges.badgeTriggers'),
-  protectedSystemFields: Em.computed.alias('controllers.admin-badges.protectedSystemFields'),
+  badgeTypes: Ember.computed.alias('adminBadges.badgeTypes'),
+  badgeGroupings: Ember.computed.alias('adminBadges.badgeGroupings'),
+  badgeTriggers: Ember.computed.alias('adminBadges.badgeTriggers'),
+  protectedSystemFields: Ember.computed.alias('adminBadges.protectedSystemFields'),
 
   readOnly: Ember.computed.alias('buffered.system'),
   showDisplayName: propertyNotEqual('name', 'displayName'),
@@ -30,16 +30,15 @@ export default Ember.Controller.extend(BufferedContent, {
   }.observes('model.id'),
 
   actions: {
-    save: function() {
+    save() {
       if (!this.get('saving')) {
-        var fields = ['allow_title', 'multiple_grant',
-                     'listable', 'auto_revoke',
-                     'enabled', 'show_posts',
-                     'target_posts', 'name', 'description',
-                     'long_description',
-                     'icon', 'image', 'query', 'badge_grouping_id',
-                     'trigger', 'badge_type_id'],
-            self = this;
+        let fields = ['allow_title', 'multiple_grant',
+                      'listable', 'auto_revoke',
+                      'enabled', 'show_posts',
+                      'target_posts', 'name', 'description',
+                      'long_description',
+                      'icon', 'image', 'query', 'badge_grouping_id',
+                      'trigger', 'badge_type_id'];
 
         if (this.get('buffered.system')){
           var protectedFields = this.get('protectedSystemFields');
@@ -51,54 +50,55 @@ export default Ember.Controller.extend(BufferedContent, {
         this.set('saving', true);
         this.set('savingStatus', I18n.t('saving'));
 
-        var boolFields = ['allow_title', 'multiple_grant',
-                          'listable', 'auto_revoke',
-                          'enabled', 'show_posts',
-                          'target_posts' ];
+        const boolFields = ['allow_title', 'multiple_grant',
+                            'listable', 'auto_revoke',
+                            'enabled', 'show_posts',
+                            'target_posts' ];
 
-        var data = {},
-            buffered = this.get('buffered');
+        const data = {};
+        const buffered = this.get('buffered');
         fields.forEach(function(field){
           var d = buffered.get(field);
           if (_.include(boolFields, field)) { d = !!d; }
           data[field] = d;
         });
 
-        var newBadge = !this.get('id'),
-            model = this.get('model');
-        this.get('model').save(data).then(function() {
+        const newBadge = !this.get('id');
+        const model = this.get('model');
+        this.get('model').save(data).then(() => {
           if (newBadge) {
-            var adminBadgesController = self.get('controllers.admin-badges');
-            if (!adminBadgesController.contains(model)) adminBadgesController.pushObject(model);
-            self.transitionToRoute('adminBadges.show', model.get('id'));
+            const adminBadges = this.get('adminBadges.model');
+            if (!adminBadges.contains(model)) {
+              adminBadges.pushObject(model);
+            }
+            this.transitionToRoute('adminBadges.show', model.get('id'));
           } else {
-            self.commitBuffer();
-            self.set('savingStatus', I18n.t('saved'));
+            this.commitBuffer();
+            this.set('savingStatus', I18n.t('saved'));
           }
 
-        }).catch(popupAjaxError).finally(function() {
-          self.set('saving', false);
-          self.set('savingStatus', '');
+        }).catch(popupAjaxError).finally(() => {
+          this.set('saving', false);
+          this.set('savingStatus', '');
         });
       }
     },
 
-    destroy: function() {
-      var self = this,
-          adminBadgesController = this.get('controllers.admin-badges'),
-          model = this.get('model');
+    destroy() {
+      const adminBadges = this.get('adminBadges.model');
+      const model = this.get('model');
 
       if (!model.get('id')) {
-        self.transitionToRoute('adminBadges.index');
+        this.transitionToRoute('adminBadges.index');
         return;
       }
 
-      return bootbox.confirm(I18n.t("admin.badges.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+      return bootbox.confirm(I18n.t("admin.badges.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
         if (result) {
-          model.destroy().then(function() {
-            adminBadgesController.removeObject(model);
-            self.transitionToRoute('adminBadges.index');
-          }).catch(function() {
+          model.destroy().then(() => {
+            adminBadges.removeObject(model);
+            this.transitionToRoute('adminBadges.index');
+          }).catch(() => {
             bootbox.alert(I18n.t('generic_error'));
           });
         }
diff --git a/app/assets/javascripts/admin/controllers/admin-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges.js.es6
index 24c4c05139..77c79b724a 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges.js.es6
@@ -1 +1 @@
-export default Ember.ArrayController.extend();
+export default Ember.Controller.extend();
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
index 4a6a58021b..ae253aec84 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
@@ -1,4 +1,4 @@
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   onlyOverridden: false,
 
   baseColorScheme: function() {
@@ -13,8 +13,8 @@ export default Ember.ArrayController.extend({
     return baseColorsHash;
   }.property('baseColorScheme'),
 
-  removeSelected: function() {
-    this.removeObject(this.get('selectedItem'));
+  removeSelected() {
+    this.get('model').removeObject(this.get('selectedItem'));
     this.set('selectedItem', null);
   },
 
@@ -26,8 +26,7 @@ export default Ember.ArrayController.extend({
       return;
     }
 
-    var matches = Em.A();
-
+    const matches = [];
     _.each(this.get('selectedItem.colors'), function(color){
       if (color.get('overridden')) matches.pushObject(color);
     });
@@ -58,10 +57,10 @@ export default Ember.ArrayController.extend({
       this.filterContent();
     },
 
-    newColorScheme: function() {
-      var newColorScheme = Em.copy(this.get('baseColorScheme'), true);
+    newColorScheme() {
+      const newColorScheme = Em.copy(this.get('baseColorScheme'), true);
       newColorScheme.set('name', I18n.t('admin.customize.colors.new_name'));
-      this.pushObject(newColorScheme);
+      this.get('model').pushObject(newColorScheme);
       this.send('selectColorScheme', newColorScheme);
       this.set('onlyOverridden', false);
     },
@@ -86,10 +85,10 @@ export default Ember.ArrayController.extend({
       this.updateEnabled();
     },
 
-    copy: function(colorScheme) {
+    copy(colorScheme) {
       var newColorScheme = Em.copy(colorScheme, true);
       newColorScheme.set('name', I18n.t('admin.customize.colors.copy_name_prefix') + ' ' + colorScheme.get('name'));
-      this.pushObject(newColorScheme);
+      this.get('model').pushObject(newColorScheme);
       this.send('selectColorScheme', newColorScheme);
     },
 
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6
index 03c855a969..47cf280ae6 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6
@@ -33,7 +33,7 @@ export default Ember.Controller.extend(activeSections, {
     return !this.get('model.changed') || this.get('model.isSaving');
   }.property('model.changed', 'model.isSaving'),
 
-  needs: ['adminCustomizeCssHtml'],
+  adminCustomizeCssHtml: Ember.inject.controller(),
 
   undoPreviewUrl: url('/?preview-style='),
   defaultStyleUrl: url('/?preview-style=default'),
@@ -44,13 +44,12 @@ export default Ember.Controller.extend(activeSections, {
     },
 
     destroy() {
-      const self = this;
-      return bootbox.confirm(I18n.t("admin.customize.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+      return bootbox.confirm(I18n.t("admin.customize.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
         if (result) {
-          const model = self.get('model');
-          model.destroyRecord().then(function() {
-            self.get('controllers.adminCustomizeCssHtml').get('model').removeObject(model);
-            self.transitionToRoute('adminCustomizeCssHtml');
+          const model = this.get('model');
+          model.destroyRecord().then(() => {
+            this.get('adminCustomizeCssHtml').get('model').removeObject(model);
+            this.transitionToRoute('adminCustomizeCssHtml');
           });
         }
       });
diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
index b73a8c0354..266aa6975e 100644
--- a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
@@ -9,7 +9,7 @@ export default Ember.Controller.extend({
   @computed('embedding.embeddable_hosts.@each.isCreated')
   showSecondary() {
     const hosts = this.get('embedding.embeddable_hosts');
-    return hosts.length && hosts.findProperty('isCreated');
+    return hosts.length && hosts.findBy('isCreated');
   },
 
   @computed('embedding.base_url')
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
index b111a5952b..29aecc4773 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
@@ -1,23 +1,23 @@
 import { ajax } from 'discourse/lib/ajax';
-export default Ember.ArrayController.extend({
-  sortProperties: ["name"],
+export default Ember.Controller.extend({
+  sortedEmojis: Ember.computed.sort('model', 'emojiSorting'),
+  emojiSorting: ['name'],
 
   actions: {
     emojiUploaded(emoji) {
       emoji.url += "?t=" + new Date().getTime();
-      this.pushObject(Ember.Object.create(emoji));
+      this.get('model').pushObject(Ember.Object.create(emoji));
     },
 
     destroy(emoji) {
-      const self = this;
       return bootbox.confirm(
         I18n.t("admin.emoji.delete_confirm", { name: emoji.get("name") }),
         I18n.t("no_value"),
         I18n.t("yes_value"),
-        function(destroy) {
+        destroy => {
           if (destroy) {
-            return ajax("/admin/customize/emojis/" + emoji.get("name"), { type: "DELETE" }).then(function() {
-              self.removeObject(emoji);
+            return ajax("/admin/customize/emojis/" + emoji.get("name"), { type: "DELETE" }).then(() => {
+              this.get('model').removeObject(emoji);
             });
           }
         }
diff --git a/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6 b/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
index 0c85749775..e3101e2fa3 100644
--- a/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
@@ -1,6 +1,6 @@
 import FlaggedPost from 'admin/models/flagged-post';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   query: null,
 
   adminOldFlagsView: Em.computed.equal("query", "old"),
@@ -8,18 +8,16 @@ export default Ember.ArrayController.extend({
 
   actions: {
     disagreeFlags(flaggedPost) {
-      var self = this;
-      flaggedPost.disagreeFlags().then(function () {
-        self.removeObject(flaggedPost);
+      flaggedPost.disagreeFlags().then(() => {
+        this.get('model').removeObject(flaggedPost);
       }, function () {
         bootbox.alert(I18n.t("admin.flags.error"));
       });
     },
 
     deferFlags(flaggedPost) {
-      var self = this;
-      flaggedPost.deferFlags().then(function () {
-        self.removeObject(flaggedPost);
+      flaggedPost.deferFlags().then(() => {
+        this.get('model').removeObject(flaggedPost);
       }, function () {
         bootbox.alert(I18n.t("admin.flags.error"));
       });
@@ -29,7 +27,7 @@ export default Ember.ArrayController.extend({
       this.send("disagreeFlags", item);
     },
 
-    loadMore(){
+    loadMore() {
       const flags = this.get('model');
       return FlaggedPost.findAll(this.get('query'), flags.length+1).then(data => {
         if (data.length===0) {
diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6
index bf19293117..e7d53800e7 100644
--- a/app/assets/javascripts/admin/controllers/admin-group.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-group.js.es6
@@ -4,7 +4,7 @@ import { escapeExpression } from 'discourse/lib/utilities';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend({
-  needs: ['adminGroupsType'],
+  adminGroupsType: Ember.inject.controller(),
   disableSave: false,
   savingStatus: '',
 
@@ -131,13 +131,13 @@ export default Ember.Controller.extend({
 
     save() {
       const group = this.get('model'),
-            groupsController = this.get("controllers.adminGroupsType"),
+            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.addObject(group));
+      let promise = group.get("id") ? group.save() : group.create().then(() => groupsController.get('model').addObject(group));
 
       promise.then(() => {
         this.transitionToRoute("adminGroup", groupType, group.get('name'));
@@ -148,7 +148,7 @@ export default Ember.Controller.extend({
 
     destroy() {
       const group = this.get('model'),
-            groupsController = this.get('controllers.adminGroupsType'),
+            groupsController = this.get('adminGroupsType'),
             self = this;
 
       if (!group.get('id')) {
diff --git a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6 b/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
index 9a5962cccf..10d7ad01cf 100644
--- a/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-groups-type.js.es6
@@ -1,18 +1,18 @@
 import { ajax } from 'discourse/lib/ajax';
-export default Ember.ArrayController.extend({
-  sortProperties: ['name'],
+export default Ember.Controller.extend({
+  sortedGroups: Ember.computed.sort('model', 'groupSorting'),
+  groupSorting: ['name'],
+
   refreshingAutoGroups: false,
-  isAuto: function(){
-    return this.get('type') === 'automatic';
-  }.property('type'),
+
+  isAuto: Ember.computed.equal('type', 'automatic'),
 
   actions: {
-    refreshAutoGroups: function(){
-      var self = this;
+    refreshAutoGroups() {
       this.set('refreshingAutoGroups', true);
-      ajax('/admin/groups/refresh_automatic_groups', {type: 'POST'}).then(function() {
-        self.transitionToRoute("adminGroupsType", "automatic").then(function() {
-          self.set('refreshingAutoGroups', false);
+      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-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
index fe158a33ab..13685f16b9 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
@@ -2,12 +2,12 @@ import { exportEntity } from 'discourse/lib/export-csv';
 import { outputExportResult } from 'discourse/lib/export-result';
 import ScreenedEmail from 'admin/models/screened-email';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   loading: false,
 
   actions: {
     clearBlock(row){
-      row.clearBlock().then(function(){
+      row.clearBlock().then(function() {
         // feeling lazy
         window.location.reload();
       });
@@ -19,11 +19,10 @@ export default Ember.ArrayController.extend({
   },
 
   show() {
-    var self = this;
-    self.set('loading', true);
-    ScreenedEmail.findAll().then(function(result) {
-      self.set('model', result);
-      self.set('loading', false);
+    this.set('loading', true);
+    ScreenedEmail.findAll().then(result => {
+      this.set('model', result);
+      this.set('loading', false);
     });
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
index 88f46d6ccb..b654e6d65f 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
@@ -3,7 +3,7 @@ import { outputExportResult } from 'discourse/lib/export-result';
 import { exportEntity } from 'discourse/lib/export-csv';
 import ScreenedIpAddress from 'admin/models/screened-ip-address';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   loading: false,
   filter: null,
   savedIpAddress: null,
@@ -63,16 +63,15 @@ export default Ember.ArrayController.extend({
     },
 
     destroy(record) {
-      const self = this;
       return bootbox.confirm(
         I18n.t("admin.logs.screened_ips.delete_confirm", { ip_address: record.get('ip_address') }),
         I18n.t("no_value"),
         I18n.t("yes_value"),
-        function (result) {
+        result => {
           if (result) {
             record.destroy().then(deleted => {
               if (deleted) {
-                self.get("content").removeObject(record);
+                this.get("model").removeObject(record);
               } else {
                 bootbox.alert(I18n.t("generic_error"));
               }
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
index 5f5e333960..d57a151d21 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
@@ -2,15 +2,14 @@ import { exportEntity } from 'discourse/lib/export-csv';
 import { outputExportResult } from 'discourse/lib/export-result';
 import ScreenedUrl from 'admin/models/screened-url';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   loading: false,
 
   show() {
-    const self = this;
-    self.set('loading', true);
-    ScreenedUrl.findAll().then(function(result) {
-      self.set('model', result);
-      self.set('loading', false);
+    this.set('loading', true);
+    ScreenedUrl.findAll().then(result => {
+      this.set('model', result);
+      this.set('loading', false);
     });
   },
 
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
index 956a737e57..98f135dc57 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
@@ -2,7 +2,7 @@ import { exportEntity } from 'discourse/lib/export-csv';
 import { outputExportResult } from 'discourse/lib/export-result';
 import StaffActionLog from 'admin/models/staff-action-log';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   loading: false,
   filters: null,
 
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
index 9c5ab4bb3e..6bfcc66922 100644
--- a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
@@ -1,16 +1,14 @@
 import debounce from 'discourse/lib/debounce';
 import Permalink from 'admin/models/permalink';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   loading: false,
   filter: null,
 
   show: debounce(function() {
-    var self = this;
-    self.set('loading', true);
-    Permalink.findAll(self.get("filter")).then(function(result) {
-      self.set('model', result);
-      self.set('loading', false);
+    Permalink.findAll(this.get("filter")).then(result => {
+      this.set('model', result);
+      this.set('loading', false);
     });
   }, 250).observes("filter"),
 
@@ -20,12 +18,11 @@ export default Ember.ArrayController.extend({
     },
 
     destroy: function(record) {
-      const self = this;
-      return bootbox.confirm(I18n.t("admin.permalink.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+      return bootbox.confirm(I18n.t("admin.permalink.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
         if (result) {
-          record.destroy().then(function(deleted) {
+          record.destroy().then(deleted => {
             if (deleted) {
-              self.removeObject(record);
+              this.get('model').removeObject(record);
             } else {
               bootbox.alert(I18n.t("generic_error"));
             }
diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
index b2eb1335ed..5393a27c8f 100644
--- a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
@@ -1,10 +1,9 @@
-export default Ember.ArrayController.extend({
-
+export default Ember.Controller.extend({
   adminRoutes: function() {
-    return this.get('model').map(function(p) {
-        if (p.get('enabled')) {
-          return p.admin_route;
-        }
+    return this.get('model').map(p => {
+      if (p.get('enabled')) {
+        return p.admin_route;
+      }
     }).compact();
   }.property()
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
index b16db34e3e..df0738bed1 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
@@ -1,16 +1,16 @@
 export default Ember.Controller.extend({
   categoryNameKey: null,
-  needs: ['adminSiteSettings'],
+  adminSiteSettings: Ember.inject.controller(),
 
   filteredContent: function() {
     if (!this.get('categoryNameKey')) { return []; }
 
-    const category = this.get('controllers.adminSiteSettings.content').findProperty('nameKey', this.get('categoryNameKey'));
+    const category = (this.get('adminSiteSettings.model') || []).findBy('nameKey', this.get('categoryNameKey'));
     if (category) {
       return category.siteSettings;
     } else {
       return [];
     }
-  }.property('controllers.adminSiteSettings.content', 'categoryNameKey')
+  }.property('adminSiteSettings.model', 'categoryNameKey')
 
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
index b7c4302e87..02a907d7af 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -1,6 +1,6 @@
 import debounce from 'discourse/lib/debounce';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   filter: null,
   onlyOverridden: false,
   filtered: Ember.computed.notEmpty('filter'),
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
index c8c0ba6219..a2b7c94f17 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,10 +1,11 @@
 import UserBadge from 'discourse/models/user-badge';
 
-export default Ember.ArrayController.extend({
-  needs: ["adminUser"],
-  user: Em.computed.alias('controllers.adminUser.model'),
-  sortProperties: ['granted_at'],
-  sortAscending: false,
+export default Ember.Controller.extend({
+  adminUser: Ember.inject.controller(),
+  user: Ember.computed.alias('adminUser.model'),
+
+  sortedBadges: Ember.computed.sort('model', 'badgeSortOrder'),
+  badgeSortOrder: ['granted_at:desc'],
 
   groupedBadges: function(){
     const allBadges = this.get('model');
@@ -38,8 +39,6 @@ export default Ember.ArrayController.extend({
     });
 
     return _(expanded).sortBy(group => group.granted_at).reverse().value();
-
-
   }.property('model', 'model.[]', 'model.expandedBadges.[]'),
 
   /**
@@ -80,22 +79,15 @@ export default Ember.ArrayController.extend({
       model.get('expandedBadges').pushObject(userBadge.badge.id);
     },
 
-    /**
-      Grant the selected badge to the user.
-
-      @method grantBadge
-      @param {Integer} badgeId id of the badge we want to grant.
-    **/
-    grantBadge: function(badgeId) {
-      var self = this;
-      UserBadge.grant(badgeId, this.get('user.username'), this.get('badgeReason')).then(function(userBadge) {
-        self.set('badgeReason', '');
-        self.pushObject(userBadge);
-        Ember.run.next(function() {
+    grantBadge(badgeId) {
+      UserBadge.grant(badgeId, this.get('user.username'), this.get('badgeReason')).then(userBadge => {
+        this.set('badgeReason', '');
+        this.get('model').pushObject(userBadge);
+        Ember.run.next(() => {
           // Update the selected badge ID after the combobox has re-rendered.
-          var newSelectedBadge = self.get('grantableBadges')[0];
+          const newSelectedBadge = this.get('grantableBadges')[0];
           if (newSelectedBadge) {
-            self.set('selectedBadgeId', newSelectedBadge.get('id'));
+            this.set('selectedBadgeId', newSelectedBadge.get('id'));
           }
         });
       }, function() {
@@ -104,12 +96,11 @@ export default Ember.ArrayController.extend({
       });
     },
 
-    revokeBadge: function(userBadge) {
-      var self = this;
-      return bootbox.confirm(I18n.t("admin.badges.revoke_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+    revokeBadge(userBadge) {
+      return bootbox.confirm(I18n.t("admin.badges.revoke_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
         if (result) {
-          userBadge.revoke().then(function() {
-            self.get('model').removeObject(userBadge);
+          userBadge.revoke().then(() => {
+            this.get('model').removeObject(userBadge);
           });
         }
       });
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
index af4a0297ef..1d877dadaf 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
@@ -2,7 +2,7 @@ import debounce from 'discourse/lib/debounce';
 import { i18n } from 'discourse/lib/computed';
 import AdminUser from 'admin/models/admin-user';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   query: null,
   showEmails: false,
   refreshing: false,
@@ -19,7 +19,7 @@ export default Ember.ArrayController.extend({
   selectedCount: function() {
     var model = this.get('model');
     if (!model || !model.length) return 0;
-    return model.filterProperty('selected').length;
+    return model.filterBy('selected').length;
   }.property('model.@each.selected'),
 
   selectAllChanged: function() {
@@ -52,14 +52,14 @@ export default Ember.ArrayController.extend({
 
   actions: {
     approveUsers: function() {
-      AdminUser.bulkApprove(this.get('model').filterProperty('selected'));
+      AdminUser.bulkApprove(this.get('model').filterBy('selected'));
       this._refreshUsers();
     },
 
     rejectUsers: function() {
       var maxPostAge = this.siteSettings.delete_user_max_post_age;
       var controller = this;
-      AdminUser.bulkReject(this.get('model').filterProperty('selected')).then(function(result){
+      AdminUser.bulkReject(this.get('model').filterBy('selected')).then(function(result){
         var message = I18n.t("admin.users.reject_successful", {count: result.success});
         if (result.failed > 0) {
           message += ' ' + I18n.t("admin.users.reject_failures", {count: result.failed});
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
index 7cb76be26c..53d8370403 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
@@ -4,10 +4,10 @@ import computed from 'ember-addons/ember-computed-decorators';
 import InputValidation from 'discourse/models/input-validation';
 
 export default Ember.Controller.extend({
-  needs: ['adminWebHooks'],
-  eventTypes: Em.computed.alias('controllers.adminWebHooks.eventTypes'),
-  defaultEventTypes: Em.computed.alias('controllers.adminWebHooks.defaultEventTypes'),
-  contentTypes: Em.computed.alias('controllers.adminWebHooks.contentTypes'),
+  adminWebHooks: Ember.inject.controller(),
+  eventTypes: Ember.computed.alias('adminWebHooks.eventTypes'),
+  defaultEventTypes: Ember.computed.alias('adminWebHooks.defaultEventTypes'),
+  contentTypes: Ember.computed.alias('adminWebHooks.contentTypes'),
 
   @computed('model.isSaving', 'saved', 'saveButtonDisabled')
   savingStatus(isSaving, saved, saveButtonDisabled) {
@@ -68,7 +68,7 @@ export default Ember.Controller.extend({
       const saveWebHook = () => {
         return model.save().then(() => {
           this.set('saved', true);
-          this.get('controllers.adminWebHooks').get('model').addObject(model);
+          this.get('adminWebHooks').get('model').addObject(model);
         }).catch(popupAjaxError);
       };
 
@@ -88,7 +88,7 @@ export default Ember.Controller.extend({
         if (result) {
           const model = this.get('model');
           model.destroyRecord().then(() => {
-            this.get('controllers.adminWebHooks').get('model').removeObject(model);
+            this.get('adminWebHooks').get('model').removeObject(model);
             this.transitionToRoute('adminWebHooks');
           }).catch(popupAjaxError);
         }
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
index 2924eb6699..7f1f4f2e49 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
@@ -1,16 +1,15 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ["admin-flags-list"],
+  adminFlagsList: Ember.inject.controller(),
 
   _agreeFlag: function (actionOnPost) {
-    var adminFlagController = this.get("controllers.admin-flags-list");
-    var post = this.get("content");
-    var self = this;
+    const adminFlagController = this.get("adminFlagsList");
+    const post = this.get("content");
 
-    return post.agreeFlags(actionOnPost).then(function () {
-      adminFlagController.removeObject(post);
-      self.send("closeModal");
+    return post.agreeFlags(actionOnPost).then(() => {
+      adminFlagController.get('model').removeObject(post);
+      this.send("closeModal");
     }, function () {
       bootbox.alert(I18n.t("admin.flags.error"));
     });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
index 8f93884c60..8aaf637552 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
@@ -1,11 +1,9 @@
 import { escapeExpression } from 'discourse/lib/utilities';
 
 export default Ember.Controller.extend({
-  needs: ['modal'],
-
-  sample: Em.computed.alias('model.sample'),
-  errors: Em.computed.alias('model.errors'),
-  count: Em.computed.alias('model.grant_count'),
+  sample: Ember.computed.alias('model.sample'),
+  errors: Ember.computed.alias('model.errors'),
+  count: Ember.computed.alias('model.grant_count'),
 
   count_warning: function() {
     if (this.get('count') <= 10) {
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
index 284b8bfd09..fc2e062794 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
@@ -1,36 +1,31 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ["admin-flags-list"],
+  adminFlagsList: Ember.inject.controller(),
 
   actions: {
+    deletePostDeferFlag() {
+      const adminFlagController = this.get("adminFlagsList");
+      const post = this.get("content");
 
-    deletePostDeferFlag: function () {
-      var adminFlagController = this.get("controllers.admin-flags-list");
-      var post = this.get("content");
-      var self = this;
-
-      return post.deferFlags(true).then(function () {
-        adminFlagController.removeObject(post);
-        self.send("closeModal");
+      return post.deferFlags(true).then(() => {
+        adminFlagController.get('model').removeObject(post);
+        this.send("closeModal");
       }, function () {
         bootbox.alert(I18n.t("admin.flags.error"));
       });
     },
 
-    deletePostAgreeFlag: function () {
-      var adminFlagController = this.get("controllers.admin-flags-list");
-      var post = this.get("content");
-      var self = this;
+    deletePostAgreeFlag() {
+      const adminFlagController = this.get("adminFlagsList");
+      const post = this.get("content");
 
-      return post.agreeFlags("delete").then(function () {
-        adminFlagController.removeObject(post);
-        self.send("closeModal");
+      return post.agreeFlags("delete").then(() => {
+        adminFlagController.get('model').removeObject(post);
+        this.send("closeModal");
       }, function () {
         bootbox.alert(I18n.t("admin.flags.error"));
       });
     }
-
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index 086080c173..fe0416bc30 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
@@ -1,6 +1,5 @@
 import { ajax } from 'discourse/lib/ajax';
 export default Ember.Controller.extend({
-  needs: ['modal'],
 
   modelChanged: function(){
     const model = this.get('model');
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
index 15cd838245..c041b24f74 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
@@ -2,31 +2,27 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import Backup from 'admin/models/backup';
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ["adminBackupsLogs"],
+  adminBackupsLogs: Ember.inject.controller(),
 
-  _startBackup: function (withUploads) {
-    var self = this;
-    Discourse.User.currentProp("hideReadOnlyAlert", true);
-    Backup.start(withUploads).then(function() {
-      self.get("controllers.adminBackupsLogs").clear();
-      self.send("backupStarted");
+  _startBackup(withUploads) {
+    this.currentUser.set('hideReadOnlyAlert', true);
+    Backup.start(withUploads).then(() => {
+      this.get("adminBackupsLogs.logs").clear();
+      this.send("backupStarted");
     });
   },
 
   actions: {
-
-    startBackup: function () {
+    startBackup() {
       this._startBackup();
     },
 
-    startBackupWithoutUpload: function () {
+    startBackupWithoutUpload() {
       this._startBackup(false);
     },
 
-    cancel: function () {
+    cancel() {
       this.send("closeModal");
     }
-
   }
-
 });
diff --git a/app/assets/javascripts/admin/models/backup.js.es6 b/app/assets/javascripts/admin/models/backup.js.es6
index d7baceebac..7fe81441c3 100644
--- a/app/assets/javascripts/admin/models/backup.js.es6
+++ b/app/assets/javascripts/admin/models/backup.js.es6
@@ -2,7 +2,6 @@ import { ajax } from 'discourse/lib/ajax';
 import PreloadStore from 'preload-store';
 
 const Backup = Discourse.Model.extend({
-
   destroy() {
     return ajax("/admin/backups/" + this.get("filename"), { type: "DELETE" });
   },
@@ -13,11 +12,9 @@ const Backup = Discourse.Model.extend({
       data: { client_id: window.MessageBus.clientId }
     });
   }
-
 });
 
 Backup.reopenClass({
-
   find() {
     return PreloadStore.getAndRemove("backups", () => ajax("/admin/backups.json"))
                        .then(backups => backups.map(backup => Backup.create(backup)));
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
index cd01295f5d..c036a10742 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
@@ -5,17 +5,17 @@ export default Ember.Route.extend({
   // since the logs are pushed via the message bus
   // we only want to preload them (hence the beforeModel hook)
   beforeModel() {
-    const logsController = this.controllerFor("adminBackupsLogs");
+    const logs = this.controllerFor("adminBackupsLogs").get('logs');
     // preload the logs if any
     PreloadStore.getAndRemove("logs").then(function (preloadedLogs) {
       if (preloadedLogs && preloadedLogs.length) {
         // we need to filter out message like: "[SUCCESS]"
         // and convert POJOs to Ember Objects
-        const logs = _.chain(preloadedLogs)
-                    .reject(function (log) { return log.message.length === 0 || log.message[0] === "["; })
-                    .map(function (log) { return Em.Object.create(log); })
-                    .value();
-        logsController.pushObjects(logs);
+        const newLogs = _.chain(preloadedLogs)
+                         .reject(function (log) { return log.message.length === 0 || log.message[0] === "["; })
+                         .map(function (log) { return Em.Object.create(log); })
+                         .value();
+        logs.pushObjects(newLogs);
       }
     });
   },
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index d590019431..ad6f79a8cb 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -15,7 +15,7 @@ export default Discourse.Route.extend({
   _processLogMessage(log) {
     if (log.message === "[STARTED]") {
       this.controllerFor("adminBackups").set("model.isOperationRunning", true);
-      this.controllerFor("adminBackupsLogs").clear();
+      this.controllerFor("adminBackupsLogs").get('logs').clear();
     } else if (log.message === "[FAILED]") {
       this.controllerFor("adminBackups").set("model.isOperationRunning", false);
       bootbox.alert(I18n.t("admin.backups.operations.failed", { operation: log.operation }));
@@ -27,7 +27,7 @@ export default Discourse.Route.extend({
         window.location.pathname = Discourse.getURL("/");
       }
     } else {
-      this.controllerFor("adminBackupsLogs").pushObject(Em.Object.create(log));
+      this.controllerFor("adminBackupsLogs").get('logs').pushObject(Em.Object.create(log));
     }
   },
 
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index 03d091d228..537fdcfda8 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -13,7 +13,7 @@ export default Ember.Route.extend({
         name: I18n.t('admin.badges.new_badge')
       });
     }
-    return this.modelFor('adminBadges').findProperty('id', parseInt(params.badge_id));
+    return this.modelFor('adminBadges').findBy('id', parseInt(params.badge_id));
   },
 
   actions: {
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js.es6
index 68da5edb6b..96ecddab23 100644
--- a/app/assets/javascripts/admin/routes/admin-badges.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges.js.es6
@@ -5,21 +5,20 @@ import BadgeGrouping from 'discourse/models/badge-grouping';
 export default Discourse.Route.extend({
   _json: null,
 
-  model: function() {
-    var self = this;
-    return ajax('/admin/badges.json').then(function(json) {
-      self._json = json;
+  model() {
+    return ajax('/admin/badges.json').then(json => {
+      this._json = json;
       return Badge.createFromJson(json);
     });
   },
 
-  setupController: function(controller, model) {
-    var json = this._json,
-        triggers = [],
-        badgeGroupings = [];
+  setupController(controller, model) {
+    const json = this._json;
+    const badgeTriggers = [];
+    const badgeGroupings = [];
 
     _.each(json.admin_badges.triggers,function(v,k){
-      triggers.push({id: v, name: I18n.t('admin.badges.trigger_type.'+k)});
+      badgeTriggers.push({id: v, name: I18n.t('admin.badges.trigger_type.'+k)});
     });
 
     json.badge_groupings.forEach(function(badgeGroupingJson) {
@@ -30,8 +29,8 @@ export default Discourse.Route.extend({
       badgeGroupings: badgeGroupings,
       badgeTypes: json.badge_types,
       protectedSystemFields: json.admin_badges.protected_system_fields,
-      badgeTriggers: triggers,
-      model: model
+      badgeTriggers,
+      model
     });
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6
index dc38f3c51f..7df829706f 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6
@@ -1,7 +1,7 @@
 export default Ember.Route.extend({
   model(params) {
     const all = this.modelFor('adminCustomizeCssHtml');
-    const model = all.findProperty('id', parseInt(params.site_customization_id));
+    const model = all.findBy('id', parseInt(params.site_customization_id));
     return model ? { model, section: params.section } : this.replaceWith('adminCustomizeCssHtml.index');
   },
 
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
index b6e4e36bf9..7c759995fb 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
@@ -3,7 +3,7 @@ import { scrollTop } from 'discourse/mixins/scroll-top';
 export default Ember.Route.extend({
   model(params) {
     const all = this.modelFor('adminCustomizeEmailTemplates');
-    return all.findProperty('id', params.id);
+    return all.findBy('id', params.id);
   },
 
   setupController(controller, emailTemplate) {
diff --git a/app/assets/javascripts/admin/routes/admin-group.js.es6 b/app/assets/javascripts/admin/routes/admin-group.js.es6
index 298bffaa43..3575496edd 100644
--- a/app/assets/javascripts/admin/routes/admin-group.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-group.js.es6
@@ -7,8 +7,7 @@ export default Discourse.Route.extend({
       return Group.create({ automatic: false, visible: true });
     }
 
-    const group = this.modelFor('adminGroupsType')
-                      .findProperty('name', params.name);
+    const group = this.modelFor('adminGroupsType').findBy('name', params.name);
 
     if (!group) { return this.transitionTo('adminGroups.index'); }
 
diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys.hbs
index 4123e57638..60449052bb 100644
--- a/app/assets/javascripts/admin/templates/api-keys.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys.hbs
@@ -30,5 +30,4 @@
 
 {{#unless hasMasterKey}}
   <button class='btn' {{action "generateMasterKey"}}><i class="fa fa-key"></i>{{i18n 'admin.api.generate_master'}}</button>
-{{/unless }}
-
+{{/unless}}
diff --git a/app/assets/javascripts/admin/templates/backups-logs.hbs b/app/assets/javascripts/admin/templates/backups-logs.hbs
new file mode 100644
index 0000000000..34ec15f84a
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/backups-logs.hbs
@@ -0,0 +1 @@
+{{admin-backups-logs logs=logs status=status}}
diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups_index.hbs
index c7323ebea0..308e73f0fd 100644
--- a/app/assets/javascripts/admin/templates/backups_index.hbs
+++ b/app/assets/javascripts/admin/templates/backups_index.hbs
@@ -6,9 +6,9 @@
       <div class="pull-right">
         {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title"}}
         {{#if site.isReadOnly}}
-          {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.model.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}}
+          {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}}
         {{else}}
-          {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.model.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}}
+          {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}}
         {{/if}}
       </div>
     </th>
@@ -20,12 +20,12 @@
       <td>
         <div class="pull-right">
           <a href={{backup.link}} class="btn download" title="{{i18n 'admin.backups.operations.download.title'}}">{{fa-icon "download"}}{{i18n 'admin.backups.operations.download.label'}}</a>
-          {{#if status.model.isOperationRunning}}
+          {{#if status.isOperationRunning}}
             {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}}
-            {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.model.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
+            {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
           {{else}}
             {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}}
-            {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.model.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
+            {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}}
           {{/if}}
         </div>
       </td>
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index ca6fd742d4..8972e2ab27 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -5,7 +5,7 @@
 
   <p>{{emoji-uploader done="emojiUploaded"}}</p>
 
-  {{#if model}}
+  {{#if sortedEmojis}}
     <div class="span8">
       <table id="custom_emoji">
         <thead>
@@ -16,7 +16,7 @@
           </tr>
         </thead>
         <tbody>
-          {{#each model as |e|}}
+          {{#each sortedEmojis as |e|}}
             <tr>
               <th><img class="emoji" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
               <th>:{{e.name}}:</th>
diff --git a/app/assets/javascripts/admin/templates/groups_type.hbs b/app/assets/javascripts/admin/templates/groups_type.hbs
index 45bb054ad7..d1d2223c2b 100644
--- a/app/assets/javascripts/admin/templates/groups_type.hbs
+++ b/app/assets/javascripts/admin/templates/groups_type.hbs
@@ -2,7 +2,7 @@
   <div class='content-list span6'>
     <h3>{{i18n 'admin.groups.edit'}}</h3>
     <ul>
-      {{#each model as |group|}}
+      {{#each sortedGroups as |group|}}
         <li>
           {{#link-to "adminGroup" group.type group.name}}{{group.name}}
             {{#if group.userCountDisplay}}
diff --git a/app/assets/javascripts/deprecated.js b/app/assets/javascripts/deprecated.js
index ee6592848a..151ed975d0 100644
--- a/app/assets/javascripts/deprecated.js
+++ b/app/assets/javascripts/deprecated.js
@@ -1,31 +1,7 @@
 (function() {
   var Discourse = require('discourse').default;
 
-  function deprecate(module, methods) {
-    var result = {};
-
-    methods.forEach(function(m) {
-      result[m] = function() {
-        Ember.warn("Discourse." + module + "." + m + " is deprecated. Export a setup() function instead");
-      };
-    });
-
-    Discourse[module] = result;
-  }
-
-  deprecate('Markdown', ['whiteListTag', 'whiteListIframe']);
-  deprecate('Dialect',  ['inlineRegexp', 'inlineBetween', 'addPreProcessor', 'replaceBlock',
-                         'inlineReplace', 'registerInline', 'registerEmoji']);
-
-  deprecate('BBCode', ['replaceBBCode', 'register', 'rawBBCode', 'replaceBBCodeParamsRaw']);
-
   Discourse.dialect_deprecated = true;
 
-  Discourse.ajax = function() {
-    var ajax = require('discourse/lib/ajax').ajax;
-    Ember.warn("Discourse.ajax is deprecated. Import the module and use it instead");
-    return ajax.apply(this, arguments);
-  };
-
   window.Discourse = Discourse;
 })();
diff --git a/app/assets/javascripts/discourse-common/components/combo-box.js.es6 b/app/assets/javascripts/discourse-common/components/combo-box.js.es6
index ce222e2114..2a2c4e2ba7 100644
--- a/app/assets/javascripts/discourse-common/components/combo-box.js.es6
+++ b/app/assets/javascripts/discourse-common/components/combo-box.js.es6
@@ -1,13 +1,14 @@
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 import { on, observes } from 'ember-addons/ember-computed-decorators';
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(bufferedRender({
   tagName: 'select',
   attributeBindings: ['tabindex', 'disabled'],
   classNames: ['combobox'],
   valueAttribute: 'id',
   nameProperty: 'name',
 
-  render(buffer) {
+  buildBuffer(buffer) {
     const nameProperty = this.get('nameProperty');
     const none = this.get('none');
 
@@ -48,11 +49,11 @@ export default Ember.Component.extend({
 
   @observes('content.[]')
   _rerenderOnChange() {
-    this.rerender();
+    this.rerenderBuffer();
   },
 
-  @on('didInsertElement')
-  _initializeCombo() {
+  didInsertElement() {
+    this._super();
 
     // Workaround for https://github.com/emberjs/ember.js/issues/9813
     // Can be removed when fixed. Without it, the wrong option is selected
@@ -60,7 +61,7 @@ export default Ember.Component.extend({
 
     // observer for item names changing (optional)
     if (this.get('nameChanges')) {
-      this.addObserver('content.@each.' + this.get('nameProperty'), this.rerender);
+      this.addObserver('content.@each.' + this.get('nameProperty'), this.rerenderBuffer);
     }
 
     const $elem = this.$();
@@ -80,7 +81,11 @@ export default Ember.Component.extend({
       }
       this.set('value', val);
     });
-    $elem.trigger('change');
+    Ember.run.scheduleOnce('afterRender', this, this._triggerChange);
+  },
+
+  _triggerChange() {
+    this.$().trigger('change');
   },
 
   @on('willDestroyElement')
@@ -88,4 +93,4 @@ export default Ember.Component.extend({
     this.$().select2('destroy');
   }
 
-});
+}));
diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
new file mode 100644
index 0000000000..4873bfc778
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
@@ -0,0 +1,53 @@
+// Ember 2.0 removes buffered rendering, but we can still implement it ourselves.
+// In the long term we'll want to remove this.
+
+const Mixin = {
+  __bufferTimeout: null,
+
+  _customRender() {
+    Ember.run.cancel(this.__bufferTimeout);
+    if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+
+    const buffer = [];
+    this.buildBuffer(buffer);
+    this.element.innerHTML = buffer.join('');
+  },
+
+  rerenderBuffer() {
+    Ember.run.scheduleOnce('render', this, this._customRender);
+  }
+};
+
+export function bufferedRender(obj) {
+
+  if (!obj.buildBuffer) {
+    Ember.warn('Missing `buildBuffer` method');
+    return obj;
+  }
+
+  const caller = {};
+
+  // True in 1.13 or greater
+  if (Ember.Helper) {
+    caller.didRender = function() {
+      this._super();
+      this._customRender();
+    };
+  } else {
+    caller.didInsertElement = function() {
+      this._super();
+      this._customRender();
+    };
+  }
+
+  const triggers = obj.rerenderTriggers;
+  if (triggers) {
+    caller.init = function() {
+      this._super();
+      triggers.forEach(k => this.addObserver(k, this.rerenderBuffer));
+    };
+  }
+  delete obj.rerenderTriggers;
+
+  return Ember.Mixin.create(Mixin, caller, obj);
+}
diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
index 45c065124c..dbff7e1186 100644
--- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -3,8 +3,9 @@ import { get } from 'discourse-common/lib/raw-handlebars';
 // `Ember.Helper` is only available in versions after 1.12
 export function htmlHelper(fn) {
   if (Ember.Helper) {
-    return Ember.Helper.helper(function() {
-      return new Handlebars.SafeString(fn.apply(this, Array.prototype.slice.call(arguments)) || '');
+    return Ember.Helper.helper(function(...args) {
+      args = (args.length > 1) ? args[0].concat({ hash: args[args.length-1] }) : args;
+      return new Handlebars.SafeString(fn.apply(this, args) || '');
     });
   } else {
     return Ember.Handlebars.makeBoundHelper(function() {
@@ -13,8 +14,24 @@ export function htmlHelper(fn) {
   }
 }
 
+const _helpers = {};
+
 export function registerHelper(name, fn) {
-  Ember.HTMLBars._registerHelper(name, fn);
+  if (Ember.Helper) {
+    _helpers[name] = Ember.Helper.helper(fn);
+  } else {
+    return Ember.HTMLBars._registerHelper(name, fn);
+  }
+}
+
+export function findHelper(name) {
+  return _helpers[name] || _helpers[name.dasherize()];
+}
+
+export function registerHelpers(registry) {
+  Object.keys(_helpers).forEach(name => {
+    registry.register(`helper:${name}`, _helpers[name], { singleton: false });
+  });
 }
 
 function resolveParams(ctx, options) {
@@ -39,6 +56,7 @@ function resolveParams(ctx, options) {
 }
 
 export function registerUnbound(name, fn) {
+
   const func = function(property, options) {
     if (options.types && (options.types[0] === "ID" || options.types[0] === "PathExpression")) {
       property = get(this, property, options);
@@ -47,6 +65,14 @@ export function registerUnbound(name, fn) {
     return fn.call(this, property, resolveParams(this, options));
   };
 
+  if (Ember.Helper) {
+    _helpers[name] = Ember.Helper.extend({
+      compute: (params, args) => fn(params[0], args)
+    });
+    Handlebars.registerHelper(name, func);
+    return;
+  }
+
   Handlebars.registerHelper(name, func);
   Ember.Handlebars.registerHelper(name, func);
 }
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index 34222872df..15c099cc28 100644
--- a/app/assets/javascripts/discourse-common/resolver.js.es6
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -1,5 +1,6 @@
-/* global requirejs, require */
+import { findHelper } from 'discourse-common/lib/helpers';
 
+/* global requirejs, require */
 var classify = Ember.String.classify;
 var get = Ember.get;
 
@@ -109,7 +110,9 @@ export function buildResolver(baseName) {
     },
 
     resolveHelper(parsedName) {
-      return this.customResolve(parsedName) || this._super(parsedName);
+      return findHelper(parsedName.fullNameWithoutType) ||
+             this.customResolve(parsedName) ||
+             this._super(parsedName);
     },
 
     resolveController(parsedName) {
@@ -178,6 +181,7 @@ export function buildResolver(baseName) {
       return this._super(parsedName) ||
              templates[slashedType] ||
              templates[withoutType] ||
+             templates[withoutType.replace(/\.raw$/, '')] ||
              templates[dashed] ||
              templates[decamelized.replace(/\./, '/')] ||
              templates[decamelized.replace(/\_/, '/')] ||
diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index 523b0ee225..cbbc0bf9cf 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -135,15 +135,6 @@ const Discourse = Ember.Application.extend({
         }
       });
     });
-
-    const utils = require('discourse/lib/utilities');
-    Discourse.Utilities = {};
-    Object.keys(utils).forEach(function(k) {
-      Discourse.Utilities[k] = function() {
-        Ember.warn('Discourse.Utilities is deprecated. Import it as a module');
-        return utils[k].apply(utils, arguments);
-      };
-    });
   },
 
   @computed('currentAssetVersion', 'desiredAssetVersion')
diff --git a/app/assets/javascripts/discourse/components/activity-filter.js.es6 b/app/assets/javascripts/discourse/components/activity-filter.js.es6
deleted file mode 100644
index c0cf5b4e4e..0000000000
--- a/app/assets/javascripts/discourse/components/activity-filter.js.es6
+++ /dev/null
@@ -1,66 +0,0 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
-import UserAction from "discourse/models/user-action";
-
-export default Ember.Component.extend(StringBuffer, {
-  tagName: 'li',
-  classNameBindings: ['active', 'noGlyph'],
-
-  rerenderTriggers: ['content.count', 'count'],
-  noGlyph: Em.computed.empty('icon'),
-
-  isIndexStream: function() {
-    return !this.get('content');
-  }.property('content.count'),
-
-  active: function() {
-    if (this.get('isIndexStream')) {
-      return !this.get('userActionType');
-    }
-    const content = this.get('content');
-    if (content) {
-      return parseInt(this.get('userActionType'), 10) === parseInt(Em.get(content, 'action_type'), 10);
-    }
-  }.property('userActionType', 'isIndexStream'),
-
-  activityCount: function() {
-    return this.get('content.count') || this.get('count') || 0;
-  }.property('content.count', 'count'),
-
-  typeKey: function() {
-    const actionType = this.get('content.action_type');
-    if (actionType === UserAction.TYPES.messages_received) { return ""; }
-
-    const result = UserAction.TYPES_INVERTED[actionType];
-    if (!result) { return ""; }
-
-    // We like our URLS to have hyphens, not underscores
-    return "/" + result.replace("_", "-");
-  }.property('content.action_type'),
-
-  url: function() {
-    return "/users/" + this.get('user.username_lower') + "/activity" + this.get('typeKey');
-  }.property('typeKey', 'user.username_lower'),
-
-  description: function() {
-    return this.get('content.description') || I18n.t("user.filters.all");
-  }.property('content.description'),
-
-  renderString(buffer) {
-    buffer.push("<a href='" + this.get('url') + "'>");
-    const icon = this.get('icon');
-    if (icon) {
-      buffer.push("<i class='glyph fa fa-" + icon + "'></i> ");
-    }
-    buffer.push(this.get('description') + " <span class='count'>(" + this.get('activityCount') + ")</span></a>");
-  },
-
-  icon: function() {
-    switch(parseInt(this.get('content.action_type'), 10)) {
-      case UserAction.TYPES.likes_received: return "heart";
-      case UserAction.TYPES.bookmarks: return "bookmark";
-      case UserAction.TYPES.edits: return "pencil";
-      case UserAction.TYPES.replies: return "reply";
-      case UserAction.TYPES.mentions: return "at";
-    }
-  }.property("content.action_type")
-});
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index 75c4d370c0..d7cdc32744 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -47,12 +47,10 @@ export default Ember.Component.extend({
           target = target.find('a');
         }
 
-        const topic = this.get('topics').findProperty('id', parseInt(topicId));
+        const topic = this.get('topics').findBy('id', parseInt(topicId));
         this.sendAction('postsAction', {topic, position: target.offset()});
       }
       return false;
     }
-
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
index 6841e8e456..28a06d7000 100644
--- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
+++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
@@ -35,9 +35,4 @@ export default Ember.Component.extend({
     });
   }.property('firstCategory', 'hideSubcategories'),
 
-  render(buffer) {
-    if (this.get('hidden')) { return; }
-    this._super(buffer);
-  }
-
 });
diff --git a/app/assets/javascripts/discourse/components/check-mark.js.es6 b/app/assets/javascripts/discourse/components/check-mark.js.es6
index a934a490a4..34585e1a0f 100644
--- a/app/assets/javascripts/discourse/components/check-mark.js.es6
+++ b/app/assets/javascripts/discourse/components/check-mark.js.es6
@@ -7,10 +7,5 @@ export default Ember.Component.extend({
   @computed('checked')
   status(checked) {
     return checked ? 'status-checked' : 'status-unchecked';
-  },
-
-  render(buffer) {
-    const icon = this.get('checked') ? 'check' : 'times';
-    buffer.push(`<i class='fa fa-${icon}'></i>`);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6 b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
new file mode 100644
index 0000000000..78f444a1c1
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
@@ -0,0 +1,27 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: 'button',
+  attributeBindings: ['style', 'title'],
+  classNameBindings: [':colorpicker', 'isUsed:used-color:unused-color'],
+
+  @computed('color', 'usedColors')
+  isUsed(color, usedColors) {
+    return (usedColors || []).indexOf(color.toUpperCase()) >= 0;
+  },
+
+  @computed('isUsed')
+  title(isUsed) {
+    return isUsed ? I18n.t("category.already_used") : null;
+  },
+
+  @computed('color')
+  style(color) {
+    return `background-color: #${color};`.htmlSafe();
+  },
+
+  click(e) {
+    e.preventDefault();
+    this.sendAction('selectColor', this.get('color'));
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/color-picker.js.es6 b/app/assets/javascripts/discourse/components/color-picker.js.es6
index d1acf7d811..30c95f9ca2 100644
--- a/app/assets/javascripts/discourse/components/color-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/color-picker.js.es6
@@ -1,30 +1,9 @@
-import DiscourseContainerView from 'discourse/views/container';
-
-export default DiscourseContainerView.extend({
+export default Ember.Component.extend({
   classNames: 'colors-container',
 
-  _createButtons: function() {
-    var colors = this.get('colors'),
-        isUsed, usedColors = this.get('usedColors') || [];
-
-    if (!colors) return;
-
-    var self = this;
-    colors.forEach(function(color) {
-      isUsed = usedColors.indexOf(color.toUpperCase()) >= 0;
-
-      self.attachViewWithArgs({
-        tagName: 'button',
-        attributeBindings: ['style', 'title'],
-        classNames: ['colorpicker'].concat( isUsed ? ['used-color'] : ['unused-color'] ),
-        style: ('background-color: #' + color + ';').htmlSafe(),
-        title: isUsed ? I18n.t("category.already_used") : null,
-        click: function() {
-          self.set("value", color);
-          return false;
-        }
-      });
-
-    });
-  }.on('init')
+  actions: {
+    selectColor(color) {
+      this.set('value', color);
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index f16acd43b9..6503e051c2 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -2,7 +2,7 @@ import userSearch from 'discourse/lib/user-search';
 import { default as computed, on } from 'ember-addons/ember-computed-decorators';
 import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions';
 import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags';
-import { fetchUnseenTagHashtags, linkSeenTagHashtags } from 'discourse/lib/link-tag-hashtag';
+import { linkSeenTagHashtags, fetchUnseenTagHashtags } from 'discourse/lib/link-tag-hashtag';
 import { load } from 'pretty-text/oneboxer';
 import { ajax } from 'discourse/lib/ajax';
 import InputValidation from 'discourse/models/input-validation';
@@ -41,22 +41,6 @@ export default Ember.Component.extend({
     return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview');
   },
 
-  _renderUnseenTagHashtags($preview, unseen) {
-    fetchUnseenTagHashtags(unseen).then(() => {
-      linkSeenTagHashtags($preview);
-    });
-  },
-
-  @on('previewRefreshed')
-  paintTagHashtags($preview) {
-    if (!this.siteSettings.tagging_enabled) { return; }
-
-    const unseenTagHashtags = linkSeenTagHashtags($preview);
-    if (unseenTagHashtags.length) {
-      Ember.run.debounce(this, this._renderUnseenTagHashtags, $preview, unseenTagHashtags, 500);
-    }
-  },
-
   @computed
   markdownOptions() {
     return {
@@ -66,7 +50,7 @@ export default Ember.Component.extend({
 
         const posts = topic.get('postStream.posts');
         if (posts && topicId === topic.get('id')) {
-          const quotedPost = posts.findProperty("post_number", postNumber);
+          const quotedPost = posts.findBy("post_number", postNumber);
           if (quotedPost) {
             return tinyAvatar(quotedPost.get('avatar_template'));
           }
@@ -152,19 +136,38 @@ export default Ember.Component.extend({
     $preview.scrollTop(desired + 50);
   },
 
-  _renderUnseenMentions: function($preview, unseen) {
-    fetchUnseenMentions($preview, unseen).then(() => {
+  _renderUnseenMentions($preview, unseen) {
+    fetchUnseenMentions(unseen).then(() => {
       linkSeenMentions($preview, this.siteSettings);
       this._warnMentionedGroups($preview);
     });
   },
 
-  _renderUnseenCategoryHashtags: function($preview, unseen) {
+  _renderUnseenCategoryHashtags($preview, unseen) {
     fetchUnseenCategoryHashtags(unseen).then(() => {
       linkSeenCategoryHashtags($preview);
     });
   },
 
+  _renderUnseenTagHashtags($preview, unseen) {
+    fetchUnseenTagHashtags(unseen).then(() => {
+      linkSeenTagHashtags($preview);
+    });
+  },
+
+  _loadOneboxes($oneboxes) {
+    const post = this.get('composer.post');
+    let refresh = false;
+
+    // If we are editing a post, we'll refresh its contents once.
+    if (post && !post.get('refreshedPost')) {
+      refresh = true;
+      post.set('refreshedPost', true);
+    }
+
+    $oneboxes.each((_, o) => load(o, refresh, ajax));
+  },
+
   _warnMentionedGroups($preview) {
     Ember.run.scheduleOnce('afterRender', () => {
       this._warnedMentions = this._warnedMentions || [];
@@ -481,31 +484,33 @@ export default Ember.Component.extend({
 
     previewUpdated($preview) {
       // Paint mentions
-      const unseen = linkSeenMentions($preview, this.siteSettings);
-      if (unseen.length) {
-        Ember.run.debounce(this, this._renderUnseenMentions, $preview, unseen, 500);
+      const unseenMentions = linkSeenMentions($preview, this.siteSettings);
+      if (unseenMentions.length) {
+        Ember.run.debounce(this, this._renderUnseenMentions, $preview, unseenMentions, 450);
       }
 
       this._warnMentionedGroups($preview);
 
       // Paint category hashtags
-      const unseenHashtags = linkSeenCategoryHashtags($preview);
-      if (unseenHashtags.length) {
-        Ember.run.debounce(this, this._renderUnseenCategoryHashtags, $preview, unseenHashtags, 500);
+      const unseenCategoryHashtags = linkSeenCategoryHashtags($preview);
+      if (unseenCategoryHashtags.length) {
+        Ember.run.debounce(this, this._renderUnseenCategoryHashtags, $preview, unseenCategoryHashtags, 450);
       }
 
-      const post = this.get('composer.post');
-      let refresh = false;
-
-      // If we are editing a post, we'll refresh its contents once. This is a feature that
-      // allows a user to refresh its contents once.
-      if (post && !post.get('refreshedPost')) {
-        refresh = true;
-        post.set('refreshedPost', true);
+      // Paint tag hashtags
+      if (this.siteSettings.tagging_enabled) {
+        const unseenTagHashtags = linkSeenTagHashtags($preview);
+        if (unseenTagHashtags.length) {
+          Ember.run.debounce(this, this._renderUnseenTagHashtags, $preview, unseenTagHashtags, 450);
+        }
       }
 
       // Paint oneboxes
-      $('a.onebox', $preview).each((i, e) => load(e, refresh, ajax));
+      const $oneboxes = $('a.onebox', $preview);
+      if ($oneboxes.length > 0 && $oneboxes.length <= this.siteSettings.max_oneboxes_per_post) {
+        Ember.run.debounce(this, this._loadOneboxes, $oneboxes, 450);
+      }
+
       this.trigger('previewRefreshed', $preview);
       this.sendAction('afterRefresh', $preview);
     },
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 52d1da32a6..59b3586dd3 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -15,12 +15,12 @@ export default Ember.Component.extend({
 
   didInsertElement() {
     this._super();
-    this.reset();
     this.appEvents.on('composer:typed-reply', this, this._typedReply);
     this.appEvents.on('composer:opened', this, this._findMessages);
     this.appEvents.on('composer:find-similar', this, this._findSimilar);
     this.appEvents.on('composer-messages:close', this, this._closeTop);
     this.appEvents.on('composer-messages:create', this, this._create);
+    Ember.run.scheduleOnce('afterRender', this, this.reset);
   },
 
   willDestroyElement() {
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
index 49e2eefca1..c248ea5b95 100644
--- a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
+++ b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
@@ -1,19 +1,10 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
 export default Ember.Component.extend({
   classNameBindings: ['containerClass', 'condition:visible'],
 
-  containerClass: function() {
-    return this.get('size') === 'small' ? 'inline-spinner' : undefined;
-  }.property('size'),
-
-  render: function(buffer) {
-    if (this.get('condition')) {
-      buffer.push('<div class="spinner ' + this.get('size') + '"}}></div>');
-    } else {
-      return this._super(buffer);
-    }
-  },
-
-  _conditionChanged: function() {
-    this.rerender();
-  }.observes('condition')
+  @computed('size')
+  containerClass(size) {
+    return size === 'small' ? 'inline-spinner' : undefined;
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/count-i18n.js.es6 b/app/assets/javascripts/discourse/components/count-i18n.js.es6
index 28c908be23..0197b6bb76 100644
--- a/app/assets/javascripts/discourse/components/count-i18n.js.es6
+++ b/app/assets/javascripts/discourse/components/count-i18n.js.es6
@@ -1,8 +1,10 @@
-export default Ember.Component.extend(Discourse.StringBuffer, {
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
+export default Ember.Component.extend(bufferedRender({
   tagName: 'span',
   rerenderTriggers: ['count', 'suffix'],
 
-  renderString: function(buffer) {
+  buildBuffer(buffer) {
     buffer.push(I18n.t(this.get('key') + (this.get('suffix') || ''), { count: this.get('count') }));
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index 66e393ba71..bd606facaf 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -1,7 +1,9 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
+  // subclasses need this
+  layoutName: 'components/d-button',
+
   tagName: 'button',
   classNameBindings: [':btn', 'noText'],
   attributeBindings: ['disabled', 'translatedTitle:title'],
@@ -18,24 +20,6 @@ export default Ember.Component.extend({
     if (label) return I18n.t(label);
   },
 
-  @observes('icon')
-  iconChanged() {
-    this.rerender();
-  },
-
-  render(buffer) {
-    const label = this.get('translatedLabel'),
-          icon = this.get('icon');
-
-    if (label || icon) {
-      if (icon) { buffer.push(iconHTML(icon) + ' '); }
-      if (label) { buffer.push(label); }
-    } else {
-      // If no label or icon is present, yield
-      return this._super(buffer);
-    }
-  },
-
   click() {
     this.sendAction("action", this.get("actionParam"));
     return false;
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 8367599743..322959422f 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -123,7 +123,7 @@ class Toolbar {
   }
 
   addButton(button) {
-    const g = this.groups.findProperty('group', button.group);
+    const g = this.groups.findBy('group', button.group);
     if (!g) {
       throw `Couldn't find toolbar group ${button.group}`;
     }
@@ -201,18 +201,23 @@ export default Ember.Component.extend({
     return null;
   },
 
-  @on('didInsertElement')
-  _startUp() {
+  _readyNow() {
+    this.set('ready', true);
+  },
+
+  didInsertElement() {
+    this._super();
+
     const container = this.get('container'),
           $editorInput = this.$('.d-editor-input');
 
     this._applyEmojiAutocomplete(container, $editorInput);
     this._applyCategoryHashtagAutocomplete(container, $editorInput);
 
-    this.set('ready', true);
+
+    Ember.run.scheduleOnce('afterRender', this, this._readyNow);
 
     const mouseTrap = Mousetrap(this.$('.d-editor-input')[0]);
-
     const shortcuts = this.get('toolbar.shortcuts');
     Object.keys(shortcuts).forEach(sc => {
       const button = shortcuts[sc];
@@ -232,7 +237,6 @@ export default Ember.Component.extend({
 
     this.appEvents.on('composer:insert-text', text => this._addText(this._getSelected(), text));
     this.appEvents.on('composer:replace-text', (oldVal, newVal) => this._replaceText(oldVal, newVal));
-
     this._mouseTrap = mouseTrap;
   },
 
@@ -267,7 +271,6 @@ export default Ember.Component.extend({
       if (this._state !== "inDOM") { return; }
       const $preview = this.$('.d-editor-preview');
       if ($preview.length === 0) return;
-
       this.sendAction('previewUpdated', $preview);
     });
   },
diff --git a/app/assets/javascripts/discourse/components/d-link.js.es6 b/app/assets/javascripts/discourse/components/d-link.js.es6
deleted file mode 100644
index 1c94bdc823..0000000000
--- a/app/assets/javascripts/discourse/components/d-link.js.es6
+++ /dev/null
@@ -1,69 +0,0 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-import interceptClick from 'discourse/lib/intercept-click';
-
-export default Ember.Component.extend({
-  tagName: 'a',
-  classNames: ['d-link'],
-  attributeBindings: ['translatedTitle:title', 'translatedTitle:aria-title', 'href'],
-
-  @computed('path')
-  href(path) {
-    if (path) { return path; }
-
-    const route = this.get('route');
-    if (route) {
-      const router = this.container.lookup('router:main');
-      if (router && router.router) {
-        const params = [route];
-        const model = this.get('model');
-        if (model) {
-          params.push(model);
-        }
-
-        return Discourse.getURL(router.router.generate.apply(router.router, params));
-      }
-    }
-
-    return '';
-  },
-
-  @computed("title")
-  translatedTitle(title) {
-    if (title) return I18n.t(title);
-  },
-
-  click(e) {
-    const action = this.get('action');
-    if (action) {
-      this.sendAction('action');
-      return false;
-    }
-
-    return interceptClick(e);
-  },
-
-  render(buffer) {
-    if (!!this.get('template')) {
-      return this._super(buffer);
-    }
-
-    const icon = this.get('icon');
-    if (icon) {
-      buffer.push(iconHTML(icon));
-    }
-
-    const label = this.get('label');
-    if (label) {
-      if (icon) { buffer.push(" "); }
-
-      if (this.get('translateLabel') === "false") {
-        buffer.push(label);
-      } else {
-        const count = this.get('count');
-        buffer.push(I18n.t(label, { count }));
-      }
-    }
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
index 168db163c5..3f55ec0543 100644
--- a/app/assets/javascripts/discourse/components/directory-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
@@ -1,7 +1,7 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
 import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   tagName: 'th',
   classNames: ['sortable'],
   attributeBindings: ['title'],
@@ -12,8 +12,7 @@ export default Ember.Component.extend(StringBuffer, {
     return I18n.t(labelKey + '_long', { defaultValue: I18n.t(labelKey) });
   }.property('field'),
 
-  renderString(buffer) {
-
+  buildBuffer(buffer) {
     const icon = this.get('icon');
     if (icon) {
       buffer.push(iconHTML(icon));
@@ -37,4 +36,4 @@ export default Ember.Component.extend(StringBuffer, {
       this.setProperties({ order: field, asc: null });
     }
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js.es6 b/app/assets/javascripts/discourse/components/discourse-banner.js.es6
index 56374168e6..40db3dce8a 100644
--- a/app/assets/javascripts/discourse/components/discourse-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-banner.js.es6
@@ -1,6 +1,4 @@
-import VisibleComponent from "discourse/components/visible";
-
-export default VisibleComponent.extend({
+export default Ember.Component.extend({
 
   visible: function () {
     var bannerKey = this.get("banner.key"),
@@ -14,7 +12,7 @@ export default VisibleComponent.extend({
   }.property("user.dismissed_banner_key", "banner.key", "hide"),
 
   actions: {
-    dismiss: function () {
+    dismiss() {
       if (this.get("user")) {
         this.get("user").dismissBanner(this.get("banner.key"));
       } else {
diff --git a/app/assets/javascripts/discourse/components/dropdown-button.js.es6 b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
index 0037ec17f2..032c80e2af 100644
--- a/app/assets/javascripts/discourse/components/dropdown-button.js.es6
+++ b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
@@ -1,6 +1,6 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   classNameBindings: [':btn-group', 'hidden'],
   rerenderTriggers: ['text', 'longDescription'],
 
@@ -23,7 +23,7 @@ export default Ember.Component.extend(StringBuffer, {
     this.$().off('click.dropdown-button', 'ul li');
   }.on('willDestroyElement'),
 
-  renderString(buffer) {
+  buildBuffer(buffer) {
     const title = this.get('title');
     if (title) {
       buffer.push("<h4 class='title'>" + title + "</h4>");
@@ -56,4 +56,4 @@ export default Ember.Component.extend(StringBuffer, {
       buffer.push("</p>");
     }
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
index 049157609e..41a4d2b20f 100644
--- a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
@@ -1,7 +1,25 @@
 import { setting } from 'discourse/lib/computed';
 import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default buildCategoryPanel('settings', {
   emailInEnabled: setting('email_in'),
   showPositionInput: setting('fixed_category_positions'),
+
+  isDefaultSortOrder: Em.computed.empty('category.sort_order'),
+
+  @computed
+  availableSorts() {
+    return ['likes', 'op_likes', 'views', 'posts', 'activity', 'posters', 'category', 'created']
+      .map(s => ({ name: I18n.t('category.sort_options.' + s), value: s }))
+      .sort((a,b) => { return a.name > b.name; });
+  },
+
+  @computed
+  sortAscendingOptions() {
+    return [
+      {name: I18n.t('category.sort_ascending'),  value: 'true'},
+      {name: I18n.t('category.sort_descending'), value: 'false'}
+    ];
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index 9e47066067..556e072ea1 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -14,9 +14,14 @@ export default Em.Component.extend({
     return I18n.t('category.' + this.get('tab').replace('-', '_'));
   }.property('tab'),
 
+  didInsertElement() {
+    this._super();
+    Ember.run.scheduleOnce('afterRender', this, this._addToCollection);
+  },
+
   _addToCollection: function() {
     this.get('panels').addObject(this.get('tabClassName'));
-  }.on('didInsertElement'),
+  },
 
   actions: {
     select: function() {
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index bd45e777a4..0b291384c6 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,12 +1,12 @@
 import { on } from 'ember-addons/ember-computed-decorators';
-import StringBuffer from 'discourse/mixins/string-buffer';
 import { iconHTML } from 'discourse-common/helpers/fa-icon';
 import LogsNotice from 'discourse/services/logs-notice';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['site.isReadOnly'],
 
-  renderString: function(buffer) {
+  buildBuffer(buffer) {
     let notices = [];
 
     if (this.site.get("isReadOnly")) {
@@ -51,7 +51,7 @@ export default Ember.Component.extend(StringBuffer, {
   @on('didInsertElement')
   _setupLogsNotice() {
     LogsNotice.current().addObserver('hidden', () => {
-      this.rerenderString();
+      this.rerenderBuffer();
     });
 
     this.$().on('click.global-notice', '.alert-logs-notice .close', () => {
@@ -63,4 +63,4 @@ export default Ember.Component.extend(StringBuffer, {
   _teardownLogsNotice() {
     this.$().off('click.global-notice');
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 08359fa869..8e7d0420c6 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -6,7 +6,7 @@ export default Em.Component.extend(UploadMixin, {
 
   @computed('imageUrl')
   backgroundStyle(imageUrl) {
-    if (Em.isNone(imageUrl)) { return; }
+    if (Em.isNone(imageUrl)) { return "".htmlSafe(); }
     return `background-image: url(${imageUrl})`.htmlSafe();
   },
 
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index cb1bad446e..0178ad7cac 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -1,17 +1,17 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 import { iconHTML } from 'discourse-common/helpers/fa-icon';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   classNameBindings: [':tip', 'good', 'bad'],
   rerenderTriggers: ['validation'],
 
   bad: Em.computed.alias('validation.failed'),
   good: Em.computed.not('bad'),
 
-  renderString(buffer) {
+  buildBuffer(buffer) {
     const reason = this.get('validation.reason');
     if (reason) {
       buffer.push(iconHTML(this.get('good') ? 'check' : 'times') + ' ' + reason);
     }
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js.es6 b/app/assets/javascripts/discourse/components/login-reply-button.js.es6
new file mode 100644
index 0000000000..e162faf267
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/login-reply-button.js.es6
@@ -0,0 +1,7 @@
+import Button from 'discourse/components/d-button';
+
+export default Button.extend({
+  label: 'topic.reply.title',
+  icon: 'reply',
+  action: 'showLogin'
+});
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index 758e4a385c..62f6a37fde 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   tagName: 'li',
   classNameBindings: ['active', 'content.hasIcon:has-icon'],
   attributeBindings: ['title'],
@@ -26,7 +26,7 @@ export default Ember.Component.extend(StringBuffer, {
            filterMode.indexOf(contentFilterMode) === 0;
   },
 
-  renderString(buffer) {
+  buildBuffer(buffer) {
     const content = this.get('content');
     buffer.push("<a href='" + content.get('href') + "'>");
     if (content.get('hasIcon')) {
@@ -35,4 +35,4 @@ export default Ember.Component.extend(StringBuffer, {
     buffer.push(this.get('content.displayName'));
     buffer.push("</a>");
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
index 2c164ddf5e..59e5856db0 100644
--- a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
@@ -1,8 +1,8 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
 import { iconHTML } from 'discourse-common/helpers/fa-icon';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   classNameBindings: [':popup-tip', 'good', 'bad', 'lastShownAt::hide'],
   animateAttribute: null,
   bouncePixels: 6,
@@ -37,7 +37,7 @@ export default Ember.Component.extend(StringBuffer, {
     }
   },
 
-  renderString(buffer) {
+  buildBuffer(buffer) {
     const reason = this.get('validation.reason');
     if (!reason) { return; }
 
@@ -55,4 +55,4 @@ export default Ember.Component.extend(StringBuffer, {
       $elem.animate({ right: '-=' + this.bouncePixels }, this.bounceDelay).animate({ right: '+=' + this.bouncePixels }, this.bounceDelay);
     }
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/queued-post.js.es6 b/app/assets/javascripts/discourse/components/queued-post.js.es6
index 28f5a90fdd..9629724b43 100644
--- a/app/assets/javascripts/discourse/components/queued-post.js.es6
+++ b/app/assets/javascripts/discourse/components/queued-post.js.es6
@@ -13,7 +13,6 @@ function updateState(state, opts) {
 
     post.update(args).then(() => {
       this.sendAction('removePost', post);
-      // this.get('controllers.queued-posts.model').removeObject(post);
     }).catch(popupAjaxError);
   };
 }
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index 242bce46d5..b45f54b530 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -88,7 +88,6 @@ export default Em.Component.extend({
       return;
     }
 
-    this.findSearchTerms();
     this.setSearchedTermValue('searchedTerms.username', REGEXP_USERNAME_PREFIX);
     this.setSearchedTermValueForCategory();
     this.setSearchedTermValueForGroup();
@@ -117,11 +116,11 @@ export default Em.Component.extend({
         result.push(block);
     });
 
-    this.set('searchTermBlocks', result);
+    return result;
   },
 
   filterBlocks(regexPrefix) {
-    const blocks = this.get('searchTermBlocks');
+    const blocks = this.findSearchTerms();
     if (!blocks) return [];
 
     let result = [];
diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
index 8cfad3cd2a..f2f671e403 100644
--- a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
@@ -17,10 +17,6 @@ export default Ember.Component.extend({
     return "tag-" + this.get('tagId');
   }.property('tagId'),
 
-  render(buffer) {
-    buffer.push(Handlebars.Utils.escapeExpression(this.get('tagId')));
-  },
-
   click(e) {
     e.preventDefault();
     DiscourseURL.routeTo(this.get('href'));
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 73a4637bfd..4906ad1a50 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -1,12 +1,9 @@
 export default Ember.Component.extend({
-  _parse: function() {
+  didInsertElement() {
+    this._super();
     Ember.run.next(null, () => {
       this.$().find('hr').remove();
       this.$().ellipsis();
     });
-  }.on('didInsertElement'),
-
-  render(buffer) {
-    buffer.push(this.get('text'));
   }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-closing.js.es6 b/app/assets/javascripts/discourse/components/topic-closing.js.es6
index b92f774035..f4ab5748ce 100644
--- a/app/assets/javascripts/discourse/components/topic-closing.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-closing.js.es6
@@ -1,6 +1,6 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   elementId: 'topic-closing-info',
   delayedRerender: null,
 
@@ -9,7 +9,7 @@ export default Ember.Component.extend(StringBuffer, {
                      'topic.details.auto_close_based_on_last_post',
                      'topic.details.auto_close_hours'],
 
-  renderString(buffer) {
+  buildBuffer(buffer) {
     if (!!Ember.isEmpty(this.get('topic.details.auto_close_at'))) return;
     if (this.get("topic.closed")) return;
 
@@ -48,4 +48,4 @@ export default Ember.Component.extend(StringBuffer, {
       Em.run.cancel(this.get('delayedRerender'));
     }
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
index 1b41ae04dc..d9aad34dcc 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -1,23 +1,52 @@
-import ContainerView from 'discourse/views/container';
+import computed from 'ember-addons/ember-computed-decorators';
 
-export default ContainerView.extend({
+export default Ember.Component.extend({
   elementId: 'topic-footer-buttons',
 
+  // Allow us to extend it
+  layoutName: 'components/topic-footer-buttons',
+
   init() {
     this._super();
 
-    if (this.currentUser) {
-      const viewArgs = this.getProperties('topic', 'topicDelegated');
-      viewArgs.currentUser = this.currentUser;
+    this._actions = this._actions || {};
 
-      this.attachViewWithArgs(viewArgs, 'topic-footer-main-buttons');
-      this.attachViewWithArgs(viewArgs, 'pinned-button');
-      this.attachViewWithArgs(viewArgs, 'topic-notifications-button');
+    (this.get('topicDelegated') || []).forEach(m => {
+      this._actions[m] = function() {
+        this.sendAction(m);
+      };
+      this.set(m, m);
+    });
+  },
+
+  @computed('topic.details.can_invite_to')
+  canInviteTo(result) {
+    return !this.site.mobileView && result;
+  },
+
+  inviteDisabled: Ember.computed.or('topic.archived', 'topic.closed', 'topic.deleted'),
+
+  @computed
+  showAdminButton() {
+    return !this.site.mobileView && this.currentUser.get('canManageTopic');
+  },
+
+  @computed('topic.message_archived')
+  archiveIcon: archived => archived ? '' : 'folder',
+
+  @computed('topic.message_archived')
+  archiveTitle: archived => archived ? 'topic.move_to_inbox.help' : 'topic.archive_message.help',
+
+  @computed('topic.message_archived')
+  archiveLabel: archived => archived ? "topic.move_to_inbox.title" : "topic.archive_message.title",
+
+  @computed('topic.bookmarked')
+  bookmarkClass: bookmarked => bookmarked ? 'bookmark bookmarked' : 'bookmark',
+
+  @computed('topic.bookmarked')
+  bookmarkLabel: bookmarked => bookmarked ? 'bookmarked.clear_bookmarks' : 'bookmarked.title',
+
+  @computed('topic.bookmarked')
+  bookmarkTitle: bookmarked => bookmarked ? "bookmarked.help.unbookmark" : "bookmarked.help.bookmark",
 
-      this.trigger('additionalButtons', this);
-    } else {
-      // If not logged in give them a login control
-      this.attachViewClass('login-reply-button');
-    }
-  }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
index 413085aef8..3ed113419e 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
@@ -27,7 +27,7 @@ export default Combobox.extend({
     }
 
     this.comboTemplate = (item) => {
-      const contentItem = content.findProperty('id', item.id);
+      const contentItem = content.findBy('id', item.id);
       if (!contentItem) { return item.text; }
       return `${iconHTML(contentItem.icon)}&nbsp; ${item.text}`;
     };
@@ -59,7 +59,7 @@ export default Combobox.extend({
         refresh();
         break;
       case 'flag':
-        controller.send('showFlagTopic', topic);
+        controller.send('showFlagTopic');
         refresh();
         break;
     }
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 06f9b4bfa6..1fc7cf53a6 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -1,5 +1,5 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
 import computed from 'ember-addons/ember-computed-decorators';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export function showEntrance(e) {
   let target = $(e.target);
@@ -16,17 +16,23 @@ export function showEntrance(e) {
   }
 }
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['bulkSelectEnabled', 'topic.pinned'],
   tagName: 'tr',
-  rawTemplate: 'list/topic-list-item.raw',
   classNameBindings: [':topic-list-item', 'unboundClassNames'],
   attributeBindings: ['data-topic-id'],
   'data-topic-id': Em.computed.alias('topic.id'),
 
   actions: {
     toggleBookmark() {
-      this.get('topic').toggleBookmark().finally(() => this.rerender());
+      this.get('topic').toggleBookmark().finally(() => this.rerenderBuffer());
+    }
+  },
+
+  buildBuffer(buffer) {
+    const template = Discourse.__container__.lookup('template:list/topic-list-item.raw');
+    if (template) {
+      buffer.push(template(this));
     }
   },
 
@@ -142,4 +148,4 @@ export default Ember.Component.extend(StringBuffer, {
     }
   }.on('didInsertElement')
 
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 0f080e83af..522efc4346 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -32,7 +32,7 @@ export default Ember.Component.extend({
     return this.get('order') === "op_likes";
   }.property('order'),
 
-  @observes('topics.@each')
+  @observes('topics.[]')
   topicsAdded() {
     // special case so we don't keep scanning huge lists
     if (!this.get('lastVisitedTopic')) {
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index c7b28ca17c..1dd1e81216 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -5,6 +5,8 @@ export default Ember.Component.extend({
   info: Em.Object.create(),
 
   _checkSize() {
+    if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+
     let info = this.get('info');
 
     if (info.get('topicProgressExpanded')) {
@@ -47,7 +49,7 @@ export default Ember.Component.extend({
     if (this.get('info.topicProgressExpanded')) {
       $(window).on('click.hide-fullscreen', (e) => {
         if ( $(e.target).is('.topic-timeline') ||
-             !$(e.target).parents().is('.timeline-container, #topic-progress-wrapper')) {
+             !$(e.target).parents().is('#topic-progress-wrapper')) {
           this._collapseFullscreen();
         }
       });
@@ -110,7 +112,7 @@ export default Ember.Component.extend({
       $('#reply-control').on('div-resized.discourse-topic-navigation', () => this._checkSize());
     }
 
-    this._checkSize();
+    Ember.run.scheduleOnce('afterRender', this, this._checkSize);
   },
 
   willDestroyElement() {
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 333967ff5a..9eb07ade4f 100644
--- a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
@@ -1,4 +1,4 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 // Creates a link
 function link(buffer, prop, url, cssClass, i18nKey, text) {
@@ -7,15 +7,15 @@ function link(buffer, prop, url, cssClass, i18nKey, text) {
   buffer.push(`<a href="${url}" class="badge ${cssClass} badge-notification" title="${title}">${text || prop}</a>\n`);
 }
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   tagName: 'span',
   classNameBindings: [':topic-post-badges'],
   rerenderTriggers: ['url', 'unread', 'newPosts', 'unseen'],
 
-  renderString(buffer) {
+  buildBuffer(buffer) {
     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'));
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index 2fa076736f..5afba3db76 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -1,8 +1,8 @@
 import { iconHTML } from 'discourse-common/helpers/fa-icon';
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 import { escapeExpression } from 'discourse/lib/utilities';
 
-export default Ember.Component.extend(StringBuffer, {
+export default Ember.Component.extend(bufferedRender({
   classNames: ['topic-statuses'],
 
   rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'],
@@ -26,7 +26,7 @@ export default Ember.Component.extend(StringBuffer, {
     return Discourse.User.current() && !this.get('disableActions');
   }.property('disableActions'),
 
-  renderString(buffer) {
+  buildBuffer(buffer) {
     const self = this;
 
     const renderIcon = function(name, key, actionable) {
@@ -57,4 +57,4 @@ export default Ember.Component.extend(StringBuffer, {
     renderIconIf('topic.unpinned', 'thumb-tack', 'unpinned', this.get("canAct"));
     renderIconIf('topic.invisible', 'eye-slash', 'invisible');
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/components/visible.js.es6 b/app/assets/javascripts/discourse/components/visible.js.es6
deleted file mode 100644
index f9570e412e..0000000000
--- a/app/assets/javascripts/discourse/components/visible.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-export default Ember.Component.extend({
-  visibleChanged: function(){
-    this.rerender();
-  }.observes("visible"),
-
-  render: function(buffer){
-    if (this._state !== 'inDOM' && this._state !== 'preRender' && this._state !== 'inBuffer') { return; }
-    if (!this.get("visible")) { return; }
-
-    return this._super(buffer);
-  }
-});
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index 086e353c07..f7f79f14c4 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -5,7 +5,7 @@ export default Ember.Controller.extend({
   queryParams: ['username'],
   noMoreBadges: false,
   userBadges: null,
-  needs: ["application"],
+  application: Ember.inject.controller(),
 
   @computed('username')
   user(username) {
@@ -55,7 +55,7 @@ export default Ember.Controller.extend({
 
   @observes('canLoadMore')
   _showFooter() {
-    this.set("controllers.application.showFooter", !this.get("canLoadMore"));
+    this.set("application.showFooter", !this.get("canLoadMore"));
   }
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
index d4a3ebbd2a..cd0cf9c11b 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -3,7 +3,7 @@ import { topicLevels } from 'discourse/lib/notification-levels';
 
 // Support for changing the notification level of various topics
 export default Ember.Controller.extend({
-  needs: ['topic-bulk-actions'],
+  topicBulkActions: Ember.inject.controller(),
   notificationLevelId: null,
 
   @computed
@@ -21,7 +21,7 @@ export default Ember.Controller.extend({
 
   actions: {
     changeNotificationLevel() {
-      this.get('controllers.topic-bulk-actions').performAndRefresh({
+      this.get('topicBulkActions').performAndRefresh({
         type: 'change_notification_level',
         notification_level_id: this.get('notificationLevelId')
       });
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 532b21a0bb..84c323b88a 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -4,9 +4,7 @@ import DiscourseURL from 'discourse/lib/url';
 
 // Modal related to changing the ownership of posts
 export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
-  needs: ['topic'],
-
-  topicController: Em.computed.alias('controllers.topic'),
+  topicController: Ember.inject.controller('topic'),
   selectedPosts: Em.computed.alias('topicController.selectedPosts'),
   saving: false,
   new_user: null,
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index 1cd859cfa6..c24cf785c9 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -4,9 +4,8 @@ import DiscourseURL from 'discourse/lib/url';
 
 // Modal related to changing the timestamp of posts
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ['topic'],
 
-  topicController: Em.computed.alias('controllers.topic'),
+  topicController: Ember.inject.controller('topic'),
   saving: false,
   date: '',
   time: '',
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index c04063ed1b..30a5c7af93 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -51,7 +51,9 @@ export function addPopupMenuOptionsCallback(callback) {
 }
 
 export default Ember.Controller.extend({
-  needs: ['modal', 'topic', 'application'],
+  topicController: Ember.inject.controller('topic'),
+  application: Ember.inject.controller(),
+
   replyAsNewTopicDraft: Em.computed.equal('model.draftKey', Composer.REPLY_AS_NEW_TOPIC_KEY),
   checkedMessages: false,
   messageCount: null,
@@ -102,7 +104,7 @@ export default Ember.Controller.extend({
     }
   }),
 
-  topicModel: Ember.computed.alias('controllers.topic.model'),
+  topicModel: Ember.computed.alias('topicController.model'),
 
   @computed('model.canEditTitle', 'model.creatingPrivateMessage')
   canEditTags(canEditTitle, creatingPrivateMessage) {
@@ -484,7 +486,7 @@ export default Ember.Controller.extend({
       self.appEvents.one('composer:will-open', () => bootbox.alert(error));
     });
 
-    if (this.get('controllers.application.currentRouteName').split('.')[0] === 'topic' &&
+    if (this.get('application.currentRouteName').split('.')[0] === 'topic' &&
         composer.get('topic.id') === this.get('topicModel.id')) {
       staged = composer.get('stagedPost');
     }
@@ -616,10 +618,10 @@ export default Ember.Controller.extend({
       let category;
 
       if (!splitCategory[1]) {
-        category = this.site.get('categories').findProperty('nameLower', splitCategory[0].toLowerCase());
+        category = this.site.get('categories').findBy('nameLower', splitCategory[0].toLowerCase());
       } else {
         const categories = Discourse.Category.list();
-        const mainCategory = categories.findProperty('nameLower', splitCategory[0].toLowerCase());
+        const mainCategory = categories.findBy('nameLower', splitCategory[0].toLowerCase());
         category = categories.find(function(item) {
           return item && item.get('nameLower') === splitCategory[1].toLowerCase() && item.get('parent_category_id') === mainCategory.id;
         });
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 9bed6142a4..3135eb0f95 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -7,7 +7,7 @@ import { emailValid } from 'discourse/lib/utilities';
 import InputValidation from 'discourse/models/input-validation';
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ['login'],
+  login: Ember.inject.controller(),
 
   uniqueUsernameValidation: null,
   globalNicknameExists: false,
@@ -56,7 +56,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
     // Validate required fields
     let userFields = this.get('userFields');
-    if (userFields) { userFields = userFields.filterProperty('field.required'); }
+    if (userFields) { userFields = userFields.filterBy('field.required'); }
     if (!Ember.isEmpty(userFields)) {
       const anyEmpty = userFields.any(function(uf) {
         const val = uf.get('value');
@@ -345,7 +345,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   actions: {
     externalLogin(provider) {
-      this.get('controllers.login').send('externalLogin', provider);
+      this.get('login').send('externalLogin', provider);
     },
 
     createAccount() {
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
index 5ac8d4b733..91fd948990 100644
--- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
@@ -1,5 +1,5 @@
 // Just add query params here to have them automatically passed to topic list filters.
-export var queryParams = {
+export const queryParams = {
   order: { replace: true, refreshModel: true },
   ascending: { replace: true, refreshModel: true },
   status: { replace: true, refreshModel: true },
@@ -10,12 +10,12 @@ export var queryParams = {
 };
 
 // Basic controller options
-var controllerOpts = {
-  needs: ['discovery/topics'],
+const controllerOpts = {
+  discoveryTopics: Ember.inject.controller('discovery/topics'),
   queryParams: Object.keys(queryParams),
 };
 
 // Aliases for the values
-controllerOpts.queryParams.forEach(p => controllerOpts[p] = Em.computed.alias(`controllers.discovery/topics.${p}`));
+controllerOpts.queryParams.forEach(p => controllerOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`));
 
 export default Ember.Controller.extend(controllerOpts);
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 2be7bfd206..79128e82ad 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,16 +1,19 @@
 import DiscourseURL from 'discourse/lib/url';
 
 export default Ember.Controller.extend({
-  needs: ['navigation/category', 'discovery/topics', 'application'],
+  discoveryTopics: Ember.inject.controller('discovery/topics'),
+  navigationCategory: Ember.inject.controller('navigation/category'),
+  application: Ember.inject.controller(),
+
   loading: false,
 
-  category: Em.computed.alias('controllers.navigation/category.category'),
-  noSubcategories: Em.computed.alias('controllers.navigation/category.noSubcategories'),
+  category: Em.computed.alias('navigationCategory.category'),
+  noSubcategories: Em.computed.alias('navigationCategory.noSubcategories'),
 
-  loadedAllItems: Em.computed.not("controllers.discovery/topics.model.canLoadMore"),
+  loadedAllItems: Em.computed.not("discoveryTopics.model.canLoadMore"),
 
   _showFooter: function() {
-    this.set("controllers.application.showFooter", this.get("loadedAllItems"));
+    this.set("application.showFooter", this.get("loadedAllItems"));
   }.observes("loadedAllItems"),
 
   showMoreUrl(period) {
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index 2202a0793e..5b435b8d9a 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -2,7 +2,7 @@ import computed from 'ember-addons/ember-computed-decorators';
 import DiscoveryController from 'discourse/controllers/discovery';
 
 export default DiscoveryController.extend({
-  needs: ['modal', 'discovery'],
+  discovery: Ember.inject.controller(),
 
   // this makes sure the composer isn't scoping to a specific category
   category: null,
@@ -20,7 +20,10 @@ export default DiscoveryController.extend({
   @computed("model.parentCategory")
   categoryPageStyle(parentCategory) {
     const style = this.siteSettings.desktop_category_page_style;
-    return parentCategory && style === "categories_and_latest_topics" ? "categories_only" : style;
+    const componentName = (parentCategory && style === "categories_and_latest_topics") ?
+                          "categories_only" :
+                          style;
+    return Ember.String.dasherize(componentName);
   }
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 008ab29a3b..4c92f6da87 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -5,13 +5,14 @@ import { endWith } from 'discourse/lib/computed';
 import showModal from 'discourse/lib/show-modal';
 
 const controllerOpts = {
-  needs: ['discovery'],
+  discovery: Ember.inject.controller(),
+  discoveryTopics: Ember.inject.controller('discovery/topics'),
+
   period: null,
 
-  canStar: Em.computed.alias('controllers.discovery/topics.currentUser.id'),
-  showTopicPostBadges: Em.computed.not('controllers.discovery/topics.new'),
-
-  redirectedReason: Em.computed.alias('currentUser.redirected_to_top.reason'),
+  canStar: Ember.computed.alias('currentUser.id'),
+  showTopicPostBadges: Ember.computed.not('discoveryTopics.new'),
+  redirectedReason: Ember.computed.alias('currentUser.redirected_to_top.reason'),
 
   order: 'default',
   ascending: false,
@@ -46,12 +47,12 @@ const controllerOpts = {
       this.setProperties({ order: "default", ascending: false });
 
       // Don't refresh if we're still loading
-      if (this.get('controllers.discovery.loading')) { return; }
+      if (this.get('discovery.loading')) { return; }
 
       // If we `send('loading')` here, due to returning true it bubbles up to the
       // router and ember throws an error due to missing `handlerInfos`.
       // Lesson learned: Don't call `loading` yourself.
-      this.set('controllers.discovery.loading', true);
+      this.set('discovery.loading', true);
 
       this.store.findFiltered('topicList', {filter}).then(list => {
         const TopicList = require('discourse/models/topic-list').default;
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
index d77783bc0a..cdc773d592 100644
--- a/app/assets/javascripts/discourse/controllers/edit-category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
@@ -20,9 +20,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   changeSize: function() {
     if (!Ember.isEmpty(this.get('model.description'))) {
-      this.set('controllers.modal.modalClass', 'edit-category-modal full');
+      this.set('modal.modalClass', 'edit-category-modal full');
     } else {
-      this.set('controllers.modal.modalClass', 'edit-category-modal small');
+      this.set('modal.modalClass', 'edit-category-modal small');
     }
   }.observes('model.description'),
 
@@ -34,7 +34,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
   }.property('model.id', 'model.name'),
 
   titleChanged: function() {
-    this.set('controllers.modal.title', this.get('title'));
+    this.set('modal.title', this.get('title'));
   }.observes('title'),
 
   disabled: function() {
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
index bb195b636b..997f2a0888 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
@@ -5,7 +5,7 @@ import computed from 'ember-addons/ember-computed-decorators';
 import InputValidation from 'discourse/models/input-validation';
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ["topic"],
+  topicController: Ember.inject.controller('topic'),
 
   loading: true,
   pinnedInCategoryCount: 0,
@@ -106,7 +106,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
   },
 
   _forwardAction(name) {
-    this.get("controllers.topic").send(name);
+    this.get("topicController").send(name);
     this.send("closeModal");
   },
 
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index a5119b383e..760390d3d4 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -20,7 +20,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       let flagsAvailable = this.get('model.flagsAvailable');
 
       // "message user" option should be at the top
-      const notifyUserIndex = flagsAvailable.indexOf(flagsAvailable.filterProperty('name_key', 'notify_user')[0]);
+      const notifyUserIndex = flagsAvailable.indexOf(flagsAvailable.filterBy('name_key', 'notify_user')[0]);
       if (notifyUserIndex !== -1) {
         const notifyUser = flagsAvailable[notifyUserIndex];
         flagsAvailable.splice(notifyUserIndex, 1);
@@ -93,7 +93,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       let postAction; // an instance of ActionSummary
 
       if (!this.get('flagTopic')) {
-        postAction = this.get('model.actions_summary').findProperty('id', this.get('selected.id'));
+        postAction = this.get('model.actions_summary').findBy('id', this.get('selected.id'));
       } else {
         postAction = this.get('topicActionByName.' + this.get('selected.name_key'));
       }
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 d699866126..91e5b907d2 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -14,7 +14,7 @@ const SortOrders = [
 ];
 
 export default Ember.Controller.extend({
-  needs: ["application"],
+  application: Ember.inject.controller(),
   bulkSelectEnabled: null,
 
   loading: Em.computed.not("model"),
@@ -131,7 +131,7 @@ export default Ember.Controller.extend({
 
   @observes('loading')
   _showFooter() {
-    this.set("controllers.application.showFooter", !this.get("loading"));
+    this.set("application.showFooter", !this.get("loading"));
   },
 
   @computed('hasResults')
diff --git a/app/assets/javascripts/discourse/controllers/group-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-posts.js.es6
index c9e791c1f1..c2434c83c6 100644
--- a/app/assets/javascripts/discourse/controllers/group-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-posts.js.es6
@@ -1,19 +1,18 @@
 import { fmt } from 'discourse/lib/computed';
 
-export default Ember.ArrayController.extend({
-  needs: ['group'],
+export default Ember.Controller.extend({
+  group: Ember.inject.controller(),
   loading: false,
   emptyText: fmt('type', 'groups.empty.%@'),
 
   actions: {
     loadMore() {
-
       if (this.get('loading')) { return; }
       this.set('loading', true);
       const posts = this.get('model');
       if (posts && posts.length) {
         const beforePostId = posts[posts.length-1].get('id');
-        const group = this.get('controllers.group.model');
+        const group = this.get('group.model');
 
         const opts = { beforePostId, type: this.get('type') };
         group.findPosts(opts).then(newPosts => {
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index cd4c6afec3..03d848e6a2 100644
--- a/app/assets/javascripts/discourse/controllers/invite.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invite.js.es6
@@ -2,7 +2,7 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import { emailValid } from 'discourse/lib/utilities';
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ['user-invited-show'],
+  userInvitedShow: Ember.inject.controller('user-invited-show'),
 
   // If this isn't defined, it will proxy to the user model on the preferences
   // page which is wrong.
@@ -169,7 +169,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       if (this.get('disabled')) { return; }
 
       const groupNames = this.get('model.groupNames'),
-            userInvitedController = this.get('controllers.user-invited-show'),
+            userInvitedController = this.get('userInvitedShow'),
             model = this.get('model');
 
       model.setProperties({ saving: true, error: false });
@@ -215,7 +215,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       if (this.get('disabled')) { return; }
 
       const groupNames = this.get('model.groupNames'),
-            userInvitedController = this.get('controllers.user-invited-show'),
+            userInvitedController = this.get('userInvitedShow'),
             model = this.get('model');
 
       var topicId = null;
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
index 5e0414bcd0..7a50811e57 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
@@ -1,9 +1,7 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ['modal'],
-
-  onShow: function() {
-    this.set('controllers.modal.modalClass', 'keyboard-shortcuts-modal');
+  onShow() {
+    this.set('modal.modalClass', 'keyboard-shortcuts-modal');
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 8909993cca..1996e723b6 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -11,13 +11,17 @@ const AuthErrors =
    'not_allowed_from_ip_address'];
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ['modal', 'createAccount', 'forgotPassword', 'application'],
+
+  createAccount: Ember.inject.controller(),
+  forgotPassword: Ember.inject.controller(),
+  application: Ember.inject.controller(),
+
   authenticate: null,
   loggingIn: false,
   loggedIn: false,
 
   canLoginLocal: setting('enable_local_logins'),
-  loginRequired: Em.computed.alias('controllers.application.loginRequired'),
+  loginRequired: Em.computed.alias('application.loginRequired'),
 
   resetForm: function() {
     this.set('authenticate', null);
@@ -37,7 +41,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
   loginDisabled: Em.computed.or('loggingIn', 'loggedIn'),
 
   showSignupLink: function() {
-    return this.get('controllers.application.canSignUp') &&
+    return this.get('application.canSignUp') &&
            !this.get('loggingIn') &&
            Ember.isEmpty(this.get('authenticate'));
   }.property('loggingIn', 'authenticate'),
@@ -160,7 +164,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     },
 
     createAccount: function() {
-      const createAccountController = this.get('controllers.createAccount');
+      const createAccountController = this.get('createAccount');
       if (createAccountController) {
         createAccountController.resetForm();
         const loginName = this.get('loginName');
@@ -174,7 +178,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     },
 
     forgotPassword: function() {
-      const forgotPasswordController = this.get('controllers.forgotPassword');
+      const forgotPasswordController = this.get('forgotPassword');
       if (forgotPasswordController) { forgotPasswordController.set("accountEmailOrUsername", this.get("loginName")); }
       this.send("showForgotPassword");
     }
@@ -182,7 +186,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   authMessage: (function() {
     if (Ember.isEmpty(this.get('authenticate'))) return "";
-    const method = findAll(this.siteSettings, this.capabilities, this.isMobileDevice).findProperty("name", this.get("authenticate"));
+    const method = findAll(this.siteSettings, this.capabilities, this.isMobileDevice).findBy("name", this.get("authenticate"));
     if(method){
       return method.get('message');
     }
@@ -229,7 +233,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       return;
     }
 
-    const createAccountController = this.get('controllers.createAccount');
+    const createAccountController = this.get('createAccount');
     createAccountController.setProperties({
       accountEmail: options.email,
       accountUsername: options.username,
diff --git a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6 b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
index 197c9fcb37..34bfa8ba34 100644
--- a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
@@ -5,12 +5,11 @@ import DiscourseURL from 'discourse/lib/url';
 
 // Modal related to merging of topics
 export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
-  needs: ['topic'],
+  topicController: Ember.inject.controller('topic'),
 
   saving: false,
   selectedTopicId: null,
 
-  topicController: Em.computed.alias('controllers.topic'),
   selectedPosts: Em.computed.alias('topicController.selectedPosts'),
   selectedReplies: Em.computed.alias('topicController.selectedReplies'),
   allPostsSelected: Em.computed.alias('topicController.allPostsSelected'),
@@ -26,7 +25,7 @@ export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
   }.property('saving'),
 
   onShow() {
-    this.set('controllers.modal.modalClass', 'split-modal');
+    this.set('modal.modalClass', 'split-modal');
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 1d23c1fb2b..93ae014e47 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,7 +1,8 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
-  needs: ['discovery', 'discovery/topics'],
+  discovery: Ember.inject.controller(),
+  discoveryTopics: Ember.inject.controller('discovery/topics'),
 
   @computed()
   categories() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index b94d993ed1..4e96336563 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -25,7 +25,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
 
       // Staff can edit fields that are not `editable`
       if (!this.get('currentUser.staff')) {
-        siteUserFields = siteUserFields.filterProperty('editable', true);
+        siteUserFields = siteUserFields.filterBy('editable', true);
       }
       return siteUserFields.sortBy('position').map(function(field) {
         const value = userFields ? userFields[field.get('id').toString()] : null;
@@ -79,7 +79,8 @@ export default Ember.Controller.extend(CanCheckEmails, {
   mailingListModeOptions() {
     return [
       {name: I18n.t('user.mailing_list_mode.daily'), value: 0},
-      {name: this.get('frequencyEstimate'), value: 1}
+      {name: this.get('frequencyEstimate'), value: 1},
+      {name: I18n.t('user.mailing_list_mode.individual_no_echo'), value: 2}
     ];
   },
 
diff --git a/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
index b71660d17f..f2c543e6be 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
@@ -1,27 +1,26 @@
 import { ajax } from 'discourse/lib/ajax';
 import BadgeSelectController from "discourse/mixins/badge-select-controller";
 
-export default Ember.ArrayController.extend(BadgeSelectController, {
+export default Ember.Controller.extend(BadgeSelectController, {
 
   filteredList: function() {
     return this.get('model').filterBy('badge.allow_title', true);
   }.property('model'),
 
   actions: {
-    save: function() {
+    save() {
       this.setProperties({ saved: false, saving: true });
 
-      var self = this;
       ajax(this.get('user.path') + "/preferences/badge_title", {
         type: "PUT",
-        data: { user_badge_id: self.get('selectedUserBadgeId') }
-      }).then(function() {
-        self.setProperties({
+        data: { user_badge_id: this.get('selectedUserBadgeId') }
+      }).then(() => {
+        this.setProperties({
           saved: true,
           saving: false,
-          "user.title": self.get('selectedUserBadge.badge.name')
+          "user.title": this.get('selectedUserBadge.badge.name')
         });
-      }, function() {
+      }, () => {
         bootbox.alert(I18n.t('generic_error'));
       });
     }
diff --git a/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6
index d0c42fb558..9f820f9647 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6
@@ -1,7 +1,7 @@
 import { ajax } from 'discourse/lib/ajax';
 import BadgeSelectController from "discourse/mixins/badge-select-controller";
 
-export default Ember.ArrayController.extend(BadgeSelectController, {
+export default Ember.Controller.extend(BadgeSelectController, {
   filteredList: function() {
     return this.get('model').filter(function(b) {
       return !Ember.isEmpty(b.get('badge.image'));
@@ -12,18 +12,17 @@ export default Ember.ArrayController.extend(BadgeSelectController, {
     save: function() {
       this.setProperties({ saved: false, saving: true });
 
-      var self = this;
       ajax(this.get('user.path') + "/preferences/card-badge", {
         type: "PUT",
-        data: { user_badge_id: self.get('selectedUserBadgeId') }
-      }).then(function() {
-        self.setProperties({
+        data: { user_badge_id: this.get('selectedUserBadgeId') }
+      }).then(() => {
+        this.setProperties({
           saved: true,
           saving: false,
-          "user.card_image_badge": self.get('selectedUserBadge.badge.image')
+          "user.card_image_badge": this.get('selectedUserBadge.badge.image')
         });
-      }).catch(function() {
-        self.set('saving', false);
+      }).catch(() => {
+        this.set('saving', false);
         bootbox.alert(I18n.t('generic_error'));
       });
     }
diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
index f3e0447a7f..d91712542e 100644
--- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
@@ -3,13 +3,14 @@ import computed from 'ember-addons/ember-computed-decorators';
 import { selectedText } from 'discourse/lib/utilities';
 
 export default Ember.Controller.extend({
-  needs: ['topic', 'composer'],
+  topic: Ember.inject.controller(),
+  composer: Ember.inject.controller(),
 
   @computed('buffer', 'postId')
   post(buffer, postId) {
     if (!postId || Ember.isEmpty(buffer)) { return null; }
 
-    const postStream = this.get('controllers.topic.model.postStream');
+    const postStream = this.get('topic.model.postStream');
     const post = postStream.findLoadedPost(postId);
 
     return post;
@@ -22,7 +23,7 @@ export default Ember.Controller.extend({
     if (!this.currentUser) return;
 
     // don't display the "quote-reply" button if we can't reply
-    const topicDetails = this.get('controllers.topic.model.details');
+    const topicDetails = this.get('topic.model.details');
     if (!(topicDetails.get('can_reply_as_new_topic') || topicDetails.get('can_create_post'))) {
       return;
     }
@@ -106,7 +107,7 @@ export default Ember.Controller.extend({
 
     // defer load if needed, if in an expanded replies section
     if (!post) {
-      const postStream = this.get('controllers.topic.model.postStream');
+      const postStream = this.get('topic.model.postStream');
       return postStream.loadPost(postId).then(p => {
         this.set('post', p);
         return this.quoteText();
@@ -114,12 +115,12 @@ export default Ember.Controller.extend({
     }
 
     // If we can't create a post, delegate to reply as new topic
-    if (!this.get('controllers.topic.model.details.can_create_post')) {
-      this.get('controllers.topic').send('replyAsNewTopic', post);
+    if (!this.get('topic.model.details.can_create_post')) {
+      this.get('topic').send('replyAsNewTopic', post);
       return;
     }
 
-    const composerController = this.get('controllers.composer');
+    const composerController = this.get('composer');
     const composerOpts = {
       action: Composer.REPLY,
       draftKey: post.get('topic.draft_key')
diff --git a/app/assets/javascripts/discourse/controllers/search-help.js.es6 b/app/assets/javascripts/discourse/controllers/search-help.js.es6
index 7f5958ae4d..0d5bb50104 100644
--- a/app/assets/javascripts/discourse/controllers/search-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/search-help.js.es6
@@ -1,8 +1,6 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  needs: ['modal'],
-
   showGoogleSearch: function() {
     return !Discourse.SiteSettings.login_required;
   }.property()
diff --git a/app/assets/javascripts/discourse/controllers/share.js.es6 b/app/assets/javascripts/discourse/controllers/share.js.es6
index 97f1fb4d26..00dc536364 100644
--- a/app/assets/javascripts/discourse/controllers/share.js.es6
+++ b/app/assets/javascripts/discourse/controllers/share.js.es6
@@ -3,10 +3,10 @@ import { longDateNoYear } from 'discourse/lib/formatter';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend({
-  needs: ['topic'],
+  topic: Ember.inject.controller(),
 
-  title: Ember.computed.alias('controllers.topic.model.title'),
-  canReplyAsNewTopic: Ember.computed.alias('controllers.topic.model.details.can_reply_as_new_topic'),
+  title: Ember.computed.alias('topic.model.title'),
+  canReplyAsNewTopic: Ember.computed.alias('topic.model.details.can_reply_as_new_topic'),
 
   @computed('type', 'postNumber')
   shareTitle(type, postNumber) {
@@ -31,7 +31,7 @@ export default Ember.Controller.extend({
     },
 
     replyAsNewTopic() {
-      const topicController = this.get("controllers.topic");
+      const topicController = this.get("topic");
       const postStream = topicController.get("model.postStream");
       const postId = this.get("postId") || postStream.findPostIdForPostNumber(1);
       const post = postStream.findLoadedPost(postId);
diff --git a/app/assets/javascripts/discourse/controllers/split-topic.js.es6 b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
index b8a1a72509..c8ea321570 100644
--- a/app/assets/javascripts/discourse/controllers/split-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
@@ -6,12 +6,11 @@ import DiscourseURL from 'discourse/lib/url';
 
 // Modal related to auto closing of topics
 export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
-  needs: ['topic'],
   topicName: null,
   saving: false,
   categoryId: null,
 
-  topicController: Em.computed.alias('controllers.topic'),
+  topicController: Ember.inject.controller('topic'),
   selectedPosts: Em.computed.alias('topicController.selectedPosts'),
   selectedReplies: Em.computed.alias('topicController.selectedReplies'),
   allPostsSelected: Em.computed.alias('topicController.allPostsSelected'),
@@ -28,7 +27,7 @@ export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
 
   onShow() {
     this.setProperties({
-      'controllers.modal.modalClass': 'split-modal',
+      'modal.modalClass': 'split-modal',
       saving: false,
       categoryId: null,
       topicName: ''
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 5b87c64c71..2c31b962c7 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -2,13 +2,13 @@ import { ajax } from 'discourse/lib/ajax';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend({
-  needs: ['application'],
+  application: Ember.inject.controller(),
 
   showLoginButton: Em.computed.equal("model.path", "login"),
 
   @computed("model.path")
   showSignupButton() {
-    return this.get("model.path") === "login" && this.get('controllers.application.canSignUp');
+    return this.get("model.path") === "login" && this.get('application.canSignUp');
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
index 1eca5728ab..d575844cad 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Controller.extend({
-  needs: ['tagGroups'],
+  tagGroups: Ember.inject.controller(),
 
   actions: {
     save() {
@@ -7,17 +7,16 @@ export default Ember.Controller.extend({
     },
 
     destroy() {
-      const self = this;
       return bootbox.confirm(
         I18n.t("tagging.groups.confirm_delete"),
         I18n.t("no_value"),
         I18n.t("yes_value"),
-        function(destroy) {
+        destroy => {
           if (destroy) {
-            const c = self.controllerFor('tagGroups');
-            return self.get('model').destroy().then(function() {
-              c.removeObject(self.get('model'));
-              self.transitionToRoute('tagGroups');
+            const c = this.get('tagGroups.model');
+            return this.get('model').destroy().then(() => {
+              c.removeObject(this.get('model'));
+              this.transitionToRoute('tagGroups');
             });
           }
         }
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
index 4e52a8ce47..d4785f36aa 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
@@ -1,6 +1,6 @@
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
   actions: {
-    selectTagGroup: function(tagGroup) {
+    selectTagGroup(tagGroup) {
       if (this.get('selectedItem')) { this.get('selectedItem').set('selected', false); }
       this.set('selectedItem', tagGroup);
       tagGroup.set('selected', true);
@@ -8,10 +8,10 @@ export default Ember.ArrayController.extend({
       this.transitionToRoute('tagGroups.show', tagGroup);
     },
 
-    newTagGroup: function() {
+    newTagGroup() {
       const newTagGroup = this.store.createRecord('tag-group');
       newTagGroup.set('name', I18n.t('tagging.groups.new_name'));
-      this.pushObject(newTagGroup);
+      this.get('model').pushObject(newTagGroup);
       this.send('selectTagGroup', newTagGroup);
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index f80b98c6c7..0e8e15db50 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -40,7 +40,7 @@ if (customNavItemHref) {
 
 
 export default Ember.Controller.extend(BulkTopicSelection, {
-  needs: ["application"],
+  application: Ember.inject.controller(),
 
   tag: null,
   additionalTags: null,
@@ -81,7 +81,7 @@ export default Ember.Controller.extend(BulkTopicSelection, {
   },
 
   _showFooter: function() {
-    this.set("controllers.application.showFooter", !this.get("list.canLoadMore"));
+    this.set("application.showFooter", !this.get("list.canLoadMore"));
   }.observes("list.canLoadMore"),
 
   footerMessage: function() {
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
index e1c710115c..d378084e8a 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
@@ -17,14 +17,14 @@ addBulkButton('unlistTopics', 'unlist_topics');
 addBulkButton('showTagTopics', 'change_tags');
 
 // Modal for performing bulk actions on topics
-export default Ember.ArrayController.extend(ModalFunctionality, {
+export default Ember.Controller.extend(ModalFunctionality, {
   tags: null,
   buttonRows: null,
 
   emptyTags: Ember.computed.empty('tags'),
 
   onShow() {
-    this.set('controllers.modal.modalClass', 'topic-bulk-actions-modal small');
+    this.set('modal.modalClass', 'topic-bulk-actions-modal small');
 
     const buttonRows = [];
     let row = [];
@@ -86,7 +86,7 @@ export default Ember.ArrayController.extend(ModalFunctionality, {
 
     showChangeCategory() {
       this.send('changeBulkTemplate', 'modal/bulk_change_category');
-      this.set('controllers.modal.modalClass', 'topic-bulk-actions-modal full');
+      this.set('modal.modalClass', 'topic-bulk-actions-modal full');
     },
 
     showNotificationLevel() {
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index cf634b9832..787196c4a0 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -11,7 +11,10 @@ import { categoryBadgeHTML } from 'discourse/helpers/category-link';
 import Post from 'discourse/models/post';
 
 export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
-  needs: ['modal', 'composer', 'quote-button', 'application'],
+  composer: Ember.inject.controller(),
+  quoteButton: Ember.inject.controller('quote-button'),
+  application: Ember.inject.controller(),
+
   multiSelect: false,
   allPostsSelected: false,
   editingTopic: false,
@@ -24,6 +27,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
   retrying: false,
   userTriggeredProgress: null,
   _progressIndex: null,
+  hasScrolled: null,
 
   topicDelegated: [
     'toggleMultiSelect',
@@ -39,9 +43,14 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     'convertToPrivateMessage',
     'jumpTop',
     'jumpToPost',
+    'jumpToPostPrompt',
     'jumpToIndex',
     'jumpBottom',
-    'replyToPost'
+    'replyToPost',
+    'toggleArchiveMessage',
+    'showInvite',
+    'toggleBookmark',
+    'showFlagTopic'
   ],
 
   _titleChanged: function() {
@@ -265,24 +274,26 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
       this.deleteTopic();
     },
 
-    archiveMessage() {
+    // Archive a PM (as opposed to archiving a topic)
+    toggleArchiveMessage() {
       const topic = this.get('model');
-      topic.archiveMessage().then(()=>{
-        this.gotoInbox(topic.get("inboxGroupName"));
-      });
-    },
+      if (topic.get('archiving')) { return; }
 
-    moveToInbox() {
-      const topic = this.get('model');
-      topic.moveToInbox().then(()=>{
-        this.gotoInbox(topic.get("inboxGroupName"));
-      });
+      if (topic.get('message_archived')) {
+        topic.moveToInbox().then(()=>{
+          this.gotoInbox(topic.get("inboxGroupName"));
+        });
+      } else {
+        topic.archiveMessage().then(()=>{
+          this.gotoInbox(topic.get("inboxGroupName"));
+        });
+      }
     },
 
     // Post related methods
     replyToPost(post) {
-      const composerController = this.get('controllers.composer'),
-          quoteController = this.get('controllers.quote-button'),
+      const composerController = this.get('composer'),
+          quoteController = this.get('quoteButton'),
           quotedText = Quote.build(quoteController.get('post'), quoteController.get('buffer')),
           topic = post ? post.get('topic') : this.get('model');
 
@@ -379,7 +390,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
         return false;
       }
 
-      const composer = this.get('controllers.composer'),
+      const composer = this.get('composer'),
             composerModel = composer.get('model'),
             opts = {
               post: post,
@@ -415,6 +426,14 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
       this._jumpToPostId(this.get('model.postStream.stream')[index-1]);
     },
 
+    jumpToPostPrompt() {
+      const postText = prompt(I18n.t('topic.progress.jump_prompt_long'));
+      if (postText === null) { return; }
+      const postNumber = parseInt(postText, 10);
+      if (postNumber === 0) { return; }
+      this._jumpToPostId(this.get('model.postStream').findPostIdForPostNumber(postNumber));
+    },
+
     jumpToPost(postNumber) {
       this._jumpToPostId(this.get('model.postStream').findPostIdForPostNumber(postNumber));
     },
@@ -601,8 +620,8 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     },
 
     replyAsNewTopic(post) {
-      const composerController = this.get('controllers.composer');
-      const quoteController = this.get('controllers.quote-button');
+      const composerController = this.get('composer');
+      const quoteController = this.get('quoteButton');
       post = post || quoteController.get('post');
       const quotedText = Quote.build(post, quoteController.get('buffer'));
 
@@ -761,7 +780,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     const selectedReplies = this.get('selectedReplies');
     selectedReplies.removeObject(post);
 
-    const selectedReply = selectedReplies.findProperty('post_number', post.get('reply_to_post_number'));
+    const selectedReply = selectedReplies.findBy('post_number', post.get('reply_to_post_number'));
     if (selectedReply) { selectedReplies.removeObject(selectedReply); }
 
     this.set('allPostsSelected', false);
@@ -770,7 +789,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
   postSelected(post) {
     if (this.get('allPostsSelected')) { return true; }
     if (this.get('selectedPosts').contains(post)) { return true; }
-    if (this.get('selectedReplies').findProperty('post_number', post.get('reply_to_post_number'))) { return true; }
+    if (this.get('selectedReplies').findBy('post_number', post.get('reply_to_post_number'))) { return true; }
 
     return false;
   },
@@ -904,7 +923,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
 
   _showFooter: function() {
     const showFooter = this.get("model.postStream.loaded") && this.get("model.postStream.loadedAllPosts");
-    this.set("controllers.application.showFooter", showFooter);
+    this.set("application.showFooter", showFooter);
   }.observes("model.postStream.{loaded,loadedAllPosts}")
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/upload-customization.js.es6 b/app/assets/javascripts/discourse/controllers/upload-customization.js.es6
index d7a980a0b4..ae7575887a 100644
--- a/app/assets/javascripts/discourse/controllers/upload-customization.js.es6
+++ b/app/assets/javascripts/discourse/controllers/upload-customization.js.es6
@@ -2,7 +2,7 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
 
 export default Ember.Controller.extend(ModalFunctionality, {
   notReady: Em.computed.not('ready'),
-  needs: ['adminCustomizeCssHtml'],
+  adminCustomizeCssHtml: Ember.inject.controller(),
 
   ready: function() {
     try {
@@ -22,7 +22,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       delete object.id;
       delete object.key;
 
-      const controller = this.get('controllers.adminCustomizeCssHtml');
+      const controller = this.get('adminCustomizeCssHtml');
       controller.send('newCustomization', object);
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 55ab7846ca..b899408f42 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,11 +1,13 @@
 import { exportUserArchive } from 'discourse/lib/export-csv';
 
 export default Ember.Controller.extend({
+  application: Ember.inject.controller(),
+  user: Ember.inject.controller(),
+
   userActionType: null,
-  needs: ["application", "user"],
-  currentPath: Em.computed.alias('controllers.application.currentPath'),
-  viewingSelf: Em.computed.alias("controllers.user.viewingSelf"),
-  showBookmarks: Em.computed.alias("controllers.user.showBookmarks"),
+  currentPath: Ember.computed.alias('application.currentPath'),
+  viewingSelf: Ember.computed.alias("user.viewingSelf"),
+  showBookmarks: Ember.computed.alias("user.showBookmarks"),
 
   _showFooter: function() {
     var showFooter;
@@ -15,7 +17,7 @@ export default Ember.Controller.extend({
     } else {
       showFooter = this.get("model.statsCountNonPM") <= this.get("model.stream.itemsLoaded");
     }
-    this.set("controllers.application.showFooter", showFooter);
+    this.set("application.showFooter", showFooter);
   }.observes("userActionType", "model.stream.itemsLoaded"),
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
index 76b2a05cd9..3089a07377 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,20 +1,6 @@
-export default Ember.ArrayController.extend({
-  needs: ["user"],
-  user: Em.computed.alias("controllers.user.model"),
-  sortProperties: ['badge.badge_type.sort_order', 'badge.name'],
-  orderBy: function(ub1, ub2){
-    var sr1 = ub1.get('badge.badge_type.sort_order');
-    var sr2 = ub2.get('badge.badge_type.sort_order');
-
-
-    if(sr1 > sr2) {
-      return -1;
-    }
-
-    if(sr2 > sr1) {
-      return 1;
-    }
-
-    return ub1.get('badge.name') < ub2.get('badge.name') ? -1 : 1;
-  }
+export default Ember.Controller.extend({
+  user: Ember.inject.controller(),
+  username: Ember.computed.alias('user.model.username_lower'),
+  sortedBadges: Ember.computed.sort('model', 'badgeSortOrder'),
+  badgeSortOrder: ['badge.badge_type.sort_order', 'badge.name'],
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index 377ffb97a8..f7d7da11ad 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -3,7 +3,9 @@ import { propertyNotEqual, setting } from 'discourse/lib/computed';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend({
-  needs: ['topic', 'application'],
+  topic: Ember.inject.controller(),
+  application: Ember.inject.controller(),
+
   visible: false,
   user: null,
   username: null,
@@ -15,10 +17,10 @@ export default Ember.Controller.extend({
   // If inside a topic
   topicPostCount: null,
 
-  postStream: Em.computed.alias('controllers.topic.model.postStream'),
+  postStream: Em.computed.alias('topic.model.postStream'),
   enoughPostsForFiltering: Em.computed.gte('topicPostCount', 2),
-  viewingTopic: Em.computed.match('controllers.application.currentPath', /^topic\./),
-  viewingAdmin: Em.computed.match('controllers.application.currentPath', /^admin\./),
+  viewingTopic: Em.computed.match('application.currentPath', /^topic\./),
+  viewingAdmin: Em.computed.match('application.currentPath', /^admin\./),
   showFilter: Em.computed.and('viewingTopic', 'postStream.hasNoFilters', 'enoughPostsForFiltering'),
   showName: propertyNotEqual('user.name', 'user.username'),
   hasUserFilters: Em.computed.gt('postStream.userFilters.length', 0),
@@ -39,7 +41,7 @@ export default Ember.Controller.extend({
     const siteUserFields = this.site.get('user_fields');
     if (!Ember.isEmpty(siteUserFields)) {
       const userFields = this.get('user.user_fields');
-      return siteUserFields.filterProperty('show_on_user_card', true).sortBy('position').map(field => {
+      return siteUserFields.filterBy('show_on_user_card', true).sortBy('position').map(field => {
         Ember.set(field, 'dasherized_name', field.get('name').dasherize());
         const value = userFields ? userFields[field.get('id')] : null;
         return Ember.isEmpty(value) ? null : Ember.Object.create({ value, field });
@@ -97,7 +99,7 @@ export default Ember.Controller.extend({
     this.setProperties({ username, userLoading: username, cardTarget: target, post });
 
     const args = { stats: false };
-    args.include_post_count_for = this.get('controllers.topic.model.id');
+    args.include_post_count_for = this.get('topic.model.id');
     args.skip_track_visit = true;
 
     return Discourse.User.findByUsername(username, args).then((user) => {
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
index c185d2c29a..44b25f1043 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,12 +1,12 @@
 import { ajax } from 'discourse/lib/ajax';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
 
-export default Ember.ArrayController.extend({
-  needs: ['application'],
+export default Ember.Controller.extend({
+  application: Ember.inject.controller(),
 
   @observes('model.canLoadMore')
   _showFooter() {
-    this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+    this.set("application.showFooter", !this.get("model.canLoadMore"));
   },
 
   @computed('model.content.length')
@@ -16,11 +16,9 @@ export default Ember.ArrayController.extend({
 
   @computed('model.content.@each.read')
   allNotificationsRead() {
-    return !this.get('model.content').some((notification) => !notification.get('read'));
+    return !this.get('model.content').some(notification => !notification.get('read'));
   },
 
-  currentPath: Em.computed.alias('controllers.application.currentPath'),
-
   actions: {
     resetNew() {
       ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
diff --git a/app/assets/javascripts/discourse/controllers/user-posts.js.es6 b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
index e06143db48..25c730d97a 100644
--- a/app/assets/javascripts/discourse/controllers/user-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-posts.js.es6
@@ -1,7 +1,7 @@
 export default Ember.Controller.extend({
-  needs: ["application"],
+  application: Ember.inject.controller(),
 
   _showFooter: function() {
-    this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+    this.set("application.showFooter", !this.get("model.canLoadMore"));
   }.observes("model.canLoadMore")
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index 18f010adcc..bb79db55d3 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -2,18 +2,21 @@ import computed from 'ember-addons/ember-computed-decorators';
 import Topic from 'discourse/models/topic';
 
 export default Ember.Controller.extend({
-  needs: ["application", "user-topics-list", "user"],
+  application: Ember.inject.controller(),
+  userTopicsList: Ember.inject.controller('user-topics-list'),
+  user: Ember.inject.controller(),
+
   pmView: false,
-  viewingSelf: Em.computed.alias('controllers.user.viewingSelf'),
+  viewingSelf: Em.computed.alias('user.viewingSelf'),
   isGroup: Em.computed.equal('pmView', 'groups'),
-  currentPath: Em.computed.alias('controllers.application.currentPath'),
-  selected: Em.computed.alias('controllers.user-topics-list.selected'),
-  bulkSelectEnabled: Em.computed.alias('controllers.user-topics-list.bulkSelectEnabled'),
+  currentPath: Em.computed.alias('application.currentPath'),
+  selected: Em.computed.alias('userTopicsList.selected'),
+  bulkSelectEnabled: Em.computed.alias('userTopicsList.bulkSelectEnabled'),
 
   showNewPM: function(){
-    return this.get('controllers.user.viewingSelf') &&
+    return this.get('user.viewingSelf') &&
            Discourse.User.currentProp('can_send_private_messages');
-  }.property('controllers.user.viewingSelf'),
+  }.property('user.viewingSelf'),
 
   @computed('selected.[]', 'bulkSelectEnabled')
   hasSelection(selected, bulkSelectEnabled){
@@ -39,7 +42,7 @@ export default Ember.Controller.extend({
     }
 
     Topic.bulkOperation(selected,params).then(() => {
-      const model = this.get('controllers.user-topics-list.model');
+      const model = this.get('userTopicsList.model');
       const topics = model.get('topics');
       topics.removeObjects(selected);
       selected.clear();
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index d41962d96c..c40014854c 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -6,8 +6,8 @@ const MAX_SUMMARY_RESULTS = 6;
 const MAX_BADGES = 6;
 
 export default Ember.Controller.extend({
-  needs: ['user'],
-  user: Ember.computed.alias('controllers.user.model'),
+  userController: Ember.inject.controller('user'),
+  user: Ember.computed.alias('userController.model'),
 
   @computed("model.topics.length")
   moreTopics(topicsLength) { return topicsLength >= MAX_SUMMARY_RESULTS; },
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
index e4d428a4f9..8e150fd289 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,11 +1,12 @@
 // Lists of topics on a user's page.
 export default Ember.Controller.extend({
-  needs: ["application", "user"],
+  application: Ember.inject.controller(),
+
   hideCategory: false,
   showPosters: false,
 
   _showFooter: function() {
-    this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+    this.set("application.showFooter", !this.get("model.canLoadMore"));
   }.observes("model.canLoadMore"),
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index b5151f1b33..95a89bc722 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -6,14 +6,20 @@ import User from 'discourse/models/user';
 export default Ember.Controller.extend(CanCheckEmails, {
   indexStream: false,
   userActionType: null,
-  needs: ['application','user-notifications', 'user-topics-list'],
-  currentPath: Em.computed.alias('controllers.application.currentPath'),
+  application: Ember.inject.controller(),
+  userNotifications: Ember.inject.controller('user-notifications'),
+  currentPath: Ember.computed.alias('application.currentPath'),
 
   @computed("content.username")
   viewingSelf(username) {
     return username === User.currentProp('username');
   },
 
+  @computed('model.profileBackground')
+  hasProfileBackground(background) {
+    return !Ember.isEmpty(background.toString());
+  },
+
   @computed('indexStream', 'viewingSelf', 'forceExpand')
   collapsedInfo(indexStream, viewingSelf, forceExpand){
     return (!indexStream || viewingSelf) && !forceExpand;
@@ -75,7 +81,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
     const siteUserFields = this.site.get('user_fields');
     if (!Ember.isEmpty(siteUserFields)) {
       const userFields = this.get('model.user_fields');
-      return siteUserFields.filterProperty('show_on_profile', true).sortBy('position').map(field => {
+      return siteUserFields.filterBy('show_on_profile', true).sortBy('position').map(field => {
         field.dasherized_name = field.get('name').dasherize();
         const value = userFields ? userFields[field.get('id').toString()] : null;
         return Ember.isEmpty(value) ? null : Ember.Object.create({ value, field });
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 8ad3eabcba..f5bb196302 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,7 +1,7 @@
 import debounce from 'discourse/lib/debounce';
 
 export default Ember.Controller.extend({
-  needs: ["application"],
+  application: Ember.inject.controller(),
   queryParams: ["period", "order", "asc", "name"],
   period: "weekly",
   order: "likes_received",
@@ -15,7 +15,7 @@ export default Ember.Controller.extend({
   }, 500).observes("nameInput"),
 
   _showFooter: function() {
-    this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+    this.set("application.showFooter", !this.get("model.canLoadMore"));
   }.observes("model.canLoadMore"),
 
   actions: {
diff --git a/app/assets/javascripts/discourse/helpers/as-hash.js.es6 b/app/assets/javascripts/discourse/helpers/as-hash.js.es6
index c5c67a64e0..df5abfcdfd 100644
--- a/app/assets/javascripts/discourse/helpers/as-hash.js.es6
+++ b/app/assets/javascripts/discourse/helpers/as-hash.js.es6
@@ -1,8 +1,12 @@
+import { registerHelper } from 'discourse-common/lib/helpers';
+
 // Note: Later versions of ember include `hash`
-export default function hashHelper(params) {
+registerHelper('as-hash', function(_, params) {
+  if (Ember.Helper) { return params; }
+
   const hash = {};
-  Object.keys(params.hash).forEach(k => {
-    hash[k] = params.data.view.getStream(params.hash[k]).value();
+  Object.keys(params).forEach(k => {
+    hash[k] = params[k].value();
   });
   return hash;
-}
+});
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
index d862cb02fd..5c77dbaf49 100644
--- a/app/assets/javascripts/discourse/helpers/custom-html.js.es6
+++ b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
@@ -20,15 +20,7 @@ export function setCustomHTML(key, html) {
   _customizations[key] = html;
 }
 
-registerHelper('custom-html', function(params, hash, options, env) {
-  const name = params[0];
-  const html = getCustomHTML(name);
+registerHelper('custom-html', function([id]) {
+  const html = getCustomHTML(id);
   if (html) { return html; }
-
-  const contextString = params[1];
-  const target = (env || contextString);
-  const container = target.container || target.data.view.container;
-  if (container.lookup('template:' + name)) {
-    return env.helpers.partial.helperFunction.apply(this, arguments);
-  }
 });
diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js.es6 b/app/assets/javascripts/discourse/helpers/inline-date.js.es6
index 874434fd3c..f483802ee0 100644
--- a/app/assets/javascripts/discourse/helpers/inline-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/inline-date.js.es6
@@ -1,6 +1,8 @@
 import { relativeAge } from 'discourse/lib/formatter';
+import { registerHelper } from 'discourse-common/lib/helpers';
 
-export default function(dt, params) {
-  dt = params.data.view.getStream(dt).value();
+registerHelper('inline-date', function([dt]) {
+  // TODO: Remove this in 1.13 or greater
+  if (dt.value) { dt = dt.value(); }
   return relativeAge(new Date(dt));
-}
+});
diff --git a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
index 69df920633..00a4307d7c 100644
--- a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
+++ b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
@@ -29,17 +29,6 @@
 
    And it will be wired up automatically.
 
-   ## The block form
-
-   If you use the block form of the outlet, its contents will be displayed
-   if no connectors are found. Example:
-
-   ```handlebars
-     {{#plugin-outlet "hello-world"}}
-       Nobody says hello :'(
-     {{/plugin-outlet}}
-   ```
-
    ## Disabling
 
    If a plugin returns a disabled status, the outlets will not be wired up for it.
@@ -129,7 +118,7 @@ function viewInjections(container) {
 }
 
 // unbound version of outlets, only has a template
-Handlebars.registerHelper('plugin-outlet', function(name){
+Handlebars.registerHelper('plugin-outlet', function(name) {
   if (!_rawCache) { buildConnectorCache(); }
 
   const functions = _rawCache[name];
@@ -145,9 +134,7 @@ Handlebars.registerHelper('plugin-outlet', function(name){
 
 });
 
-registerHelper('plugin-outlet', function(params, hash, options, env) {
-  const connectionName = params[0];
-
+registerHelper('plugin-outlet', function([connectionName], hash, options, env) {
   if (!_connectorCache) { buildConnectorCache(); }
 
   if (_connectorCache[connectionName]) {
@@ -157,30 +144,26 @@ registerHelper('plugin-outlet', function(params, hash, options, env) {
     // just shove it in.
     const viewClass = (childViews.length > 1) ? Ember.ContainerView : childViews[0];
 
-    const newHash = $.extend({}, viewInjections(env.data.view.container));
-    if (hash.tagName) { newHash.tagName = hash.tagName; }
+    // TODO: Figure out how to do this without a container view
+    if (env) {
+      const newHash = $.extend({}, viewInjections(env.data.view.container));
+      if (hash.tagName) { newHash.tagName = hash.tagName; }
 
-    // we don't need the default template since we have a connector
-    delete options.fn;
-    delete options.template;
-    env.helpers.view.helperFunction.call(this, [viewClass], newHash, options, env);
+      // we don't need the default template since we have a connector
+      delete options.fn;
+      delete options.template;
+      env.helpers.view.helperFunction.call(this, [viewClass], newHash, options, env);
 
-    const cvs = env.data.view._childViews;
-    if (childViews.length > 1 && cvs && cvs.length) {
-      const inserted = cvs[cvs.length-1];
-      if (inserted) {
-        childViews.forEach(function(cv) {
-          inserted.pushObject(cv.create());
-        });
+      const cvs = env.data.view._childViews;
+      if (childViews.length > 1 && cvs && cvs.length) {
+        const inserted = cvs[cvs.length-1];
+        if (inserted) {
+          childViews.forEach(function(cv) {
+            inserted.pushObject(cv.create());
+          });
+        }
       }
     }
-  } else if (options.isBlock) {
-    const virtualView = Ember.View.extend({
-      isVirtual: true,
-      tagName: hash.tagName || '',
-      template: options.template
-    });
-    env.helpers.view.helperFunction.call(this, [virtualView], hash, options, env);
   }
 });
 
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js.es6
index 506822b797..630cc2383a 100644
--- a/app/assets/javascripts/discourse/helpers/raw.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw.js.es6
@@ -1,17 +1,27 @@
 import { registerUnbound } from 'discourse-common/lib/helpers';
 
-// see: https://github.com/emberjs/ember.js/issues/12634
-var missingViews = {};
+let _injections;
 
-function renderRaw(ctx, template, templateName, params) {
+function renderRaw(ctx, container, template, templateName, params) {
   params.parent = params.parent || ctx;
 
-  if (!params.view && !missingViews[templateName]) {
-    var viewClass = Discourse.__container__.lookupFactory('view:' + templateName);
-    if (viewClass) {
-      params.view = viewClass.create(params);
-    } else {
-      missingViews[templateName] = true;
+  if (!params.view) {
+    if (!_injections) {
+      _injections = {
+        siteSettings: container.lookup('site-settings:main'),
+        currentUser: container.lookup('currentUser:main'),
+        site: container.lookup('site:main'),
+        session: container.lookup('session:main'),
+        topicTrackingState: container.lookup('topic-tracking-state:main')
+      };
+    }
+
+    const module = `discourse/views/${templateName}`;
+    if (requirejs.entries[module]) {
+      const viewClass = require(module, null, null, true);
+      if (viewClass && viewClass.default) {
+        params.view = viewClass.default.create(params, _injections);
+      }
     }
   }
 
@@ -19,10 +29,13 @@ function renderRaw(ctx, template, templateName, params) {
 }
 
 registerUnbound('raw', function(templateName, params) {
-  var template = Discourse.__container__.lookup('template:' + templateName + '.raw');
+  templateName = templateName.replace('.', '/');
+
+  const container = Discourse.__container__;
+  var template = container.lookup('template:' + templateName + '.raw');
   if (!template) {
     Ember.warn('Could not find raw template: ' + templateName);
     return;
   }
-  return renderRaw(this, template, templateName, params);
+  return renderRaw(this, container, template, templateName, params);
 });
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js.es6
index cffd9e7acc..fb1a05efee 100644
--- a/app/assets/javascripts/discourse/helpers/user-status.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-status.js.es6
@@ -6,7 +6,10 @@ export default htmlHelper((user, args) => {
   if (!user) { return; }
 
   const name = escapeExpression(user.get('name'));
-  const currentUser = args.hash.currentUser;
+  let currentUser;
+  if (args && args.hash) {
+    currentUser = args.hash.currentUser;
+  }
 
   if (currentUser && user.get('admin') && currentUser.get('staff')) {
     return iconHTML('shield', { label: I18n.t('user.admin', { user: name }) });
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
index b5bf7cc041..4920eca574 100644
--- a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
@@ -1,4 +1,6 @@
-export function autoLoadModules() {
+import { registerHelpers } from 'discourse-common/lib/helpers';
+
+export function autoLoadModules(container, registry) {
   Object.keys(requirejs.entries).forEach(entry => {
     if ((/\/helpers\//).test(entry)) {
       require(entry, null, null, true);
@@ -7,6 +9,7 @@ export function autoLoadModules() {
       require(entry, null, null, true);
     }
   });
+  registerHelpers(registry);
 }
 
 export default {
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
index 7e744a7de9..cf978f4300 100644
--- a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
+++ b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
@@ -1,4 +1,4 @@
-import { cleanDOM } from 'discourse/routes/discourse';
+import { cleanDOM } from 'discourse/lib/clean-dom';
 import { startPageTracking, onPageChange } from 'discourse/lib/page-tracker';
 import { viewTrackingRequired } from 'discourse/lib/ajax';
 
@@ -10,10 +10,7 @@ export default {
     // Tell our AJAX system to track a page transition
     const router = container.lookup('router:main');
     router.on('willTransition', viewTrackingRequired);
-
-    router.on('didTransition', function() {
-      Em.run.scheduleOnce('afterRender', Ember.Route, cleanDOM);
-    });
+    router.on('didTransition', cleanDOM);
 
     startPageTracking(router);
 
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
new file mode 100644
index 0000000000..8f86e6a6fd
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
@@ -0,0 +1,32 @@
+function _clean() {
+  if (window.MiniProfiler) {
+    window.MiniProfiler.pageTransition();
+  }
+
+  // Close some elements that may be open
+  $('header ul.icons li').removeClass('active');
+  $('[data-toggle="dropdown"]').parent().removeClass('open');
+  // close the lightbox
+  if ($.magnificPopup && $.magnificPopup.instance) {
+    $.magnificPopup.instance.close();
+    $('body').removeClass('mfp-zoom-out-cur');
+  }
+
+  // Remove any link focus
+  // NOTE: the '.not("body")' is here to prevent a bug in IE10 on Win7
+  // cf. https://stackoverflow.com/questions/5657371
+  $(document.activeElement).not("body").not(".no-blur").blur();
+
+  Discourse.set('notifyCount',0);
+  Discourse.__container__.lookup('route:application').send('closeModal');
+  const hideDropDownFunction = $('html').data('hide-dropdown');
+  if (hideDropDownFunction) { hideDropDownFunction(); }
+
+  // TODO: Avoid container lookup here
+  const appEvents = Discourse.__container__.lookup('app-events:main');
+  appEvents.trigger('dom:clean');
+}
+
+export function cleanDOM() {
+  Ember.run.scheduleOnce('afterRender', _clean);
+}
diff --git a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
index fff8079cf3..68e9528184 100644
--- a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
@@ -68,7 +68,7 @@ function initializeRecentlyUsedIcons() {
 
     recent.forEach(emoji => recentlyUsedIcons.push(emoji.title));
 
-    const recentGroup = groups.findProperty('name', 'recent');
+    const recentGroup = groups.findBy('name', 'recent');
     if (recentGroup) {
       recentGroup.icons = recentlyUsedIcons;
     } else {
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index 149b151617..d41bd7e5b9 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -1,37 +1,34 @@
 import { ajax } from 'discourse/lib/ajax';
+
 function replaceSpan($e, username, opts) {
   if (opts && opts.group) {
-    var extra = "", extraClass = "";
+    let extra = "";
+    let extraClass = "";
     if (opts.mentionable) {
-      extra = " data-name='" + username + "' data-mentionable-user-count='" + opts.mentionable.user_count + "' ";
-      extraClass = " notify";
+      extra = `data-name='${username}' data-mentionable-user-count='${opts.mentionable.user_count}'`;
+      extraClass = "notify";
     }
-    $e.replaceWith("<a href='" +
-                  Discourse.getURL("/groups/") + username +
-                  "' class='mention-group" + extraClass + "'" + extra + ">@" + username + "</a>");
+    $e.replaceWith(`<a href='${Discourse.getURL("/groups/") + username}' class='mention-group ${extraClass}' ${extra}>@${username}</a>`);
   } else {
-    $e.replaceWith("<a href='" +
-                  Discourse.getURL("/users/") + username.toLowerCase() +
-                  "' class='mention'>@" + username + "</a>");
+    $e.replaceWith(`<a href='${Discourse.getURL("/users/") + username.toLowerCase()}' class='mention'>@${username}</a>`);
   }
 }
 
-const found = [];
-const foundGroups = [];
-const mentionableGroups = [];
-const checked = [];
+const found = {};
+const foundGroups = {};
+const mentionableGroups = {};
+const checked = {};
 
 function updateFound($mentions, usernames) {
   Ember.run.scheduleOnce('afterRender', function() {
     $mentions.each((i, e) => {
       const $e = $(e);
       const username = usernames[i];
-      if (found.indexOf(username.toLowerCase()) !== -1) {
+      if (found[username.toLowerCase()]) {
         replaceSpan($e, username);
-      } else if (foundGroups.indexOf(username) !== -1) {
-        const mentionable = _(mentionableGroups).where({name: username}).first();
-        replaceSpan($e, username, {group: true, mentionable: mentionable});
-      } else if (checked.indexOf(username) !== -1) {
+      } else if (foundGroups[username]) {
+        replaceSpan($e, username, { group: true, mentionable: mentionableGroups[username] });
+      } else if (checked[username]) {
         $e.addClass('mention-tested');
       }
     });
@@ -42,22 +39,18 @@ export function linkSeenMentions($elem, siteSettings) {
   const $mentions = $('span.mention:not(.mention-tested)', $elem);
   if ($mentions.length) {
     const usernames = $mentions.map((_, e) => $(e).text().substr(1));
-    const unseen = _.uniq(usernames).filter((u) => {
-      return u.length >= siteSettings.min_username_length && checked.indexOf(u) === -1;
-    });
     updateFound($mentions, usernames);
-    return unseen;
+    return _.uniq(usernames).filter(u => !checked[u] && u.length >= siteSettings.min_username_length);
   }
-
   return [];
 }
 
-export function fetchUnseenMentions($elem, usernames) {
-  return ajax("/users/is_local_username", { data: { usernames } }).then(function(r) {
-    found.push.apply(found, r.valid);
-    foundGroups.push.apply(foundGroups, r.valid_groups);
-    mentionableGroups.push.apply(mentionableGroups, r.mentionable_groups);
-    checked.push.apply(checked, usernames);
+export function fetchUnseenMentions(usernames) {
+  return ajax("/users/is_local_username", { data: { usernames } }).then(r => {
+    r.valid.forEach(v => found[v] = true);
+    r.valid_groups.forEach(vg => foundGroups[vg] = true);
+    r.mentionable_groups.forEach(mg => mentionableGroups[mg] = true);
+    usernames.forEach(u => checked[u] = true);
     return r;
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6
index c4e9567b83..9dc3b38e2f 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -37,7 +37,7 @@ export function translateResults(results, opts) {
   });
 
   results.categories = results.categories.map(function(category){
-    return Category.list().findProperty('id', category.id);
+    return Category.list().findBy('id', category.id);
   }).compact();
 
   const r = results.grouped_search_result;
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 6237163d06..0306b001e0 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -26,6 +26,7 @@ export default function(name, opts) {
   }
 
   if (controller) {
+    controller.set('modal', modalController);
     const model = opts.model;
     if (model) { controller.set('model', model); }
     if (controller.onShow) { controller.onShow(); }
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index 5a140b48c1..56f460852f 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -19,7 +19,7 @@ export function cook(text) {
 }
 
 export function sanitize(text) {
-  return textSanitize(text, new WhiteLister(getOpts().features));
+  return textSanitize(text, new WhiteLister(getOpts()));
 }
 
 function emojiOptions() {
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 8101a2a7d3..7621ae4ce9 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -168,9 +168,6 @@ const DiscourseURL = Ember.Object.extend({
 
     if (this.navigatedToPost(oldPath, path, opts)) { return; }
 
-    // Schedule a DOM cleanup event
-    Em.run.scheduleOnce('afterRender', Discourse.Route, 'cleanDOM');
-
     if (oldPath === path) {
       // If navigating to the same path send an app event. Views can watch it
       // and tell their controllers to refresh
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index eb5bc209b3..def5e2e883 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -59,7 +59,7 @@ function organizeResults(r, options) {
 
   if (r.groups) {
     r.groups.every(function(g) {
-      if (results.length > limit) return false;
+      if (results.length > limit && options.term !== g.name) return false;
       if (exclude.indexOf(g.name) === -1) {
         groups.push(g);
         results.push(g);
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
index 42a279b803..7394488fcb 100644
--- a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
+++ b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
@@ -1,8 +1,6 @@
-export default Em.Mixin.create({
+export default Ember.Mixin.create({
   flashMessage: null,
 
-  needs: ['modal'],
-
   flash(message, messageClass) {
     this.set('flashMessage', Em.Object.create({ message, messageClass }));
   }
diff --git a/app/assets/javascripts/discourse/mixins/string-buffer.js.es6 b/app/assets/javascripts/discourse/mixins/string-buffer.js.es6
deleted file mode 100644
index 943a972c6e..0000000000
--- a/app/assets/javascripts/discourse/mixins/string-buffer.js.es6
+++ /dev/null
@@ -1,45 +0,0 @@
-export default Ember.Mixin.create({
-
-  _watchProps: function() {
-    const args = this.get('rerenderTriggers');
-    if (!Ember.isNone(args)) {
-      args.forEach(k => this.addObserver(k, this.rerenderString));
-    }
-  }.on('init'),
-
-  render(buffer) {
-    this.renderString(buffer);
-  },
-
-  renderString(buffer){
-    const template = Discourse.__container__.lookup('template:' + this.rawTemplate);
-    if (template) {
-      buffer.push(template(this));
-    }
-  },
-
-  _rerenderString() {
-    const $sel = this.$();
-    if (!$sel) { return; }
-
-    const buffer = [];
-    this.renderString(buffer);
-
-    // Chrome likes scrolling after HTML is set
-    // This happens if you navigate back and forth a few times
-    // Before removing this code confirm that this does not cause scrolling
-    // 1. Sort by views
-    // 2. Go to last post on one of the topics
-    // 3. Hit back
-    // 4. Go to last post on same topic
-    // 5. Expand likes
-    const scrollTop = $(window).scrollTop();
-    $sel.html(buffer.join(''));
-    $(window).scrollTop(scrollTop);
-  },
-
-  rerenderString() {
-    Ember.run.once(this, '_rerenderString');
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/models/admin-post.js.es6 b/app/assets/javascripts/discourse/models/admin-post.js.es6
index 4504fcbe24..8de331ac95 100644
--- a/app/assets/javascripts/discourse/models/admin-post.js.es6
+++ b/app/assets/javascripts/discourse/models/admin-post.js.es6
@@ -9,7 +9,7 @@ export default Post.extend({
     }
   }.on("init"),
 
-  presentName: Em.computed.any('name', 'username'),
+  presentName: Ember.computed.or('name', 'username'),
 
   sameUser: function() {
     return this.get("username") === Discourse.User.currentProp("username");
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 724a266469..b77a4abdf3 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -98,7 +98,9 @@ const Category = RestModel.extend({
         topic_template: this.get('topic_template'),
         suppress_from_homepage: this.get('suppress_from_homepage'),
         allowed_tags: this.get('allowed_tags'),
-        allowed_tag_groups: this.get('allowed_tag_groups')
+        allowed_tag_groups: this.get('allowed_tag_groups'),
+        sort_order: this.get('sort_order'),
+        sort_ascending: this.get('sort_ascending')
       },
       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 511f4ea853..3bfdcc904a 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -118,7 +118,7 @@ const Composer = RestModel.extend({
   }.property().volatile(),
 
   archetype: function() {
-    return this.get('archetypes').findProperty('id', this.get('archetypeId'));
+    return this.get('archetypes').findBy('id', this.get('archetypeId'));
   }.property('archetypeId'),
 
   archetypeChanged: function() {
@@ -378,14 +378,14 @@ const Composer = RestModel.extend({
 
     // If the user didn't change the template, clear it
     if (oldCategoryId) {
-      const oldCat = this.site.categories.findProperty('id', oldCategoryId);
+      const oldCat = this.site.categories.findBy('id', oldCategoryId);
       if (oldCat && (oldCat.get('topic_template') === reply)) {
         reply = "";
       }
     }
 
     if (!Ember.isEmpty(reply)) { return; }
-    const category = this.site.categories.findProperty('id', categoryId);
+    const category = this.site.categories.findBy('id', categoryId);
     if (category) {
       this.set('reply', category.get('topic_template') || "");
     }
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6
index 7eb1616485..58845c2d51 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/models/nav-item.js.es6
@@ -29,7 +29,7 @@ const NavItem = Discourse.Model.extend({
   categorySlug: function() {
     var split = this.get('name').split('/');
     if (split[0] === 'category' && split[1]) {
-      var cat = Discourse.Site.current().categories.findProperty('nameLower', split[1].toLowerCase());
+      var cat = Discourse.Site.current().categories.findBy('nameLower', split[1].toLowerCase());
       return cat ? Discourse.Category.slugFor(cat) : null;
     }
     return null;
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index a96f0e0248..2473b6660b 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -59,7 +59,7 @@ export default RestModel.extend({
   @computed('hasLoadedData', 'firstPostId', 'posts.[]')
   firstPostPresent(hasLoadedData, firstPostId) {
     if (!hasLoadedData) { return false; }
-    return !!this.get('posts').findProperty('id', firstPostId);
+    return !!this.get('posts').findBy('id', firstPostId);
   },
 
   firstPostNotLoaded: Ember.computed.not('firstPostPresent'),
@@ -71,7 +71,7 @@ export default RestModel.extend({
     if (!hasLoadedData) { return false; }
     if (lastPostId === -1) { return true; }
 
-    return !!this.get('posts').findProperty('id', lastPostId);
+    return !!this.get('posts').findBy('id', lastPostId);
   },
 
   lastPostNotLoaded: Ember.computed.not('loadedAllPosts'),
@@ -208,7 +208,7 @@ export default RestModel.extend({
     if (opts.forceLoad) {
       this.set('loaded', false);
     } else {
-      const postWeWant = this.get('posts').findProperty('post_number', opts.nearPost);
+      const postWeWant = this.get('posts').findBy('post_number', opts.nearPost);
       if (postWeWant) { return Ember.RSVP.resolve(); }
     }
 
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 7e96dc3ba1..b15683ca4a 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -76,7 +76,7 @@ const Post = RestModel.extend({
 
   internalLinks: function() {
     if (Ember.isEmpty(this.get('link_counts'))) return null;
-    return this.get('link_counts').filterProperty('internal').filterProperty('title');
+    return this.get('link_counts').filterBy('internal').filterBy('title');
   }.property('link_counts.@each.internal'),
 
   flagsAvailable: function() {
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index eb417c7429..5b421c46be 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -20,7 +20,7 @@ const Site = RestModel.extend({
   flagTypes() {
     const postActionTypes = this.get('post_action_types');
     if (!postActionTypes) return [];
-    return postActionTypes.filterProperty('is_flag', true);
+    return postActionTypes.filterBy('is_flag', true);
   },
 
   topicCountDesc: ['topic_count:desc'],
@@ -64,7 +64,7 @@ const Site = RestModel.extend({
 
   removeCategory(id) {
     const categories = this.get('categories');
-    const existingCategory = categories.findProperty('id', id);
+    const existingCategory = categories.findBy('id', id);
     if (existingCategory) {
       categories.removeObject(existingCategory);
       delete this.get('categoriesById').categoryId;
@@ -74,7 +74,7 @@ const Site = RestModel.extend({
   updateCategory(newCategory) {
     const categories = this.get('categories');
     const categoryId = Em.get(newCategory, 'id');
-    const existingCategory = categories.findProperty('id', categoryId);
+    const existingCategory = categories.findBy('id', categoryId);
 
     // Don't update null permissions
     if (newCategory.permission === null) { delete newCategory.permission; }
diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js.es6
index 25714b0c4b..72ef0d0fe9 100644
--- a/app/assets/javascripts/discourse/models/topic-details.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-details.js.es6
@@ -72,7 +72,7 @@ const TopicDetails = RestModel.extend({
       type: 'PUT',
       data: { name: name }
     }).then(() => {
-      groups.removeObject(groups.findProperty('name', name));
+      groups.removeObject(groups.findBy('name', name));
     });
   },
 
@@ -84,7 +84,7 @@ const TopicDetails = RestModel.extend({
       type: 'PUT',
       data: { username: username }
     }).then(() => {
-      users.removeObject(users.findProperty('username', username));
+      users.removeObject(users.findBy('username', username));
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 15b181fae8..e59c60029d 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -120,7 +120,7 @@ const Topic = RestModel.extend({
     const categoryName = this.get('categoryName');
     let category;
     if (categoryName) {
-      category = Discourse.Category.list().findProperty('name', categoryName);
+      category = Discourse.Category.list().findBy('name', categoryName);
     }
     this.set('category', category);
   }.observes('categoryName'),
@@ -213,7 +213,7 @@ const Topic = RestModel.extend({
   }.property('views'),
 
   archetypeObject: function() {
-    return Discourse.Site.currentProp('archetypes').findProperty('id', this.get('archetype'));
+    return Discourse.Site.currentProp('archetypes').findBy('id', this.get('archetype'));
   }.property('archetype'),
 
   isPrivateMessage: Em.computed.equal('archetype', 'private_message'),
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index 024089799a..ebc4be7381 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -76,9 +76,9 @@ const UserAction = RestModel.extend({
     return targetUsername === Discourse.User.currentProp('username');
   },
 
-  presentName: Em.computed.any('name', 'username'),
-  targetDisplayName: Em.computed.any('target_name', 'target_username'),
-  actingDisplayName: Em.computed.any('acting_name', 'acting_username'),
+  presentName: Ember.computed.or('name', 'username'),
+  targetDisplayName: Ember.computed.or('target_name', 'target_username'),
+  actingDisplayName: Ember.computed.or('acting_name', 'acting_username'),
   targetUserUrl: url('target_username', '/users/%@'),
 
   @computed("username")
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index ede02127a3..e4f92d6b34 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -64,7 +64,7 @@ const User = RestModel.extend({
 
   @computed('profile_background')
   profileBackground(bgUrl) {
-    if (Em.isEmpty(bgUrl) || !Discourse.SiteSettings.allow_profile_backgrounds) { return; }
+    if (Em.isEmpty(bgUrl) || !Discourse.SiteSettings.allow_profile_backgrounds) { return "".htmlSafe(); }
     return ('background-image: url(' + Discourse.getURLWithCDN(bgUrl) + ')').htmlSafe();
   },
 
@@ -153,7 +153,7 @@ const User = RestModel.extend({
 
   @computed("trust_level")
   trustLevel(trustLevel) {
-    return Discourse.Site.currentProp('trustLevels').findProperty('id', parseInt(trustLevel, 10));
+    return Discourse.Site.currentProp('trustLevels').findBy('id', parseInt(trustLevel, 10));
   },
 
   isBasic: Em.computed.equal('trust_level', 0),
@@ -322,7 +322,7 @@ const User = RestModel.extend({
   @computed("stats.@each.isPM")
   statsExcludingPms() {
     if (Ember.isEmpty(this.get('stats'))) return [];
-    return this.get('stats').rejectProperty('isPM');
+    return this.get('stats').rejectBy('isPM');
   },
 
   findDetails(options) {
@@ -525,12 +525,12 @@ User.reopenClass(Singleton, {
       action_type: UserAction.TYPES.replies
     });
 
-    stats.filterProperty('isResponse').forEach(stat => {
+    stats.filterBy('isResponse').forEach(stat => {
       responses.set('count', responses.get('count') + stat.get('count'));
     });
 
     const result = Em.A();
-    result.pushObjects(stats.rejectProperty('isResponse'));
+    result.pushObjects(stats.rejectBy('isResponse'));
 
     let insertAt = 0;
     result.forEach((item, index) => {
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
index 04729de959..5e3de23fee 100644
--- a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
@@ -7,7 +7,6 @@ import DiscourseLocation from 'discourse/lib/discourse-location';
 import SearchService from 'discourse/services/search';
 import { startTracking, default as TopicTrackingState } from 'discourse/models/topic-tracking-state';
 import ScreenTrack from 'discourse/lib/screen-track';
-import TopicFooterButtons from 'discourse/components/topic-footer-buttons';
 
 function inject() {
   const app = arguments[0],
@@ -63,7 +62,9 @@ export default {
     app.register('screen-track:main', screenTrack, { instantiate: false });
     inject(app, 'screenTrack', 'component', 'route');
 
-    inject(app, 'currentUser', 'component', 'route', 'controller');
+    if (currentUser) {
+      inject(app, 'currentUser', 'component', 'route', 'controller');
+    }
 
     app.register('location:discourse-location', DiscourseLocation);
 
@@ -71,13 +72,6 @@ export default {
     app.register('key-value-store:main', keyValueStore, { instantiate: false });
     injectAll(app, 'keyValueStore');
 
-    Discourse.TopicFooterButtonsView = {
-      reopen(obj) {
-        Ember.warn('`Discourse.TopicFooterButtonsView` is deprecated. Use the `topic-footer-buttons` component instead');
-        TopicFooterButtons.reopen(obj);
-      }
-    };
-
     startTracking(topicTrackingState);
   }
 };
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 8341e4cf57..002f998c35 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -132,7 +132,7 @@ export default function() {
       this.route('showCategory' + filter.capitalize(), {path: '/c/:category/:tag_id/l/' + filter});
       this.route('showParentCategory' + filter.capitalize(), {path: '/c/:parent_category/:category/:tag_id/l/' + filter});
     });
-    this.route('intersection', {path: 'intersection/:tag_id/*additional_tags'});
+    this.route('show', {path: 'intersection/:tag_id/*additional_tags'});
   });
 
   this.resource('tagGroups', {path: '/tag_groups'}, function() {
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index df074f01d3..d506852e36 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -20,14 +20,7 @@ function unlessReadOnly(method, message) {
 const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
   siteTitle: setting('title'),
 
-  _handleLogout() {
-    if (this.currentUser) {
-      this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore));
-    }
-  },
-
   actions: {
-
     toggleAnonymous() {
       ajax("/users/toggle-anon", {method: 'POST'}).then(() => {
         window.location.reload();
@@ -179,6 +172,14 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     });
   },
 
+  renderTemplate() {
+    this.render('application');
+    this.render('user-card', { into: 'application', outlet: 'user-card' });
+    this.render('modal', { into: 'application', outlet: 'modal' });
+    this.render('topic-entrance', { into: 'application', outlet: 'topic-entrance' });
+    this.render('composer', { into: 'application', outlet: 'composer' });
+  },
+
   handleShowLogin() {
     if (this.siteSettings.enable_sso) {
       const returnPath = encodeURIComponent(window.location.pathname);
@@ -198,7 +199,6 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
   },
 
   _autoLogin(modal, modalClass, notAuto) {
-
     const methods = findAll(this.siteSettings,
                             this.container.lookup('capabilities:main'),
                             this.site.isMobileDevice);
@@ -212,6 +212,11 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     }
   },
 
+  _handleLogout() {
+    if (this.currentUser) {
+      this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore));
+    }
+  },
 });
 
 RSVP.EventTarget.mixin(ApplicationRoute);
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index 8b4c7b8465..8b3d3bbc31 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -74,33 +74,4 @@ const DiscourseRoute = Ember.Route.extend({
   }
 });
 
-export function cleanDOM() {
-  if (window.MiniProfiler) {
-    window.MiniProfiler.pageTransition();
-  }
-
-  // Close some elements that may be open
-  $('header ul.icons li').removeClass('active');
-  $('[data-toggle="dropdown"]').parent().removeClass('open');
-  // close the lightbox
-  if ($.magnificPopup && $.magnificPopup.instance) {
-    $.magnificPopup.instance.close();
-    $('body').removeClass('mfp-zoom-out-cur');
-  }
-
-  // Remove any link focus
-  // NOTE: the '.not("body")' is here to prevent a bug in IE10 on Win7
-  // cf. https://stackoverflow.com/questions/5657371
-  $(document.activeElement).not("body").not(".no-blur").blur();
-
-  Discourse.set('notifyCount',0);
-  Discourse.__container__.lookup('route:application').send('closeModal');
-  const hideDropDownFunction = $('html').data('hide-dropdown');
-  if (hideDropDownFunction) { hideDropDownFunction(); }
-
-  // TODO: Avoid container lookup here
-  const appEvents = Discourse.__container__.lookup('app-events:main');
-  appEvents.trigger('dom:clean');
-}
-
 export default DiscourseRoute;
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index c82acb9eab..db344ef884 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -140,16 +140,6 @@ export default Discourse.Route.extend({
     didTransition() {
       this.controllerFor("tags.show")._showFooter();
       return true;
-    },
-
-    willTransition(transition) {
-      if (!Discourse.SiteSettings.show_filter_by_tag) { return true; }
-
-      if ((transition.targetName.indexOf("discovery.parentCategory") !== -1 ||
-            transition.targetName.indexOf("discovery.category") !== -1) && !transition.queryParams.allTags ) {
-        this.transitionTo("/tags" + transition.intent.url + "/" + this.currentModel.get("id"));
-      }
-      return true;
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index a31736bc15..0ee442dde5 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -45,7 +45,8 @@ const TopicRoute = Discourse.Route.extend({
       this.controllerFor('flag').setProperties({ selected: null, flagTopic: false });
     },
 
-    showFlagTopic(model) {
+    showFlagTopic() {
+      const model = this.modelFor('topic');
       showModal('flag',  { model });
       this.controllerFor('flag').setProperties({ selected: null, flagTopic: true });
     },
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index a01b222b00..5a013ead74 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -1,4 +1,4 @@
-
+{{plugin-outlet "above-site-header"}}
 {{site-header canSignUp=canSignUp
               showCreateAccount="showCreateAccount"
               showLogin="showLogin"
@@ -6,6 +6,7 @@
               toggleMobileView="toggleMobileView"
               toggleAnonymous="toggleAnonymous"
               logout="logout"}}
+{{plugin-outlet "below-site-header"}}
 
 <div id="main-outlet" class="wrap">
   <div class="container">
@@ -16,7 +17,7 @@
     {{create-topics-notice}}
   </div>
   {{outlet}}
-  {{render "user-card"}}
+  {{outlet "user-card"}}
 </div>
 
 {{plugin-outlet "above-footer"}}
@@ -25,6 +26,6 @@
 {{/if}}
 {{plugin-outlet "below-footer"}}
 
-{{render "modal"}}
-{{render "topic-entrance"}}
-{{render "composer"}}
+{{outlet "modal"}}
+{{outlet "topic-entrance"}}
+{{outlet "composer"}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories_with_featured_topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories_with_featured_topics.hbs
rename to app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs
diff --git a/app/assets/javascripts/discourse/templates/components/check-mark.hbs b/app/assets/javascripts/discourse/templates/components/check-mark.hbs
new file mode 100644
index 0000000000..85c38d59ac
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/check-mark.hbs
@@ -0,0 +1,5 @@
+{{#if checked}}
+  {{fa-icon "check"}}
+{{else}}
+  {{fa-icon "times"}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
new file mode 100644
index 0000000000..5842bf9151
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
@@ -0,0 +1 @@
+{{#each colors as |c|}}{{color-picker-choice color=c usedColors=usedColors selectColor="selectColor"}}{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs
new file mode 100644
index 0000000000..e18527be3a
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs
@@ -0,0 +1,5 @@
+{{#if condition}}
+  <div class="spinner {{size}}"></div>
+{{else}}
+  {{yield}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
new file mode 100644
index 0000000000..47b714b8dc
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -0,0 +1,6 @@
+{{#if icon}}
+  {{fa-icon icon}}
+{{/if}}
+
+{{{translatedLabel}}}
+{{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index 1a647c5ea8..306f2924b4 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -1,11 +1,13 @@
-<div class="row">
-  <div id="banner" class={{overlay}}>
-    <div id="banner-content">
-      <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
-      {{{banner.html}}}
-      {{#if currentUser.staff}}
-        <p><a href="{{banner.url}}">{{{i18n "banner.edit"}}}</a></p>
-      {{/if}}
+{{#if visible}}
+  <div class="row">
+    <div id="banner" class={{overlay}}>
+      <div id="banner-content">
+        <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
+        {{{banner.html}}}
+        {{#if currentUser.staff}}
+          <p><a href="{{banner.url}}">{{{i18n "banner.edit"}}}</a></p>
+        {{/if}}
+      </div>
     </div>
   </div>
-</div>
+{{/if}}
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 1a9c68c6b2..72883cba5a 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -19,6 +19,16 @@
   </label>
 </section>
 
+<section class="field">
+  <label>
+    {{i18n "category.sort_order"}}
+    {{combo-box valueAttribute="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
+    {{#unless isDefaultSortOrder}}
+      {{combo-box valueAttribute="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
+    {{/unless}}
+  </label>
+</section>
+
 {{#if emailInEnabled}}
     <section class='field'>
       <label>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs b/app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs
new file mode 100644
index 0000000000..e8adb89fe4
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/tag-drop-link.hbs
@@ -0,0 +1 @@
+{{tagId}}
diff --git a/app/assets/javascripts/discourse/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
new file mode 100644
index 0000000000..05a4439029
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/text-overflow.hbs
@@ -0,0 +1 @@
+{{{text}}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
new file mode 100644
index 0000000000..518abc95c2
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -0,0 +1,60 @@
+{{#if showAdminButton}}
+  {{topic-admin-menu-button topic=topic delegated=topicDelegated openUpwards="true"}}
+{{/if}}
+
+{{#unless topic.isPrivateMessage}}
+  {{#if site.mobileView}}
+    {{topic-footer-mobile-dropdown topic=topic}}
+  {{else}}
+    {{d-button class=bookmarkClass
+               title=bookmarkTitle
+               label=bookmarkLabel
+               icon="bookmark"
+               action="toggleBookmark"}}
+
+    <button class="btn share" data-share-url={{topic.shareUrl}} title={{i18n "topic.share.help"}}>
+      {{fa-icon "link"}}
+      {{i18n "topic.share.title"}}
+    </button>
+
+    {{#if topic.details.can_flag_topic}}
+      {{d-button class="flag-topic"
+                 title="topic.flag_topic.help"
+                 label="topic.flag_topic.title"
+                 icon="flag"
+                 action="showFlagTopic"}}
+    {{/if}}
+
+  {{/if}}
+{{/unless}}
+
+{{#if canInviteTo}}
+  {{d-button class="invite-topic"
+             title="topic.invite_reply.help"
+             label="topic.invite_reply.title"
+             icon="users"
+             action="showInvite"
+             disabled=inviteDisabled}}
+{{/if}}
+
+{{#if topic.isPrivateMessage}}
+  {{d-button class="standard"
+             title=archiveTitle
+             label=archiveLabel
+             icon=archiveIcon
+             action="toggleArchiveMessage"}}
+{{/if}}
+
+{{#if topic.details.can_create_post}}
+  {{d-button class="btn-primary create"
+             icon="reply"
+             action="replyToPost"
+             label="topic.reply.title"
+             title="topic.reply.help"}}
+{{/if}}
+
+{{plugin-outlet "after-topic-footer-main-buttons" tagName="span"}}
+
+{{pinned-button topic=topic topicDelegated=topicDelegated}}
+{{topic-notifications-button topic=topic topicDelegated=topicDelegated}}
+{{plugin-outlet "after-topic-footer-buttons" tagName="span"}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
index 70f1e8e387..ae53e4cc78 100644
--- a/app/assets/javascripts/discourse/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
@@ -1,6 +1,6 @@
 {{#discovery-categories refresh="refresh"}}
-  {{component controller.categoryPageStyle
+  {{component categoryPageStyle
               categories=model.categories
-              latestTopicOnly=controller.latestTopicOnly
+              latestTopicOnly=latestTopicOnly
               topics=model.topics}}
 {{/discovery-categories}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 7b45cd1335..dc5572f828 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -25,8 +25,8 @@
 
 {{#if bulkSelectEnabled}}
   <div class='fps-select'>
-    {{d-link action="selectAll" label="search.select_all"}}
-    {{d-link action="clearAll" label="search.clear_all"}}
+    <a {{action "selectAll"}}>{{i18n "search.select_all"}}</a>
+    <a {{action "clearAll"}}>{{i18n "search.clear_all"}}</a>
   </div>
 {{/if}}
 
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 f6d485f55e..56a994a551 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 @@
-<{{this.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></{{this.tagName}}>
+<{{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}}>
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
index 2a5d987889..2c93702e92 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
@@ -1,5 +1,5 @@
 {{#each model.categories as |c|}}
-  <div class='category-list-item category' style="border-color: #{{unbound c.color}}">
+  <div class='category-list-item category' style={{border-color c.color}}>
     <table class='topic-list'>
       <tr>
         <th class="main-link">
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index 330de1ad81..3e4734e9da 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,6 +1,6 @@
 <div class='modal-body'>
 
-  <p>{{{i18n 'topics.bulk.selected' count=length}}}</p>
+  <p>{{{i18n 'topics.bulk.selected' count=model.length}}}</p>
 
   {{outlet "bulkOutlet"}}
 
diff --git a/app/assets/javascripts/discourse/templates/quote-button.hbs b/app/assets/javascripts/discourse/templates/quote-button.hbs
new file mode 100644
index 0000000000..1dce9fb288
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/quote-button.hbs
@@ -0,0 +1 @@
+{{i18n "post.quote_reply"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index f6b97c0fc8..5c6689f0d6 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -1,6 +1,6 @@
 {{#if model}}
   <div class="container">
-    {{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=model.errorLoading}}
+    {{discourse-banner user=currentUser banner=site.banner overlay=hasScrolled hide=model.errorLoading}}
   </div>
 {{/if}}
 
@@ -147,7 +147,11 @@
               {{! replace "Log In to Reply" with the infobox }}
               {{signup-cta}}
             {{else}}
-              {{topic-footer-buttons topic=model topicDelegated=topicDelegated}}
+              {{#if currentUser}}
+                {{topic-footer-buttons topic=model topicDelegated=topicDelegated}}
+              {{else}}
+                {{d-button icon="reply" class="btn-primary" action="showLogin" label="topic.reply.title"}}
+              {{/if}}
             {{/if}}
 
             {{#if model.pending_posts_count}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index fc6fee572b..1d890517e2 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -1,6 +1,7 @@
 <div class="container{{if viewingSelf ' viewing-self'}}">
   <section class='user-main'>
-    <section class="{{if collapsedInfo 'collapsed-info'}} about {{if model.profileBackground 'has-background' 'no-background'}}"  style={{model.profileBackground}}>
+
+    <section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackground 'has-background' 'no-background'}}"  style={{model.profileBackground}}>
     {{#unless collapsedInfo}}
     <div class='staff-counters'>
       {{#if model.number_of_flags_given}}
diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/templates/user/badges.hbs
index 835a7fea38..01410767aa 100644
--- a/app/assets/javascripts/discourse/templates/user/badges.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badges.hbs
@@ -1,5 +1,5 @@
 <section class='user-content user-badges-list'>
-  {{#each model as |ub|}}
-    {{badge-card badge=ub.badge count=ub.count navigateOnClick="true" username=user.username_lower}}
+  {{#each sortedBadges as |ub|}}
+    {{badge-card badge=ub.badge count=ub.count navigateOnClick="true" username=username}}
   {{/each}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index 8aa71e0867..5682d2e855 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,5 +1,5 @@
 <section class='user-navigation'>
-  {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=currentPath}}
+  {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=application.currentPath}}
     <li class='no-glyph'>
       {{#link-to 'userNotifications.index'}}{{i18n 'user.filters.all'}}{{/link-to}}
     </li>
diff --git a/app/assets/javascripts/discourse/views/archive-button.js.es6 b/app/assets/javascripts/discourse/views/archive-button.js.es6
deleted file mode 100644
index 39e046d10a..0000000000
--- a/app/assets/javascripts/discourse/views/archive-button.js.es6
+++ /dev/null
@@ -1,35 +0,0 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
-
-export default Ember.View.extend(StringBuffer, {
-  tagName: 'button',
-  classNames: ['btn', 'standard'],
-  attributeBindings: ['title'],
-  archived: Em.computed.alias('controller.model.message_archived'),
-  archiving: Em.computed.alias('controller.model.archiving'),
-  rerenderTriggers: ['archived', 'archiving'],
-
-  title: function() {
-    const key = this.get('archived') ? 'topic.move_to_inbox.help' : 'topic.archive_message.help';
-    return I18n.t(key);
-  }.property('archived'),
-
-  renderString: function(buffer) {
-    if (this.get('archived')){
-      buffer.push(I18n.t('topic.move_to_inbox.title'));
-    } else {
-      buffer.push("<i class='fa fa-folder'></i>");
-      buffer.push(I18n.t('topic.archive_message.title'));
-    }
-  },
-
-  click: function() {
-    if (!this.get('archiving')) {
-      if (this.get('archived')) {
-        this.get('controller').send('moveToInbox');
-      } else {
-        this.get('controller').send('archiveMessage');
-      }
-    }
-  }
-});
-
diff --git a/app/assets/javascripts/discourse/views/bookmark-button.js.es6 b/app/assets/javascripts/discourse/views/bookmark-button.js.es6
deleted file mode 100644
index 200874b6bb..0000000000
--- a/app/assets/javascripts/discourse/views/bookmark-button.js.es6
+++ /dev/null
@@ -1,28 +0,0 @@
-import ButtonView from 'discourse/views/button';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-
-export default ButtonView.extend({
-  classNames: ['bookmark'],
-  attributeBindings: ['disabled'],
-
-  bookmarked: Ember.computed.alias('controller.model.bookmarked'),
-
-  textKey: function() {
-    return this.get('bookmarked') ? 'bookmarked.clear_bookmarks' : 'bookmarked.title';
-  }.property('bookmarked'),
-
-  rerenderTriggers: ['bookmarked'],
-
-  helpKey: function() {
-    return this.get("bookmarked") ? "bookmarked.help.unbookmark" : "bookmarked.help.bookmark";
-  }.property("bookmarked"),
-
-  click() {
-    this.get('controller').send('toggleBookmark');
-  },
-
-  renderIcon(buffer) {
-    const className = this.get("bookmarked") ? "bookmarked" : "";
-    buffer.push(iconHTML('bookmark', { class: className }));
-  }
-});
diff --git a/app/assets/javascripts/discourse/views/button.js.es6 b/app/assets/javascripts/discourse/views/button.js.es6
index 9811e71956..a2a0dc0daf 100644
--- a/app/assets/javascripts/discourse/views/button.js.es6
+++ b/app/assets/javascripts/discourse/views/button.js.es6
@@ -1,6 +1,6 @@
-import StringBuffer from 'discourse/mixins/string-buffer';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.View.extend(StringBuffer, {
+export default Ember.View.extend(bufferedRender({
   tagName: 'button',
   classNameBindings: [':btn', ':standard', 'dropDownToggle'],
   attributeBindings: ['title', 'data-toggle', 'data-share-url'],
@@ -14,10 +14,10 @@ export default Ember.View.extend(StringBuffer, {
     return I18n.t(this.get('textKey'));
   }.property('textKey'),
 
-  renderString: function(buffer) {
+  buildBuffer(buffer) {
     if (this.renderIcon) {
       this.renderIcon(buffer);
     }
     buffer.push(this.get('text'));
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/views/container.js.es6 b/app/assets/javascripts/discourse/views/container.js.es6
deleted file mode 100644
index f7a474fc02..0000000000
--- a/app/assets/javascripts/discourse/views/container.js.es6
+++ /dev/null
@@ -1,16 +0,0 @@
-export default Ember.ContainerView.extend({
-
-  attachViewWithArgs(viewArgs, viewClass) {
-    if (typeof viewClass === "string") {
-      viewClass = this.container.lookupFactory("view:" + viewClass) ||
-                  this.container.lookupFactory("component:" + viewClass);
-    }
-
-    if (!viewClass) { viewClass = Ember.View.extend(); }
-    this.pushObject(this.createChildView(viewClass, viewArgs));
-  },
-
-  attachViewClass(viewClass) {
-    this.attachViewWithArgs(null, viewClass);
-  }
-});
diff --git a/app/assets/javascripts/discourse/views/flag-topic-button.js.es6 b/app/assets/javascripts/discourse/views/flag-topic-button.js.es6
deleted file mode 100644
index da32165cb6..0000000000
--- a/app/assets/javascripts/discourse/views/flag-topic-button.js.es6
+++ /dev/null
@@ -1,16 +0,0 @@
-import ButtonView from 'discourse/views/button';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-
-export default ButtonView.extend({
-  classNames: ['flag-topic'],
-  textKey: 'topic.flag_topic.title',
-  helpKey: 'topic.flag_topic.help',
-
-  click() {
-    this.get('controller').send('showFlagTopic', this.get('controller.content'));
-  },
-
-  renderIcon(buffer) {
-    buffer.push(iconHTML('flag'));
-  }
-});
diff --git a/app/assets/javascripts/discourse/views/hide-modal.js.es6 b/app/assets/javascripts/discourse/views/hide-modal.js.es6
index 03ebe40800..c3572eaa30 100644
--- a/app/assets/javascripts/discourse/views/hide-modal.js.es6
+++ b/app/assets/javascripts/discourse/views/hide-modal.js.es6
@@ -1,8 +1,6 @@
-export default Em.View.extend({
-  // No rendering!
-  render: Em.K,
-
-  _hideModal: function() {
+export default Ember.View.extend({
+  didInsertElement() {
+    this._super();
     $('#discourse-modal').modal('hide');
-  }.on('didInsertElement')
+  }
 });
diff --git a/app/assets/javascripts/discourse/views/invite-reply-button.js.es6 b/app/assets/javascripts/discourse/views/invite-reply-button.js.es6
deleted file mode 100644
index ba450494fd..0000000000
--- a/app/assets/javascripts/discourse/views/invite-reply-button.js.es6
+++ /dev/null
@@ -1,18 +0,0 @@
-import ButtonView from 'discourse/views/button';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-
-export default ButtonView.extend({
-  classNames: ['invite-topic'],
-  textKey: 'topic.invite_reply.title',
-  helpKey: 'topic.invite_reply.help',
-  attributeBindings: ['disabled'],
-  disabled: Em.computed.or('controller.model.archived', 'controller.model.closed', 'controller.model.deleted'),
-
-  renderIcon(buffer) {
-    buffer.push(iconHTML('users'));
-  },
-
-  click() {
-    this.get('controller').send('showInvite');
-  }
-});
diff --git a/app/assets/javascripts/discourse/views/loading.js.es6 b/app/assets/javascripts/discourse/views/loading.js.es6
index 7b08e628a2..2d6227695f 100644
--- a/app/assets/javascripts/discourse/views/loading.js.es6
+++ b/app/assets/javascripts/discourse/views/loading.js.es6
@@ -1,7 +1,8 @@
 import { spinnerHTML } from 'discourse/helpers/loading-spinner';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
-export default Ember.View.extend({
-  render: function(buffer) {
+export default Ember.View.extend(bufferedRender({
+  buildBuffer(buffer) {
     buffer.push(spinnerHTML);
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/views/login-reply-button.js.es6 b/app/assets/javascripts/discourse/views/login-reply-button.js.es6
deleted file mode 100644
index 42dbba0cd2..0000000000
--- a/app/assets/javascripts/discourse/views/login-reply-button.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-import ButtonView from 'discourse/views/button';
-
-export default ButtonView.extend({
-  textKey: 'topic.reply.title',
-  classNames: ['btn', 'btn-primary', 'create'],
-  click: function() {
-    this.get('controller').send('showLogin');
-  },
-  renderIcon: function(buffer) {
-    buffer.push("<i class='fa fa-reply'></i>");
-  }
-});
diff --git a/app/assets/javascripts/discourse/views/modal-body.js.es6 b/app/assets/javascripts/discourse/views/modal-body.js.es6
index 05998dac40..55ce0fca0b 100644
--- a/app/assets/javascripts/discourse/views/modal-body.js.es6
+++ b/app/assets/javascripts/discourse/views/modal-body.js.es6
@@ -7,15 +7,17 @@ export default Ember.View.extend({
   _setupModal() {
     $('#modal-alert').hide();
     $('#discourse-modal').modal('show');
+    Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender);
+  },
 
-    // Focus on first element
+  _afterFirstRender() {
     if (!this.site.mobileView && this.get('focusInput')) {
-      Em.run.schedule('afterRender', () => this.$('input:first').focus());
+      this.$('input:first').focus();
     }
 
     const title = this.get('title');
     if (title) {
-      this.set('controller.controllers.modal.title', title);
+      this.set('controller.modal.title', title);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/views/quote-button.js.es6 b/app/assets/javascripts/discourse/views/quote-button.js.es6
index 665498733d..e638a2cb43 100644
--- a/app/assets/javascripts/discourse/views/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/views/quote-button.js.es6
@@ -13,14 +13,10 @@ export default Ember.View.extend({
   isMouseDown: false,
   isTouchInProgress: false,
 
-  //  The button is visible whenever there is something in the buffer
-  //  (ie. something has been selected)
+  // The button is visible whenever there is something in the buffer
+  // (ie. something has been selected)
   visible: Em.computed.notEmpty('controller.buffer'),
 
-  render(buffer) {
-    buffer.push(I18n.t("post.quote_reply"));
-  },
-
   /**
     Binds to the following global events:
       - `mousedown` to clear the quote button if they click elsewhere.
diff --git a/app/assets/javascripts/discourse/views/reply-button.js.es6 b/app/assets/javascripts/discourse/views/reply-button.js.es6
deleted file mode 100644
index 876b417ec6..0000000000
--- a/app/assets/javascripts/discourse/views/reply-button.js.es6
+++ /dev/null
@@ -1,23 +0,0 @@
-import ButtonView from 'discourse/views/button';
-
-export default ButtonView.extend({
-  classNames: ['btn', 'btn-primary', 'create'],
-  helpKey: 'topic.reply.help',
-
-  text: function() {
-    var archetypeCapitalized = this.get('controller.content.archetype').capitalize();
-    var customTitle = this.get("parentView.replyButtonText" + archetypeCapitalized);
-    if (customTitle) { return customTitle; }
-
-    return I18n.t("topic.reply.title");
-  }.property(),
-
-  renderIcon: function(buffer) {
-    buffer.push("<i class='fa fa-reply'></i>");
-  },
-
-  click: function() {
-    this.get('controller').send('replyToPost');
-  }
-});
-
diff --git a/app/assets/javascripts/discourse/views/share-button.js.es6 b/app/assets/javascripts/discourse/views/share-button.js.es6
deleted file mode 100644
index cac2134277..0000000000
--- a/app/assets/javascripts/discourse/views/share-button.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-import ButtonView from 'discourse/views/button';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-
-export default ButtonView.extend({
-  classNames: ['share'],
-  textKey: 'topic.share.title',
-  helpKey: 'topic.share.help',
-  'data-share-url': Em.computed.alias('topic.shareUrl'),
-  topic: Em.computed.alias('controller.model'),
-
-  renderIcon(buffer) {
-    buffer.push(iconHTML("link"));
-  }
-});
diff --git a/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 b/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6
index b28b1e9c34..4ece5f553f 100644
--- a/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6
+++ b/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6
@@ -1,45 +1,2 @@
-import ContainerView from 'discourse/views/container';
-import { on } from 'ember-addons/ember-computed-decorators';
-
-export default ContainerView.extend({
-  elementId: 'topic-footer-main-buttons',
-
-  @on('init')
-  createButtons() {
-    const mobileView = this.site.mobileView;
-
-    const topic = this.get('topic');
-
-    if (!mobileView && this.currentUser.get('canManageTopic')) {
-      const viewArgs = { topic, delegated: this.get('topicDelegated'), openUpwards: true };
-      this.attachViewWithArgs(viewArgs, 'topic-admin-menu-button');
-    }
-
-    if (!topic.get('isPrivateMessage')) {
-      if (mobileView) {
-        this.attachViewWithArgs({ topic }, 'topic-footer-mobile-dropdown');
-      } else {
-        // We hide some controls from private messages
-        this.attachViewClass('bookmark-button');
-        this.attachViewClass('share-button');
-        if (this.get('topic.details.can_flag_topic')) {
-          this.attachViewClass('flag-topic-button');
-        }
-      }
-    }
-
-    if (!mobileView && this.get('topic.details.can_invite_to')) {
-      this.attachViewClass('invite-reply-button');
-    }
-
-    if (topic.get('isPrivateMessage')) {
-      this.attachViewClass('archive-button');
-    }
-
-    if (this.get('topic.details.can_create_post')) {
-      this.attachViewClass('reply-button');
-    }
-
-    this.trigger('additionalButtons', this);
-  }
-});
+// In case plugins are using the old `additionalButtons` API, don't break
+export default Ember.View.extend();
diff --git a/app/assets/javascripts/discourse/views/topic-list-header-column.js.es6 b/app/assets/javascripts/discourse/views/topic-list-header-column.js.es6
index 7231601158..781fdc131b 100644
--- a/app/assets/javascripts/discourse/views/topic-list-header-column.js.es6
+++ b/app/assets/javascripts/discourse/views/topic-list-header-column.js.es6
@@ -1,5 +1,4 @@
 export default Ember.Object.extend({
-
   localizedName: function(){
     if(this.forceName){
       return this.forceName;
diff --git a/app/assets/javascripts/discourse/views/topic-list-poster.js.es6 b/app/assets/javascripts/discourse/views/topic-list-poster.js.es6
deleted file mode 100644
index 3999134531..0000000000
--- a/app/assets/javascripts/discourse/views/topic-list-poster.js.es6
+++ /dev/null
@@ -1,17 +0,0 @@
-import { renderAvatar } from 'discourse/helpers/user-avatar';
-
-export default Ember.View.extend({
-  tagName: 'a',
-  attributeBindings: ['href', 'data-user-card'],
-  classNameBindings: ['content.extras'],
-
-  user: Em.computed.alias('content.user'),
-  href: Em.computed.alias('user.path'),
-
-  'data-user-card': Em.computed.alias('user.username'),
-
-  render: function(buffer) {
-    var av = renderAvatar(this.get('content'), {usernamePath: 'user.username', imageSize: 'small'});
-    buffer.push(av);
-  }
-});
diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6
index d90420db52..e41bd71130 100644
--- a/app/assets/javascripts/discourse/views/topic.js.es6
+++ b/app/assets/javascripts/discourse/views/topic.js.es6
@@ -93,9 +93,6 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
     this.set('docAt', false);
   },
 
-  offset: 0,
-  hasScrolled: Em.computed.gt("offset", 0),
-
   showTopicInHeader(topic, offset) {
     if (this.get('docAt')) {
       return offset >= this.get('docAt') || topic.get('postStream.firstPostNotLoaded');
@@ -118,7 +115,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
       }
     }
 
-    this.set("offset", offset);
+    this.set('controller.hasScrolled', offset > 0);
 
     const topic = this.get('topic');
     const showTopic = this.showTopicInHeader(topic, offset);
diff --git a/app/assets/javascripts/discourse/views/unknown.js.es6 b/app/assets/javascripts/discourse/views/unknown.js.es6
index 7b974a19bc..3060ed9306 100644
--- a/app/assets/javascripts/discourse/views/unknown.js.es6
+++ b/app/assets/javascripts/discourse/views/unknown.js.es6
@@ -1,7 +1,9 @@
-export default Em.View.extend({
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
+export default Ember.View.extend(bufferedRender({
   classNameBindings: [':container'],
 
-  render: function(buffer) {
+  buildBuffer(buffer) {
     buffer.push(this.get('controller.model'));
   }
-});
+}));
diff --git a/app/assets/javascripts/discourse/views/user.js.es6 b/app/assets/javascripts/discourse/views/user.js.es6
index f0b0ceb85d..0b358f18ee 100644
--- a/app/assets/javascripts/discourse/views/user.js.es6
+++ b/app/assets/javascripts/discourse/views/user.js.es6
@@ -1,3 +1,4 @@
 import ScrollTop from 'discourse/mixins/scroll-top';
 
-export default Ember.View.extend(ScrollTop);
+export default Ember.View.extend(ScrollTop, {
+});
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index f6f50d03f6..7e9fd93496 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -463,11 +463,11 @@ export default createWidget('post', {
 
   undoPostAction(typeId) {
     const post = this.model;
-    return post.get('actions_summary').findProperty('id', typeId).undo(post);
+    return post.get('actions_summary').findBy('id', typeId).undo(post);
   },
 
   deferPostActionFlags(typeId) {
     const post = this.model;
-    return post.get('actions_summary').findProperty('id', typeId).deferFlags(post);
+    return post.get('actions_summary').findBy('id', typeId).deferFlags(post);
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
index dd07753bad..5be3ce3543 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
@@ -44,9 +44,12 @@ createWidget('search-context', {
                   ]));
     }
 
-    result.push(this.attach('link', { href: Discourse.getURL('/search?expanded=true'),
-                                      label: 'show_help',
-                                      className: 'show-help' }));
+    if (!attrs.contextEnabled) {
+      result.push(this.attach('link', { href: attrs.url,
+                                        label: 'show_help',
+                                        className: 'show-help' }));
+    }
+
     result.push(h('div.clearfix'));
     return result;
   },
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 69631028ae..9ed3b8c7d4 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -67,25 +67,41 @@ const SearchHelper = {
 export default createWidget('search-menu', {
   tagName: 'div.search-menu',
 
-  fullSearchUrl() {
+  fullSearchUrl(opts) {
     const contextEnabled = searchData.contextEnabled;
 
     const ctx = contextEnabled ? this.searchContext() : null;
-    const type = Ember.get(ctx, 'type');
+    const type = ctx ? Ember.get(ctx, 'type') : null;
 
     if (contextEnabled && type === 'topic') {
       return;
     }
 
-    let url = '/search?q=' + encodeURIComponent(searchData.term);
-    if (contextEnabled) {
-      if (this.currentUser &&
-          ctx.id.toString().toLowerCase() === this.currentUser.username_lower &&
-          type === "private_messages") {
-        url += ' in:private';
-      } else {
-        url += encodeURIComponent(" " + type + ":" + ctx.id);
+    let url = '/search';
+    const params = [];
+
+    if (searchData.term) {
+      let query = '';
+
+      query += `q=${encodeURIComponent(searchData.term)}`;
+
+      if (contextEnabled) {
+        if (this.currentUser &&
+            ctx.id.toString().toLowerCase() === this.currentUser.username_lower &&
+            type === "private_messages") {
+          query += ' in:private';
+        } else {
+          query += encodeURIComponent(" " + type + ":" + ctx.id);
+        }
       }
+
+      if (query) params.push(query);
+    }
+
+    if (opts && opts.expanded) params.push('expanded=true');
+
+    if (params.length > 0) {
+      url = `${url}?${params.join("&")}`;
     }
 
     return Discourse.getURL(url);
@@ -94,8 +110,13 @@ export default createWidget('search-menu', {
   panelContents() {
     const contextEnabled = searchData.contextEnabled;
 
-    const results = [this.attach('search-term', { value: searchData.term, contextEnabled }),
-                     this.attach('search-context', { contextEnabled })];
+    const results = [
+      this.attach('search-term', { value: searchData.term, contextEnabled }),
+      this.attach('search-context', {
+        contextEnabled,
+        url: this.fullSearchUrl({ expanded: true })
+      })
+    ];
 
     if (searchData.term) {
       if (searchData.loading) {
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index a9ed81102b..eac9551e16 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -59,7 +59,13 @@ createWidget('timeline-scroller', {
       contents.push(h('div.timeline-ago', timelineDate(date)));
     }
 
-    return [ h('div.timeline-handle'), h('div.timeline-scroller-content', contents) ];
+    let result = [ h('div.timeline-handle'), h('div.timeline-scroller-content', contents) ];
+
+    if (attrs.fullScreen) {
+      result = [result[1], result[0]];
+    }
+
+    return result;
   },
 
   drag(e) {
@@ -140,7 +146,7 @@ createWidget('timeline-scrollarea', {
 
     const result = [
       this.attach('timeline-padding', { height: before }),
-      this.attach('timeline-scroller', position),
+      this.attach('timeline-scroller', _.merge(position, {fullScreen: attrs.fullScreen})),
       this.attach('timeline-padding', { height: after })
     ];
 
@@ -221,9 +227,16 @@ export default createWidget('topic-timeline', {
 
     let result = [];
 
-    if (attrs.mobileView) {
-      const titleHTML = new RawHtml({ html: `<span>${topic.get('fancyTitle')}</span>` });
-      result.push(h('h3.title', titleHTML));
+    if (attrs.fullScreen) {
+      let titleHTML = "";
+      if (attrs.mobileView) {
+        titleHTML = new RawHtml({ html: `<span>${topic.get('fancyTitle')}</span>` });
+      }
+      result.push(h('h3.title', this.attach('link', {
+        contents: ()=>titleHTML,
+        className: 'fancy-title',
+        action: 'jumpTop'
+      })));
     }
 
 
@@ -236,21 +249,23 @@ export default createWidget('topic-timeline', {
     }
 
     const bottomAge = relativeAge(new Date(topic.last_posted_at), { addAgo: true, defaultFormat: timelineDate });
-    result = result.concat([this.attach('link', {
+    let scroller = [h('div.timeline-date-wrapper', this.attach('link', {
                               className: 'start-date',
                               rawLabel: timelineDate(createdAt),
                               action: 'jumpTop'
-                            }),
+                            })),
                             this.attach('timeline-scrollarea', attrs),
-                            this.attach('link', {
+                            h('div.timeline-date-wrapper', this.attach('link', {
                               className: 'now-date',
                               rawLabel: bottomAge,
                               action: 'jumpBottom'
-                            })]);
+                            }))];
 
-    if (currentUser) {
-      const controls = [];
-      if (!attrs.fullScreen && attrs.topic.get('details.can_create_post')) {
+    result = result.concat([h('div.timeline-scrollarea-wrapper', scroller)]);
+
+    const controls = [];
+    if (currentUser && !attrs.fullScreen) {
+      if (attrs.topic.get('details.can_create_post')) {
         controls.push(this.attach('button', {
           className: 'btn create',
           icon: 'reply',
@@ -259,9 +274,21 @@ export default createWidget('topic-timeline', {
         }));
       }
 
-      if (currentUser && !attrs.fullScreen) {
+      if (currentUser) {
         controls.push(this.attach('topic-notifications-button', { topic }));
       }
+    }
+
+    if (attrs.fullScreen) {
+      controls.push(this.attach('button', {
+        className: 'btn jump-to-post',
+        title: 'topic.progress.jump_prompt_long',
+        label: 'topic.progress.jump_prompt',
+        action: 'jumpToPostPrompt'
+      }));
+    }
+
+    if (controls.length > 0) {
       result.push(h('div.timeline-footer-controls', controls));
     }
 
diff --git a/app/assets/javascripts/env.js b/app/assets/javascripts/env.js
index d5fe882360..12deda108c 100644
--- a/app/assets/javascripts/env.js
+++ b/app/assets/javascripts/env.js
@@ -1,3 +1,4 @@
 window.ENV = { };
 window.EmberENV = window.EmberENV || {};
-window.EmberENV['FORCE_JQUERY'] = true;
+window.EmberENV.FORCE_JQUERY = true;
+window.EmberENV._ENABLE_LEGACY_VIEW_SUPPORT = true;
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 91a0044d67..440edeee65 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -57,7 +57,6 @@
 //= require ./discourse/models/user-badge
 //= require ./discourse/controllers/discovery-sortable
 //= require ./discourse/controllers/navigation/default
-//= require ./discourse/views/container
 //= require ./discourse/views/modal-body
 //= require ./discourse/views/flag
 //= require ./discourse/components/edit-category-panel
@@ -79,7 +78,6 @@
 //= require ./discourse/routes/user-activity-stream
 //= require ./discourse/routes/topic-from-params
 //= require ./discourse/components/text-field
-//= require ./discourse/components/visible
 //= require ./discourse/components/conditional-loading-spinner
 //= require ./discourse/helpers/user-avatar
 //= require ./discourse/helpers/cold-age-class
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
index a24375efef..7555bebdf3 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
@@ -389,7 +389,7 @@ export function cook(raw, opts) {
 
   preProcessors.forEach(p => raw = p(raw));
 
-  const whiteLister = new WhiteLister(opts.features);
+  const whiteLister = new WhiteLister(opts);
 
   const tree = parser.toHTMLTree(raw, 'Discourse');
   let result = opts.sanitizer(parser.renderJsonML(parseTree(tree, opts)), whiteLister);
@@ -500,7 +500,7 @@ function invalidBoundary(args, prev) {
 
   if (args.wordBoundary && (!last.match(/\W$/))) { return true; }
   if (args.spaceBoundary && (!last.match(/\s$/))) { return true; }
-  if (args.spaceOrTagBoundary && (!last.match(/(\s|\>)$/))) { return true; }
+  if (args.spaceOrTagBoundary && (!last.match(/(\s|\>|\()$/))) { return true; }
 }
 
 function countLines(str) {
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js.es6
index 31733ab0d5..90be7612c0 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -1,19 +1,12 @@
-/**
-  A helper for looking up oneboxes and displaying them
-
-  For now it only stores in a local Javascript Object, in future we can change it so it uses localStorage
-  or some other mechanism.
-**/
-
 const localCache = {};
 const failedCache = {};
 
-// Perform a lookup of a onebox based an anchor element. It will insert a loading
-// indicator and remove it when the loading is complete or fails.
+// Perform a lookup of a onebox based an anchor element.
+// It will insert a loading indicator and remove it when the loading is complete or fails.
 export function load(e, refresh, ajax) {
-  var $elem = $(e);
+  const $elem = $(e);
 
-  // If the onebox has loaded, return
+  // If the onebox has loaded or is loading, return
   if ($elem.data('onebox-loaded')) return;
   if ($elem.hasClass('loading-onebox')) return;
 
@@ -41,7 +34,7 @@ export function load(e, refresh, ajax) {
   }).then(html => {
     localCache[url] = html;
     $elem.replaceWith(html);
-  }, function() {
+  }, () => {
     failedCache[url] = true;
   }).finally(() => {
     $elem.removeClass('loading-onebox');
diff --git a/app/assets/javascripts/pretty-text/pretty-text.js.es6 b/app/assets/javascripts/pretty-text/pretty-text.js.es6
index a70da34ccf..2769502ff8 100644
--- a/app/assets/javascripts/pretty-text/pretty-text.js.es6
+++ b/app/assets/javascripts/pretty-text/pretty-text.js.es6
@@ -48,6 +48,7 @@ export function buildOptions(state) {
     getCurrentUser,
     currentUser,
     mentionLookup: state.mentionLookup,
+    allowedHrefSchemes: siteSettings.allowed_href_schemes ? siteSettings.allowed_href_schemes.split('|') : null
   };
 
   _registerFns.forEach(fn => fn(siteSettings, options, state));
@@ -71,6 +72,6 @@ export default class {
   }
 
   sanitize(html) {
-    return this.opts.sanitizer(html, new WhiteLister(this.opts.features));
+    return this.opts.sanitizer(html, new WhiteLister(this.opts));
   }
 };
diff --git a/app/assets/javascripts/pretty-text/sanitizer.js.es6 b/app/assets/javascripts/pretty-text/sanitizer.js.es6
index a643169c39..d865c9be5c 100644
--- a/app/assets/javascripts/pretty-text/sanitizer.js.es6
+++ b/app/assets/javascripts/pretty-text/sanitizer.js.es6
@@ -42,7 +42,7 @@ export function escape(string) {
   return string.replace(BAD_CHARS, escapeChar);
 }
 
-export function hrefAllowed(href) {
+export function hrefAllowed(href, extraHrefMatchers) {
   // escape single quotes
   href = href.replace(/'/g, "%27");
 
@@ -54,6 +54,12 @@ export function hrefAllowed(href) {
   if (/^#[\w\.\-]+/i.test(href)) { return href; }
   // mailtos
   if (/^mailto:[\w\.\-@]+/i.test(href)) { return href; }
+
+  if (extraHrefMatchers && extraHrefMatchers.length > 0) {
+    for (let i=0; i<extraHrefMatchers.length; i++) {
+      if (extraHrefMatchers[i].test(href)) { return href; }
+    }
+  }
 }
 
 export function sanitize(text, whiteLister) {
@@ -62,7 +68,13 @@ export function sanitize(text, whiteLister) {
   // Allow things like <3 and <_<
   text = text.replace(/<([^A-Za-z\/\!]|$)/g, "&lt;$1");
 
-  const whiteList = whiteLister.getWhiteList();
+  const whiteList = whiteLister.getWhiteList(),
+        allowedHrefSchemes = whiteLister.getAllowedHrefSchemes();
+  let extraHrefMatchers = null;
+
+  if (allowedHrefSchemes && allowedHrefSchemes.length > 0) {
+    extraHrefMatchers = [new RegExp('^(' + allowedHrefSchemes.join('|') + '):\/\/[\\w\\.\\-]+','i')];
+  }
 
   let result = xss(text, {
     whiteList: whiteList.tagList,
@@ -75,8 +87,8 @@ export function sanitize(text, whiteLister) {
         const forAttr = forTag[name];
         if ((forAttr && (forAttr.indexOf('*') !== -1 || forAttr.indexOf(value) !== -1)) ||
             (name.indexOf('data-') === 0 && forTag['data-*']) ||
-            ((tag === 'a' && name === 'href') && hrefAllowed(value)) ||
-            (tag === 'img' && name === 'src' && (/^data:image.*$/i.test(value) || hrefAllowed(value))) ||
+            ((tag === 'a' && name === 'href') && hrefAllowed(value, extraHrefMatchers)) ||
+            (tag === 'img' && name === 'src' && (/^data:image.*$/i.test(value) || hrefAllowed(value, extraHrefMatchers))) ||
             (tag === 'iframe' && name === 'src' && _validIframes.some(i => i.test(value)))) {
           return attr(name, value);
         }
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index 9c3a85439a..bfe7b8a0b6 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -13,12 +13,13 @@ function concatUniq(src, elems) {
 }
 
 export default class WhiteLister {
-  constructor(features) {
-    features.default = true;
+  constructor(options) {
+    options.features.default = true;
 
-    this._featureKeys = Object.keys(features).filter(f => features[f]);
+    this._featureKeys = Object.keys(options.features).filter(f => options.features[f]);
     this._key = this._featureKeys.join(':');
-    this._features = features;
+    this._features = options.features;
+    this._options = options||{};
   }
 
   getCustom() {
@@ -54,6 +55,10 @@ export default class WhiteLister {
     }
     return _whiteLists[this._key];
   }
+
+  getAllowedHrefSchemes() {
+    return this._options.allowedHrefSchemes || [];
+  }
 }
 
 // Builds our object that represents whether something is sanitized for a particular feature.
diff --git a/app/assets/javascripts/wizard/components/invite-list-user.js.es6 b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
index c54290fb83..1f8396bcc3 100644
--- a/app/assets/javascripts/wizard/components/invite-list-user.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
@@ -5,7 +5,7 @@ export default Ember.Component.extend({
 
   @computed('user.role')
   roleName(role) {
-    return this.get('roles').findProperty('id', role).label;
+    return this.get('roles').findBy('id', role).label;
   },
 
   actions: {
diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js.es6
index 6786458b5f..c3eb9be06e 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list.js.es6
@@ -48,7 +48,7 @@ export default Ember.Component.extend({
       }
 
       const users = this.get('users');
-      if (users.findProperty('email', user.email)) {
+      if (users.findBy('email', user.email)) {
         return this.set('invalid', true);
       }
 
diff --git a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6 b/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
index 4b645756a2..8bbbff23d5 100644
--- a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
+++ b/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
@@ -1,11 +1,14 @@
+import { registerHelpers } from 'discourse-common/lib/helpers';
+
 export default {
   name: 'load-helpers',
 
-  initialize() {
+  initialize(container, registry) {
     Object.keys(requirejs.entries).forEach(entry => {
       if ((/\/helpers\//).test(entry)) {
         require(entry, null, null, true);
       }
     });
+    registerHelpers(registry);
   }
 };
diff --git a/app/assets/javascripts/wizard/models/step.js.es6 b/app/assets/javascripts/wizard/models/step.js.es6
index 2d6e9b3532..368e6f0f0c 100644
--- a/app/assets/javascripts/wizard/models/step.js.es6
+++ b/app/assets/javascripts/wizard/models/step.js.es6
@@ -33,7 +33,7 @@ export default Ember.Object.extend(ValidState, {
   },
 
   fieldError(id, description) {
-    const field = this.get('fields').findProperty('id', id);
+    const field = this.get('fields').findBy('id', id);
     if (field) {
       field.setValid(false, description);
     }
diff --git a/app/assets/javascripts/wizard/models/wizard.js.es6 b/app/assets/javascripts/wizard/models/wizard.js.es6
index 68a4f56c6f..d98ba5e51e 100644
--- a/app/assets/javascripts/wizard/models/wizard.js.es6
+++ b/app/assets/javascripts/wizard/models/wizard.js.es6
@@ -8,13 +8,13 @@ const Wizard = Ember.Object.extend({
   totalSteps: length => length,
 
   getTitle() {
-    const titleStep = this.get('steps').findProperty('id', 'forum-title');
+    const titleStep = this.get('steps').findBy('id', 'forum-title');
     if (!titleStep) { return; }
     return titleStep.get('fieldsById.title.value');
   },
 
   getLogoUrl() {
-    const logoStep = this.get('steps').findProperty('id', 'logos');
+    const logoStep = this.get('steps').findBy('id', 'logos');
     if (!logoStep) { return; }
     return logoStep.get('fieldsById.logo_url.value');
 
@@ -22,7 +22,7 @@ const Wizard = Ember.Object.extend({
 
   // A bit clunky, but get the current colors from the appropriate step
   getCurrentColors() {
-    const colorStep = this.get('steps').findProperty('id', 'colors');
+    const colorStep = this.get('steps').findBy('id', 'colors');
     if (!colorStep) { return; }
 
     const themeChoice = colorStep.get('fieldsById.theme_id');
@@ -34,7 +34,7 @@ const Wizard = Ember.Object.extend({
     const choices = themeChoice.get('choices');
     if (!choices) { return; }
 
-    const option = choices.findProperty('id', themeId);
+    const option = choices.findBy('id', themeId);
     if (!option) { return; }
 
     return option.data.colors;
diff --git a/app/assets/javascripts/wizard/routes/step.js.es6 b/app/assets/javascripts/wizard/routes/step.js.es6
index 152bf7a497..1648651a69 100644
--- a/app/assets/javascripts/wizard/routes/step.js.es6
+++ b/app/assets/javascripts/wizard/routes/step.js.es6
@@ -1,7 +1,7 @@
 export default Ember.Route.extend({
   model(params) {
     const allSteps = this.modelFor('application').steps;
-    const step = allSteps.findProperty('id', params.step_id);
+    const step = allSteps.findBy('id', params.step_id);
     return step ? step : allSteps[0];
   },
 
diff --git a/app/assets/javascripts/wizard/test/helpers/component-test.js.es6 b/app/assets/javascripts/wizard/test/helpers/component-test.js.es6
index 806c9af8a0..2a299d5457 100644
--- a/app/assets/javascripts/wizard/test/helpers/component-test.js.es6
+++ b/app/assets/javascripts/wizard/test/helpers/component-test.js.es6
@@ -4,7 +4,7 @@ export function componentTest(name, opts) {
   opts = opts || {};
 
   test(name, function(assert) {
-    initializer.initialize();
+    initializer.initialize(this.container, this.registry);
 
     if (opts.setup) {
       opts.setup.call(this);
diff --git a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6 b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
index 7d701562b3..0b8118ed00 100644
--- a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
+++ b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
@@ -8,7 +8,7 @@ export default function() {
   Ember.run(() => app = Wizard.create({ rootElement: '#ember-testing' }));
 
   if (!started) {
-    initializer.initialize();
+    initializer.initialize(app.__container__, app.registry);
     app.start();
     started = true;
   }
diff --git a/app/assets/javascripts/wizard/wizard.js.es6 b/app/assets/javascripts/wizard/wizard.js.es6
index 5881ac473b..466b656d83 100644
--- a/app/assets/javascripts/wizard/wizard.js.es6
+++ b/app/assets/javascripts/wizard/wizard.js.es6
@@ -9,7 +9,7 @@ export default Ember.Application.extend({
       if (/\/initializers\//.test(key)) {
         const module = require(key, null, null, true);
         if (!module) { throw new Error(key + ' must export an initializer.'); }
-        this.instanceInitializer(module.default);
+        this.initializer(module.default);
       }
     });
   }
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 0fda6b0163..34abe80e41 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -209,6 +209,10 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
   }
 }
 
+ol.category-breadcrumb.hidden {
+  display: none;
+}
+
 ol.category-breadcrumb {
   display: block;
   float: left;
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 3aa43fd055..bb74942aa4 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -32,6 +32,11 @@
   &.timeline-fullscreen.show {
     max-height: 700px;
     transition: max-height 0.4s ease-out;
+    .topic-timeline {
+      .timeline-footer-controls {
+        display: inherit;
+      }
+    }
   }
 
   &.timeline-fullscreen {
@@ -44,15 +49,86 @@
     left: 0;
     right: 0;
     border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 90%), scale-color($secondary, $lightness: 90%));
-    padding-top: 15px;
+    padding-top: 20px;
     z-index: 100000;
-    .timeline-scrollarea {
-      max-width: 200px;
-    }
     .topic-timeline {
-      width: auto;
-      margin-left: 1.5em;
-      margin-right: 1.5em;
+      width: 100%;
+      margin-left: 0;
+      margin-right: 0;
+      display: table;
+      .timeline-date-wrapper {
+        float: right;
+        text-align: right;
+        font-size: 1.1em;
+      }
+      .title {
+        margin-top: 0;
+        padding-left: 1em;
+        display: table-cell;
+        vertical-align: top;
+        line-height: 1.3em;
+        a {
+          color: $primary;
+        }
+      }
+      .timeline-last-read {
+        right: 0px;
+        margin-left: 0;
+        i.progress {
+          margin-right: -3px;
+          margin-left: 1em;
+        }
+      }
+      .timeline-footer-controls {
+        display: none;
+        position: absolute;
+        bottom: 10px;
+        left: 10px;
+
+        button {
+          float: none;
+          display: block;
+          margin-bottom: 10px;
+        }
+      }
+      .timeline-scrollarea-wrapper {
+        display: table-cell;
+        padding-bottom: 20px;
+        padding-right: 1.5em;
+        width: 100px;
+      }
+      .timeline-scrollarea {
+        border-left: 0;
+        border-right-style: solid;
+        border-right-width: 1px;
+        max-width: 120px;
+        float: right;
+
+        .timeline-scroller {
+          position: relative;
+          margin-right: -1.5em;
+          padding-right: 1.5em;
+          justify-content: flex-end;
+          .timeline-scroller-content {
+            text-align: right;
+            padding-left: 0;
+            padding-right: 1em;
+          }
+          .timeline-handle {
+            float: none;
+            width: 11px;
+            position: relative;
+            right: -6px;
+          }
+        }
+      }
+    }
+
+
+    .timeline-scrollarea-wrapper::after {
+      content: "";
+      display: table;
+      clear: both;
     }
 
   }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 5014af1a80..a53b90f9ba 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -436,6 +436,11 @@ a.star {
     margin-right: 10px;
     .fa-bookmark.bookmarked { color: $tertiary; }
   }
+
+  .bookmark.bookmarked .fa-bookmark {
+    color: $tertiary;
+  }
+
   .notification-options p {
     display: inline-block;
   }
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 0afc6a2124..4e51a5a8f4 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -189,3 +189,9 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
     width: 95% !important;
   }
 }
+
+// make mobile timeline top and bottom dates easier to select
+.topic-timeline { 
+  .start-date { font-size: 120%; padding: 5px; }
+  .now-date { font-size: 120%; padding: 5px; }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 69df6317b3..245478866a 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -496,4 +496,14 @@ body.wizard {
   .invite-list .new-user { flex-direction: column !important; align-items: inherit !important; }
   .invite-list .new-user .invite-email { width: 100% !important; margin-bottom: 5px !important; }
   .invite-list .add-user { margin-top: 5px !important; }
+
+  canvas {
+    max-width: 365px;
+  }
+
+  .wizard-step-logos, .wizard-step-icons {
+    canvas {
+      max-width: 225px;
+    }
+  }
 }
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 81923258be..94ef113634 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,10 +1,9 @@
 class Admin::GroupsController < Admin::AdminController
 
   def index
-    groups = Group.order(:name)
+    groups = Group.order(:name).where("id <> ?", Group::AUTO_GROUPS[:everyone])
 
-    if search = params[:search]
-      search = search.to_s
+    if search = params[:search].to_s
       groups = groups.where("name ILIKE ?", "%#{search}%")
     end
 
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 8b59196ef0..9890a40c4b 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -238,6 +238,8 @@ class CategoriesController < ApplicationController
                         :slug,
                         :allow_badges,
                         :topic_template,
+                        :sort_order,
+                        :sort_ascending,
                         :custom_fields => [params[:custom_fields].try(:keys)],
                         :permissions => [*p.try(:keys)],
                         :allowed_tags => [],
diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 70a729147c..6158534b40 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -44,8 +44,7 @@ class DirectoryItemsController < ApplicationController
       end
     end
 
-    result = result.order('users.username')
-    result_count = result.dup.count
+    result_count = result.count
     result = result.limit(PAGE_SIZE).offset(PAGE_SIZE * page).to_a
 
     more_params = params.slice(:period, :order, :asc)
diff --git a/app/controllers/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb
index 7e6b8c4d3b..01bbf5bfcc 100644
--- a/app/controllers/finish_installation_controller.rb
+++ b/app/controllers/finish_installation_controller.rb
@@ -2,7 +2,7 @@ class FinishInstallationController < ApplicationController
   skip_before_filter :check_xhr, :preload_json, :redirect_to_login_if_required
   layout 'finish_installation'
 
-  before_filter :ensure_no_admins, except: ['confirm_email']
+  before_filter :ensure_no_admins, except: ['confirm_email', 'resend_email']
 
   def index
   end
@@ -35,6 +35,17 @@ class FinishInstallationController < ApplicationController
     @email = session[:registered_email]
   end
 
+  def resend_email
+    @email = session[:registered_email]
+    @user = User.where(email: @email).first
+    if @user.present?
+      @email_token = @user.email_tokens.unconfirmed.active.first
+      if @email_token.present?
+        Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
+      end
+    end
+  end
+
   protected
 
     def redirect_confirm(email)
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index a710d854e8..d0c6969e28 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -12,8 +12,4 @@ class ForumsController < ApplicationController
     end
   end
 
-  def home_redirect
-    redirect_to path('/')
-  end
-
 end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 311a11b2f9..b4024a280a 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -128,6 +128,8 @@ class GroupsController < ApplicationController
       user = User.find(params[:user_id])
     elsif params[:username].present?
       user = User.find_by_username(params[:username])
+    elsif params[:user_email].present?
+      user = User.find_by_email(params[:user_email])
     else
       raise Discourse::InvalidParameters.new('user_id or username must be present')
     end
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 0731bd0d25..b2c3c85a3f 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -128,7 +128,7 @@ class PostsController < ApplicationController
     end
 
     guardian.ensure_can_see!(post)
-    redirect_to post.url
+    redirect_to path(post.url)
   end
 
   def create
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index bbf7a69c3e..43e6f8aee9 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -16,12 +16,12 @@ class TagsController < ::ApplicationController
                          .where("id in (?)", guardian.allowed_category_ids)
                          .preload(:tags)
     category_tag_counts = categories.map do |c|
-      h = Tag.category_tags_by_count_query(c, limit: 300).count
+      h = Tag.category_tags_by_count_query(c, limit: 300).count(Tag::COUNT_ARG)
       h.merge!(c.tags.where.not(name: h.keys).inject({}) { |sum,t| sum[t.name] = 0; sum }) # unused tags
       {id: c.id, tags: self.class.tag_counts_json(h)}
     end
 
-    tag_counts = self.class.tags_by_count(guardian, limit: 300).count
+    tag_counts = self.class.tags_by_count(guardian, limit: 300).count(Tag::COUNT_ARG)
     @tags = self.class.tag_counts_json(tag_counts)
 
     @description_meta = I18n.t("tags.title")
@@ -145,17 +145,7 @@ class TagsController < ::ApplicationController
       }
     )
 
-    tags = tags_with_counts.count.map {|t, c| { id: t, text: t, count: c } }
-
-    unused_tags = DiscourseTagging.filter_allowed_tags(
-      Tag.where(topic_count: 0),
-      guardian,
-      { for_input: params[:filterForInput], term: params[:q], category: category, selected_tags: params[:selected_tags] }
-    )
-
-    unused_tags.each do |t|
-      tags << { id: t.name, text: t.name, count: 0 }
-    end
+    tags = tags_with_counts.count(Tag::COUNT_ARG).map {|t, c| { id: t, text: t, count: c } }
 
     json_response = { results: tags }
 
diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 094c234efb..231329a7c6 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -91,7 +91,7 @@ class WebhooksController < ActionController::Base
   def sparkpost
     events = params["_json"] || [params]
     events.each do |event|
-      message_id = event["msys"]["message_event"]["message_id"] rescue nil
+      message_id = event["msys"]["message_event"]["rcpt_meta"]["message_id"] rescue nil
       bounce_class = event["msys"]["message_event"]["bounce_class"] rescue nil
       next unless message_id && bounce_class
 
@@ -133,6 +133,8 @@ class WebhooksController < ActionController::Base
       return if email_log.nil?
 
       email_log.update_columns(bounced: true)
+      return if email_log.user.nil? || email_log.user.email.blank?
+
       Email::Receiver.update_bounce_score(email_log.user.email, bounce_score)
     end
 
diff --git a/app/jobs/regular/download_avatar_from_url.rb b/app/jobs/regular/download_avatar_from_url.rb
new file mode 100644
index 0000000000..83e687fed9
--- /dev/null
+++ b/app/jobs/regular/download_avatar_from_url.rb
@@ -0,0 +1,20 @@
+module Jobs
+
+  class DownloadAvatarFromUrl < Jobs::Base
+    sidekiq_options retry: false
+
+    def execute(args)
+      url = args[:url]
+      user_id = args[:user_id]
+
+      raise Discourse::InvalidParameters.new(:url) if url.blank?
+      raise Discourse::InvalidParameters.new(:user_id) if user_id.blank?
+
+      return unless user = User.find_by(id: user_id)
+
+      UserAvatar.import_url_for_user(url, user, override_gravatar: args[:override_gravatar])
+    end
+
+  end
+
+end
diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb
index 6eed13a420..ae5e333e7e 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -16,7 +16,7 @@ module Jobs
       users =
           User.activated.not_blocked.not_suspended.real
           .joins(:user_option)
-          .where(user_options: {mailing_list_mode: true, mailing_list_mode_frequency: 1})
+          .where('user_options.mailing_list_mode AND user_options.mailing_list_mode_frequency > 0')
           .where('NOT EXISTS(
                       SELECT 1
                       FROM topic_users tu
@@ -46,6 +46,11 @@ module Jobs
             next
           end
 
+          if (user.id == post.user_id) && (user.user_option.mailing_list_mode_frequency == 2)
+            skip(user.email, user.id, post.id, I18n.t('email_log.no_echo_mailing_list_mode'))
+            next
+          end
+
           begin
             if message = UserNotifications.mailing_list_notify(user, post)
               EmailLog.unique_email_per_post(post, user) do
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index 50109e2a68..3f6193501d 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -103,7 +103,7 @@ module Jobs
         end
 
         if user.user_option.mailing_list_mode? &&
-           user.user_option.mailing_list_mode_frequency == 1 && # don't catch notifications for users on daily mailing list mode
+           user.user_option.mailing_list_mode_frequency > 0 && # don't catch notifications for users on daily mailing list mode
            (!post.try(:topic).try(:private_message?)) &&
            NOTIFICATIONS_SENT_BY_MAILING_LIST.include?(email_args[:notification_type])
            # no need to log a reason when the mail was already sent via the mailing list job
@@ -127,7 +127,7 @@ module Jobs
         email_args[:email_token] = email_token
       end
 
-      if type == :notify_old_email
+      if type.to_s == "notify_old_email"
         email_args[:new_email] = user.email
       end
 
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index 88d29c0c8a..07aef08d58 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -5,27 +5,29 @@ module Jobs
     def execute(args)
       return unless SiteSetting.clean_up_uploads?
 
-      ignore_urls  = []
-      ignore_urls |= UserProfile.uniq.where("profile_background IS NOT NULL AND profile_background != ''").pluck(:profile_background)
-      ignore_urls |= UserProfile.uniq.where("card_background IS NOT NULL AND card_background != ''").pluck(:card_background)
-      ignore_urls |= Category.uniq.where("logo_url IS NOT NULL AND logo_url != ''").pluck(:logo_url)
-      ignore_urls |= Category.uniq.where("background_url IS NOT NULL AND background_url != ''").pluck(:background_url)
-
       # Any URLs in site settings are fair game
-      ignore_urls |= [SiteSetting.logo_url, SiteSetting.logo_small_url, SiteSetting.favicon_url,
-                      SiteSetting.apple_touch_icon_url]
-
-      ids  = []
-      ids |= PostUpload.uniq.pluck(:upload_id)
-      ids |= User.uniq.where("uploaded_avatar_id IS NOT NULL").pluck(:uploaded_avatar_id)
-      ids |= UserAvatar.uniq.where("gravatar_upload_id IS NOT NULL").pluck(:gravatar_upload_id)
+      ignore_urls = [
+        SiteSetting.logo_url,
+        SiteSetting.logo_small_url,
+        SiteSetting.favicon_url,
+        SiteSetting.apple_touch_icon_url
+      ]
 
       grace_period = [SiteSetting.clean_orphan_uploads_grace_period_hours, 1].max
 
-      result = Upload.where("retain_hours IS NULL OR created_at < current_timestamp - interval '1 hour' * retain_hours")
-      result = result.where("created_at < ?", grace_period.hour.ago)
-      result = result.where("id NOT IN (?)", ids) if !ids.empty?
-      result = result.where("url NOT IN (?)", ignore_urls) if !ignore_urls.empty?
+      result = Upload.where("uploads.retain_hours IS NULL OR uploads.created_at < current_timestamp - interval '1 hour' * uploads.retain_hours")
+        .where("uploads.created_at < ?", grace_period.hour.ago)
+        .joins("LEFT JOIN post_uploads pu ON pu.upload_id = uploads.id")
+        .joins("LEFT JOIN users u ON u.uploaded_avatar_id = uploads.id")
+        .joins("LEFT JOIN user_avatars ua ON (ua.gravatar_upload_id = uploads.id OR ua.custom_upload_id = uploads.id)")
+        .joins("LEFT JOIN user_profiles up ON up.profile_background = uploads.url OR up.card_background = uploads.url")
+        .joins("LEFT JOIN categories c ON c.logo_url = uploads.url OR c.background_url = uploads.url")
+        .where("pu.upload_id IS NULL")
+        .where("u.uploaded_avatar_id IS NULL")
+        .where("ua.gravatar_upload_id IS NULL AND ua.custom_upload_id IS NULL")
+        .where("up.profile_background IS NULL AND up.card_background IS NULL")
+        .where("c.logo_url IS NULL AND c.background_url IS NULL")
+        .where("uploads.url NOT IN (?)", ignore_urls)
 
       result.find_each do |upload|
         next if QueuedPost.where("raw LIKE '%#{upload.sha1}%'").exists?
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index bfcaff65fa..5ac4bd55c3 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -94,7 +94,7 @@ class AdminDashboardData
                       :ram_check, :google_oauth2_config_check,
                       :facebook_config_check, :twitter_config_check,
                       :github_config_check, :s3_config_check, :image_magick_check,
-                      :failing_emails_check, :send_consumer_email_check,
+                      :failing_emails_check,
                       :subfolder_ends_in_slash_check,
                       :pop3_polling_configuration, :email_polling_errored_recently
 
@@ -214,10 +214,6 @@ class AdminDashboardData
     I18n.t('dashboard.failing_emails_warning', num_failed_jobs: num_failed_jobs) if num_failed_jobs > 0
   end
 
-  def send_consumer_email_check
-    I18n.t('dashboard.consumer_email_warning') if Rails.env.production? and ActionMailer::Base.smtp_settings[:address] =~ /gmail\.com|live\.com|yahoo\.com/
-  end
-
   def subfolder_ends_in_slash_check
     I18n.t('dashboard.subfolder_ends_in_slash') if Discourse.base_uri =~ /\/$/
   end
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 9c743f14dd..6851b210dc 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -129,8 +129,10 @@ class Badge < ActiveRecord::Base
   end
 
   def default_icon=(val)
-    self.icon ||= val
-    self.icon = val if self.icon = "fa-certificate"
+    unless self.image
+      self.icon ||= val
+      self.icon = val if self.icon = "fa-certificate"
+    end
   end
 
   def default_name=(val)
diff --git a/app/models/category.rb b/app/models/category.rb
index 2d077cd6fb..3a8cc580e2 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -536,6 +536,8 @@ end
 #  topic_template                :text
 #  suppress_from_homepage        :boolean          default(FALSE)
 #  contains_messages             :boolean
+#  sort_order                    :string
+#  sort_ascending                :boolean
 #
 # Indexes
 #
diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index 11c022583b..c2af572183 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -153,4 +153,6 @@ end
 #  version      :integer          default(1), not null
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
+#  via_wizard   :boolean          default(FALSE), not null
+#  theme_id     :string
 #
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
index 4ada2343ec..9bdcdf50ac 100644
--- a/app/models/directory_item.rb
+++ b/app/models/directory_item.rb
@@ -160,5 +160,12 @@ end
 #
 # Indexes
 #
+#  index_directory_items_on_days_visited             (days_visited)
+#  index_directory_items_on_likes_given              (likes_given)
+#  index_directory_items_on_likes_received           (likes_received)
 #  index_directory_items_on_period_type_and_user_id  (period_type,user_id) UNIQUE
+#  index_directory_items_on_post_count               (post_count)
+#  index_directory_items_on_posts_read               (posts_read)
+#  index_directory_items_on_topic_count              (topic_count)
+#  index_directory_items_on_topics_entered           (topics_entered)
 #
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index fc9b9ce868..69bc0d1e83 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -119,13 +119,15 @@ class DiscourseSingleSignOn < SingleSignOn
         sso_record.last_payload = unsigned_payload
         sso_record.external_id = external_id
       else
-        UserAvatar.import_url_for_user(avatar_url, user) if avatar_url.present?
-        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)
+        Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id) if avatar_url.present?
+        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
 
@@ -148,12 +150,11 @@ class DiscourseSingleSignOn < SingleSignOn
     avatar_missing = user.uploaded_avatar_id.nil? || !Upload.exists?(user.uploaded_avatar_id)
 
     if (avatar_missing || avatar_force_update || SiteSetting.sso_overrides_avatar) && avatar_url.present?
+      avatar_changed = sso_record.external_avatar_url != avatar_url
 
-        avatar_changed = sso_record.external_avatar_url != avatar_url
-
-        if avatar_force_update || avatar_changed || avatar_missing
-           UserAvatar.import_url_for_user(avatar_url, user)
-        end
+      if avatar_force_update || avatar_changed || avatar_missing
+        Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id)
+      end
     end
 
     # change external attributes for sso record
diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb
index 8aed9286a9..d831a85666 100644
--- a/app/models/embeddable_host.rb
+++ b/app/models/embeddable_host.rb
@@ -48,9 +48,10 @@ end
 #
 # Table name: embeddable_hosts
 #
-#  id          :integer          not null, primary key
-#  host        :string           not null
-#  category_id :integer          not null
-#  created_at  :datetime
-#  updated_at  :datetime
+#  id             :integer          not null, primary key
+#  host           :string           not null
+#  category_id    :integer          not null
+#  created_at     :datetime
+#  updated_at     :datetime
+#  path_whitelist :string
 #
diff --git a/app/models/facebook_user_info.rb b/app/models/facebook_user_info.rb
index 9695859801..eb99611310 100644
--- a/app/models/facebook_user_info.rb
+++ b/app/models/facebook_user_info.rb
@@ -18,6 +18,10 @@ end
 #  link             :string
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
+#  avatar_url       :string
+#  about_me         :text
+#  location         :string
+#  website          :text
 #
 # Indexes
 #
diff --git a/app/models/group.rb b/app/models/group.rb
index 772f689f06..dcb2b6e9e6 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -149,17 +149,15 @@ class Group < ActiveRecord::Base
       group.save!
     end
 
-    group.name = I18n.t("groups.default_names.#{name}")
-
     # don't allow shoddy localization to break this
-    validator = UsernameValidator.new(group.name)
-    unless validator.valid_format?
-      group.name = name
-    end
+    localized_name = I18n.t("groups.default_names.#{name}")
+    validator = UsernameValidator.new(localized_name)
+    group.name = validator.valid_format? ? localized_name : name
 
     # the everyone group is special, it can include non-users so there is no
     # way to have the membership in a table
     if name == :everyone
+      group.visible = false
       group.save!
       return group
     end
@@ -500,6 +498,9 @@ end
 #  grant_trust_level                  :integer
 #  incoming_email                     :string
 #  has_messages                       :boolean          default(FALSE), not null
+#  flair_url                          :string
+#  flair_bg_color                     :string
+#  flair_color                        :string
 #
 # Indexes
 #
diff --git a/app/models/invite.rb b/app/models/invite.rb
index c765908101..989631d2bd 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -285,6 +285,7 @@ end
 #  deleted_at     :datetime
 #  deleted_by_id  :integer
 #  invalidated_at :datetime
+#  moderator      :boolean          default(FALSE), not null
 #
 # Indexes
 #
diff --git a/app/models/mailing_list_mode_site_setting.rb b/app/models/mailing_list_mode_site_setting.rb
index b2a8291d00..9a8241c1f0 100644
--- a/app/models/mailing_list_mode_site_setting.rb
+++ b/app/models/mailing_list_mode_site_setting.rb
@@ -9,7 +9,8 @@ class MailingListModeSiteSetting < EnumSiteSetting
   def self.values
     @values ||= [
       { name: 'user.mailing_list_mode.daily',      value:  0 },
-      { name: 'user.mailing_list_mode.individual', value:  1 }
+      { name: 'user.mailing_list_mode.individual', value:  1 },
+      { name: 'user.mailing_list_mode.individual_no_echo', value:  2 }
     ]
   end
 
diff --git a/app/models/post.rb b/app/models/post.rb
index fcc5e0c818..84566d5a8a 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -522,7 +522,11 @@ class Post < ActiveRecord::Base
 
   before_save do
     self.last_editor_id ||= user_id
-    self.cooked = cook(raw, topic_id: topic_id) unless new_record?
+
+    if !new_record? && raw_changed?
+      self.cooked = cook(raw, topic_id: topic_id)
+    end
+
     self.baked_at = Time.new
     self.baked_version = BAKED_VERSION
   end
@@ -715,6 +719,7 @@ end
 #  raw_email               :text
 #  public_version          :integer          default(1), not null
 #  action_code             :string
+#  image_url               :string
 #
 # Indexes
 #
diff --git a/app/models/single_sign_on_record.rb b/app/models/single_sign_on_record.rb
index cb1219855f..df2394dbda 100644
--- a/app/models/single_sign_on_record.rb
+++ b/app/models/single_sign_on_record.rb
@@ -15,7 +15,7 @@ end
 #  external_username   :string
 #  external_email      :string
 #  external_name       :string
-#  external_avatar_url :string
+#  external_avatar_url :string(1000)
 #
 # Indexes
 #
diff --git a/app/models/tag.rb b/app/models/tag.rb
index f6d4661b2f..95a944776c 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -12,8 +12,17 @@ class Tag < ActiveRecord::Base
   has_many :tag_group_memberships
   has_many :tag_groups, through: :tag_group_memberships
 
+  COUNT_ARG = "topic_tags.id"
+
+  # Apply more activerecord filters to the tags_by_count_query, and then
+  # fetch the result with .count(Tag::COUNT_ARG).
+  #
+  # e.g., Tag.tags_by_count_query.where("topics.category_id = ?", category.id).count(Tag::COUNT_ARG)
   def self.tags_by_count_query(opts={})
-    q = TopicTag.joins(:tag, :topic).group("topic_tags.tag_id, tags.name").order('count_all DESC')
+    q = Tag.joins("LEFT JOIN topic_tags ON tags.id = topic_tags.tag_id")
+           .joins("LEFT JOIN topics ON topics.id = topic_tags.topic_id")
+           .group("tags.id, tags.name")
+           .order('count_topic_tags_id DESC')
     q = q.limit(opts[:limit]) if opts[:limit]
     q
   end
@@ -37,7 +46,7 @@ class Tag < ActiveRecord::Base
       category: category
     )
 
-    tags.count.map {|name, _| name}
+    tags.count(COUNT_ARG).map {|name, _| name}
   end
 
   def self.include_tags?
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index 6335fa5bdc..be0e85b7f8 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -69,16 +69,15 @@ end
 #  client_id        :string           not null
 #  key              :string           not null
 #  application_name :string           not null
-#  read             :boolean          not null
-#  write            :boolean          not null
-#  push             :boolean          not null
 #  push_url         :string
 #  created_at       :datetime
 #  updated_at       :datetime
+#  revoked_at       :datetime
+#  scopes           :text             default([]), not null, is an Array
 #
 # Indexes
 #
-#  index_user_api_keys_on_client_id  (client_id)
+#  index_user_api_keys_on_client_id  (client_id) UNIQUE
 #  index_user_api_keys_on_key        (key) UNIQUE
 #  index_user_api_keys_on_user_id    (user_id)
 #
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index a609a6b16c..42bbfd5b1e 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -84,6 +84,7 @@ end
 #  payload_url          :string           not null
 #  content_type         :integer          default(1), not null
 #  last_delivery_status :integer          default(1), not null
+#  status               :integer          default(1), not null
 #  secret               :string           default("")
 #  wildcard_web_hook    :boolean          default(FALSE), not null
 #  verify_certificate   :boolean          default(TRUE), not null
diff --git a/app/models/web_hook_event.rb b/app/models/web_hook_event.rb
index f2720a9128..f10b5cde31 100644
--- a/app/models/web_hook_event.rb
+++ b/app/models/web_hook_event.rb
@@ -24,7 +24,7 @@ end
 #  web_hook_id      :integer          not null
 #  headers          :string
 #  payload          :text
-#  status           :integer
+#  status           :integer          default(0)
 #  response_headers :string
 #  response_body    :text
 #  duration         :integer          default(0)
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index cd5c6c7169..96d6ec6b83 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -19,7 +19,9 @@ class BasicCategorySerializer < ApplicationSerializer
              :notification_level,
              :can_edit,
              :topic_template,
-             :has_children
+             :has_children,
+             :sort_order,
+             :sort_ascending
 
   def include_parent_category_id?
     parent_category_id
diff --git a/app/views/finish_installation/confirm_email.html.erb b/app/views/finish_installation/confirm_email.html.erb
index 73f2a38168..9d15c3621a 100644
--- a/app/views/finish_installation/confirm_email.html.erb
+++ b/app/views/finish_installation/confirm_email.html.erb
@@ -1,3 +1,9 @@
-<h1><%= t 'first_installation.confirm_email.title' %></h1>
+<h1><%= t 'finish_installation.confirm_email.title' %></h1>
 
-<%= raw(t 'first_installation.confirm_email.message', email: @email) %>
+<%= raw(t 'finish_installation.confirm_email.message', email: @email) %>
+
+<div class='row'>
+  <%= button_to(finish_installation_resend_email_path, method: :put, class: 'wizard-btn') do %>
+    <%= t 'finish_installation.resend_email.title' %>
+  <% end %>
+</div>
diff --git a/app/views/finish_installation/index.html.erb b/app/views/finish_installation/index.html.erb
index 4ae9cbba1f..7428e9a37a 100644
--- a/app/views/finish_installation/index.html.erb
+++ b/app/views/finish_installation/index.html.erb
@@ -1,16 +1,16 @@
-<h1><%= t 'first_installation.congratulations' %></h1>
+<h1><%= t 'finish_installation.congratulations' %></h1>
 
 <div class='row'>
   <%= image_tag "/images/wizard/tada.svg", class: "tada" %>
 </div>
 
 <div class='row help-text'>
-  <%= t 'first_installation.register.help' %>
+  <%= t 'finish_installation.register.help' %>
 </div>
 
 <div class='row'>
   <%= link_to(finish_installation_register_path, class: 'wizard-btn primary') do %>
     <i class='fa fa-user'></i>
-    <%= t 'first_installation.register.button' %>
+    <%= t 'finish_installation.register.button' %>
   <% end %>
 </div>
diff --git a/app/views/finish_installation/register.html.erb b/app/views/finish_installation/register.html.erb
index 8d952a355d..b691465732 100644
--- a/app/views/finish_installation/register.html.erb
+++ b/app/views/finish_installation/register.html.erb
@@ -1,4 +1,4 @@
-<h1><%= t 'first_installation.register.title' %></h1>
+<h1><%= t 'finish_installation.register.title' %></h1>
 
 <%- if @allowed_emails.present? %>
   <%= form_tag(finish_installation_register_path) do %>
@@ -43,11 +43,11 @@
       <% end %>
     </div>
 
-    <%= submit_tag(t('first_installation.register.button'), class: 'wizard-btn primary') %>
+    <%= submit_tag(t('finish_installation.register.button'), class: 'wizard-btn primary') %>
 
   <%- end %>
 <%- else -%>
-  <p><%= raw(t 'first_installation.register.no_emails') %></p>
+  <p><%= raw(t 'finish_installation.register.no_emails') %></p>
 <%- end %>
 
 <script>
diff --git a/app/views/finish_installation/resend_email.html.erb b/app/views/finish_installation/resend_email.html.erb
new file mode 100644
index 0000000000..0989e0c53b
--- /dev/null
+++ b/app/views/finish_installation/resend_email.html.erb
@@ -0,0 +1,3 @@
+<h1><%= t 'finish_installation.resend_email.title' %></h1>
+
+<%= raw(t 'finish_installation.resend_email.message', email: @email) %>
diff --git a/config/initializers/100-session_store.rb b/config/initializers/100-session_store.rb
index e89e764e86..d83a343e0c 100644
--- a/config/initializers/100-session_store.rb
+++ b/config/initializers/100-session_store.rb
@@ -1,7 +1,9 @@
 # Be sure to restart your server when you modify this file.
+#
+require_dependency 'discourse_cookie_store'
 
 Discourse::Application.config.session_store(
-  :cookie_store,
+  :discourse_cookie_store,
   key: '_forum_session',
   path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root
 )
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 3d22546502..d0fae2ed46 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -613,8 +613,6 @@ ar:
       muted_topics_link: "أظهر المواضيع المكتومة"
       watched_topics_link: "أظهر المواضيع المراقبة"
       automatically_unpin_topics: "ألغِ تثبيت المواضيع آليا عندما أصل إلى أسفلها."
-      api_read: "اقرأ"
-      api_read_write: "اقرأ واكتب"
       staff_counters:
         flags_given: "علامات مساعدة"
         flagged_posts: "# مشاركات"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 946863582f..49c2fb36d3 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -587,7 +587,7 @@ bs_BA:
         create: "Pošalji Pozivnicu"
         generate_link: "Kopiraj link za invite"
         bulk_invite:
-          none: "You haven't invited anyone here yet. You can send individual invites, or invite a bunch of people at once by <a href='https://revolucionar.com/t/send-bulk-invites/16468'>uploading a bulk invite file</a>."
+          none: "Još niste nikoga pozvali ovdje. Moete slati pojedinačne pozivnice ili pozvati više ljudi odjednom <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>učitavanjem datoteke za grupno pozivanje</a>."
           text: "Bulk Invite from File"
           uploading: "Uploading..."
           success: "File uploaded successfully, you will be notified shortly with progress."
@@ -1229,6 +1229,8 @@ bs_BA:
         help: "Ova tema je zatvorena; zvanično ne prima nove postove"
       archived:
         help: "Ova tema je arhivirana; zaleđena je i ne može biti promjenjena"
+      locked_and_archived:
+        help: "Ova tema je zatvorena i arhivirana; zvanično ne prima nove postove"
       unpinned:
         title: "Unpinned"
         help: "This topic is unpinned; it will display in default order"
@@ -1278,7 +1280,16 @@ bs_BA:
       unread:
         help: "teme koje trenutno pratite i motrite sa nepročitanim postovima"
       new:
+        lower_title_with_count:
+          one: "1 novi"
+          few: "{{count}} nova"
+          other: "{{count}} novih"
         lower_title: "nova"
+        title: "Novo"
+        title_with_count:
+          one: "Novo (1)"
+          few: "Novo ({{count}})"
+          other: "Novo ({{count}})"
         help: "teme kreirane u zadnjih nekoliko dana"
       posted:
         title: "Moji Odgovori"
@@ -1305,7 +1316,7 @@ bs_BA:
   admin_js:
     type_to_filter: "kucaj da sortiraš..."
     admin:
-      title: 'Revolucionar Admin'
+      title: 'Discourse Admin'
       moderator: 'Moderator'
       dashboard:
         title: "Dashboard"
@@ -1320,7 +1331,7 @@ bs_BA:
         version_check_pending: "Looks like you upgraded recently. Fantastic!"
         installed_version: "Installed"
         latest_version: "Najnovije"
-        problems_found: "Problemi su nađeni sa instalacijom Revolucionara:"
+        problems_found: "Pronašli smo probleme s vašom instalacijom Discoursea:"
         last_checked: "Zadnje pogledani"
         refresh_problems: "Osvježi"
         no_problems: "No problems were found."
@@ -1330,7 +1341,12 @@ bs_BA:
         suspended: 'Suspended:'
         private_messages_short: "PP"
         private_messages_title: "Privatne Poruke"
+        mobile_title: "Mobiteli"
         space_free: "{{size}} slobodno"
+        uploads: "Učitavanja"
+        backups: "backupovi"
+        page_views_short: "API pozivi"
+        show_traffic_report: "Pokaži detaljan izvještaj prometa"
         reports:
           today: "Today"
           yesterday: "Yesterday"
@@ -1418,6 +1434,18 @@ bs_BA:
         info_html: "Your API key will allow you to create and update topics using JSON calls."
         all_users: "All Users"
         note_html: "Keep this key <strong>secret</strong>, all users that have it may create arbitrary posts as any user."
+      plugins:
+        title: "Pluginovi"
+        installed: "Instalirani pluginovi"
+        name: "Ime"
+        none_installed: "Nemate instaliran niti jedan plugin"
+        version: "Verzija"
+        enabled: "Omogućen?"
+        is_enabled: "Da"
+        not_enabled: "Ne"
+        change_settings: "Izmijeni postavke"
+        change_settings_short: "Postavke"
+        howto: "Kako instaliram pluginove?"
       backups:
         title: "Backups"
         menu:
@@ -1899,6 +1927,11 @@ bs_BA:
             with_post: <span class="username">%{username}</span> for post in %{link}
             with_post_time: <span class="username">%{username}</span> for post in %{link} at <span class="time">%{time}</span>
             with_time: <span class="username">%{username}</span> at <span class="time">%{time}</span>
+      emoji:
+        add: "Dodaj novi emoji"
+      permalink:
+        form:
+          label: "Novo:"
   wizard_js:
     wizard:
       back: "Prethodno"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 4450858a4a..991e2825aa 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -507,10 +507,7 @@ da:
       apps: "Apps"
       revoke_access: "Tilbagekald adgang"
       undo_revoke_access: "Revider tilbagekald adgang"
-      api_permissions: "Tilladelser:"
       api_approved: "Godkendt:"
-      api_read: "læst"
-      api_read_write: "læs og skriv"
       staff_counters:
         flags_given: "hjælpsomme markeringer"
         flagged_posts: "markerede indlæg"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 14eda7803a..b379a35f7f 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -168,7 +168,7 @@ de:
     admin_title: "Administration"
     flags_title: "Meldungen"
     show_more: "mehr anzeigen"
-    show_help: "Optionen"
+    show_help: "Erweiterte Suche"
     links: "Links"
     links_lowercase:
       one: "Link"
@@ -508,10 +508,7 @@ de:
       apps: "Apps"
       revoke_access: "Entziehe Zugriffsrecht"
       undo_revoke_access: "Entziehe Zugriffsrecht widerrufen"
-      api_permissions: "Berechtigungen:"
       api_approved: "Genehmigt:"
-      api_read: "Lesen"
-      api_read_write: "Lesen und Schreiben"
       staff_counters:
         flags_given: "hilfreiche Meldungen"
         flagged_posts: "gemeldete Beiträge"
@@ -1117,6 +1114,7 @@ de:
     not_logged_in_user: 'Benutzerseite mit einer Zusammenfassung der Benutzeraktivitäten und Einstellungen'
     current_user: 'zu deiner Benutzerseite gehen'
     topics:
+      new_messages_marker: "letzter Besuch"
       bulk:
         unlist_topics: "Themen unsichtbar machen"
         reset_read: "Gelesene zurücksetzen"
@@ -2213,6 +2211,15 @@ de:
         info_html: "Dein API-Key erlaubt dir das Erstellen und Bearbeiten von Themen via JSON-Aufrufen."
         all_users: "Alle Benutzer"
         note_html: "Halte diesen Schlüssel <strong>geheim</strong>. Alle Benutzer, die diesen Schlüssel besitzen, können beliebige Beiträge als jeder Benutzer erstellen."
+      web_hooks:
+        save: "Speichern"
+        destroy: "Löschen"
+        description: "Beschreibung"
+        go_back: "Zurück zur Liste"
+        delivery_status:
+          inactive: "Inaktiv"
+          failed: "Fehlgeschlagen"
+          successful: "Erfolgreich"
       plugins:
         title: "Plug-ins"
         installed: "Installierte Plug-ins"
@@ -2915,3 +2922,12 @@ de:
           label: "Neu:"
           add: "Hinzufügen"
           filter: "Suche (URL oder externe URL)"
+  wizard_js:
+    wizard:
+      done: "Erledigt"
+      back: "Zurück"
+      invites:
+        roles:
+          admin: "Administration"
+          moderator: "Moderator"
+          regular: "Normaler Anwender"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index fe210e4bb3..d6a10c0d73 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -535,6 +535,7 @@ en:
           Muted topics and categories are not included in these emails.
         daily: "Send daily updates"
         individual: "Send an email for every new post"
+        individual_no_echo: "Send an email for every new post except my own"
         many_per_day: "Send me an email for every new post (about {{dailyEmailEstimate}} per day)"
         few_per_day: "Send me an email for every new post (about 2 per day)"
       tag_settings: "Tags"
@@ -1882,6 +1883,7 @@ en:
       email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, "
       email_in_disabled_click: 'enable the "email in" setting.'
       suppress_from_homepage: "Suppress this category from the homepage."
+      sort_order: "Default Sort:"
       allow_badges_label: "Allow badges to be awarded in this category"
       edit_permissions: "Edit Permissions"
       add_permission: "Add Permission"
@@ -1907,6 +1909,18 @@ en:
         muted:
           title: "Muted"
           description: "You will never be notified of anything about new topics in these categories, and they will not appear in latest."
+      sort_options:
+        default: "default"
+        likes: "Likes"
+        op_likes: "Original Post Likes"
+        views: "Views"
+        posts: "Posts"
+        activity: "Activity"
+        posters: "Posters"
+        category: "Category"
+        created: "Created"
+      sort_ascending: 'Ascending'
+      sort_descending: 'Descending'
 
     flagging:
       title: 'Thanks for helping to keep our community civil!'
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index ccafd91206..e9656bf5ee 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -508,10 +508,7 @@ es:
       apps: "Apps"
       revoke_access: "Revocar acceso"
       undo_revoke_access: "Deshacer revocación de acceso"
-      api_permissions: "Permisos:"
       api_approved: "Aprobado:"
-      api_read: "leer"
-      api_read_write: "leer y escribir"
       staff_counters:
         flags_given: "reportes útiles"
         flagged_posts: "posts reportados"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 7f1f68ba39..3375bbe531 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -283,7 +283,7 @@ et:
         title: "Postitus vajab kinnitust"
         description: "Oleme sinu uue postituse kätte saanud, kuid see vajab enne ilmumist moderaatori kinnitust. Palume veidi kannatust. "
         pending_posts:
-          one: "Teil on <strong>1</strong> kinnitamata postitus."
+          one: "Sul on <strong>1</strong> kinnitamata postitus."
           other: "Sul on <strong>{{count}}</strong> kinnitamata postitust."
         ok: "OK"
     user_action:
@@ -507,10 +507,7 @@ et:
       apps: "Äpid"
       revoke_access: "Tühista ligipääs"
       undo_revoke_access: "Tühista ligipääsu tühistamine"
-      api_permissions: "Õigused:"
       api_approved: "Heakskiidetud:"
-      api_read: "lugemine"
-      api_read_write: "lugemine ja kirjutamine"
       staff_counters:
         flags_given: "kasulikud tähised"
         flagged_posts: "tähistatud postitused"
@@ -1094,6 +1091,40 @@ et:
         category: "Otsi #{{category}} foorumist"
         topic: "Otsi sellest teemast"
         private_messages: "Otsi sõnumeid"
+      advanced:
+        title: Täpsem otsing
+        posted_by:
+          label: Postitaja
+        in_category:
+          label: Foorumis
+        in_group:
+          label: Grupis
+        with_tags:
+          label: Sildiga
+        filters:
+          label: Tagasta ainult need postitused, mis
+          likes: mulle meeldisid
+          posted: sisaldavad minu postitust
+          watching: on minu vaatlemise nimekirjas
+          tracking: on minu jälgimise nimekirjas
+          private: on minu sõnumite hulgas
+          bookmarks: on minu järjehoidjaga
+          first: on teema esimesed postitused
+          wiki: on wiki
+        statuses:
+          label: Kus teemad
+          open: on avatud
+          closed: on suletud
+          archived: on arhiveeritud
+          noreplies: ilma vastusteta
+          single_user: on ainult ühe kasutaja postitustega
+        post:
+          count:
+            label: Minimaalne postituste arv
+          time:
+            label: Postitatud
+            before: enne
+            after: pärast
     hamburger_menu: "mine teise teemaloetelu või foorumi juurde"
     new_item: "uus"
     go_back: 'tagasi'
@@ -1156,8 +1187,8 @@ et:
       filter_to:
         one: "1 postitus teemas"
         other: "{{count}} postitust teemas"
-      create: 'Uus Teema'
-      create_long: 'Loo uus Teema'
+      create: 'Uus teema'
+      create_long: 'Loo uus teema'
       private_message: 'Alusta sõnumit'
       archive_message:
         help: 'Liiguta sõnum oma arhiivi'
@@ -1203,7 +1234,7 @@ et:
       toggle_information: "lülita teema üksikasjad ümber"
       read_more_in_category: "Soovid veel lugeda? Vaata teisi teemasid {{catLink}} või {{latestLink}}."
       read_more: "Soovid veel lugeda? {{catLink}} või {{latestLink}}."
-      read_more_MF: "Teil on { UNREAD, plural, =0 {} one { is <a href='/unread'>1 lugemata</a> } other { are <a href='/unread'># lugemata </a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 uus</a> teema} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># uut</a> teemat} } jäänud, või {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}\nby priit.varik, a month ago"
+      read_more_MF: "Sul on { UNREAD, plural, =0 {} one { is <a href='/unread'>1 lugemata</a> } other { are <a href='/unread'># lugemata </a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 uus</a> teema} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># uut</a> teemat} } jäänud, või {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}\nby priit.varik, a month ago"
       browse_all_categories: Vaata kõiki foorumeid
       view_latest_topics: vaata värskeid teemasid
       suggest_create_topic: Teeks äkki teema?
@@ -1215,6 +1246,9 @@ et:
       auto_close_title: 'Automaatse sulgumise sätted'
       auto_close_save: "Salvesta"
       auto_close_remove: "Ära lase sel teemal automaatselt sulguda"
+      auto_close_immediate:
+        one: "Viimane postitus selles teemas on juba 1 tund aega vana, seega sulgub see teema nüüd."
+        other: "Viimane postitus selles teemas on juba %{hours} tundi vana, seega sulgub see teema nüüd."
       timeline:
         back: "Tagasi"
         back_description: "Mine tagasi oma viimase lugemata postituse juurde"
@@ -1250,20 +1284,20 @@ et:
           '0_2': 'Eirad kõiki teavitusi selle teema kohta.'
           '0': 'Eirad kõiki teavitusi selles foorumis.'
         watching_pm:
-          title: "Vaatleb"
+          title: "Vaatlemine"
           description: "Saad teavituse iga uue vastuse kohta sellele sõnumile koos uute vastuste koguarvu näitamisega."
         watching:
-          title: "Vaatleb"
+          title: "Vaatlemine"
           description: "Saad teavituse iga uue vastuse kohta selles teemas koos uute vastuste koguarvu näitamisega."
         tracking_pm:
-          title: "Jälgib"
+          title: "Jälgimine"
           description: "Selle sõnumi kohta näidatakse uute vastuste koguarvu. Saad teavituse kui keegi Sinu @name mainib või Sulle vastab."
         tracking:
-          title: "Jälgib"
+          title: "Jälgimine"
           description: "Selle teema kohta näidatakse uute vastuste koguarvu. Saad teavituse kui keegi Sinu @name mainib või Sulle vastab."
         regular:
           title: "Normaalne"
-          description: "Teid teavitatakse, kui keegi Sinu @name mainib või Sulle vastab."
+          description: "Sind teavitatakse, kui keegi Sinu @name mainib või Sulle vastab."
         regular_pm:
           title: "Normaalne"
           description: "Sind teavitatakse, kui keegi Sinu @name mainib või Sulle vastab."
@@ -1296,7 +1330,7 @@ et:
         make_banner: "Tee teema bänneriks"
         remove_banner: "Eemalda teema bännerist"
       reply:
-        title: 'Vasta'
+        title: 'vasta'
         help: 'alusta selle teema vastuse koostamist'
       clear_pin:
         title: "Kustuta esiletõstmine"
@@ -1304,6 +1338,8 @@ et:
       share:
         title: 'Jaga'
         help: 'jaga viidet sellele teemale'
+      print:
+        title: 'Trüki'
       flag_topic:
         title: 'Tähista'
         help: 'tähista see teema privaatselt meelespidamiseks või saada selle kohta privaatsõnum'
@@ -1665,13 +1701,13 @@ et:
       parent: "Emafoorum"
       notifications:
         watching:
-          title: "Vaatleb"
+          title: "Vaatlemine"
           description: "Sa vaatled nendes foorumites kõiki teemasid automaatselt. Sind teavitatakse igast uuest postitusest igas teemas. Ühtlasi kuvatakse uute vastuste arv."
         watching_first_post:
           title: "Vaatan esimest postitust"
           description: "Sind teavitatakse vaid esimesest postitusest igas uues teemas nendes foorumites."
         tracking:
-          title: "Jälgib"
+          title: "Jälgimine"
           description: "Sa vaatled kõiki nende foorumite teemasid automaatselt. Sind teavitatakse, kui keegi sinu @name mainib või sulle vastab. Ühtlasi kuvatakse uute vastuste arv."
         regular:
           title: "Normaalne"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 1bddb0de69..97aeb320e3 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -508,7 +508,7 @@ fi:
       automatically_unpin_topics: "Poista kiinnitetyn ketjun kiinnitys automaattisesti, kun olen selannut sen loppuun."
       staff_counters:
         flags_given: "hyödyllistä liputusta"
-        flagged_posts: "liputettuja viestejä"
+        flagged_posts: "liputettua viestiä"
         deleted_posts: "poistettua viestiä"
         suspensions: "hyllytyksiä"
         warnings_received: "varoituksia"
@@ -594,6 +594,7 @@ fi:
         title: "Käyttöliittymän kieli"
         instructions: "Käyttöliittymän kieli. Kieli vaihtuu sivun uudelleen lataamisen yhteydessä."
         default: "(oletus)"
+        any: "mikä tahansa"
       password_confirmation:
         title: "Salasana uudelleen"
       last_posted: "Viimeisin viesti"
@@ -651,6 +652,7 @@ fi:
         after_4_minutes: "4 minuutin jälkeen"
         after_5_minutes: "5 minuutin jälkeen"
         after_10_minutes: "10 minuutin jälkeen"
+      notification_level_when_replying: "Kun kirjoitan ketjuun, aseta se "
       invited:
         search: "kirjoita etsiäksesi kutsuja..."
         title: "Kutsut"
@@ -870,7 +872,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."
-      sent_activation_email_again: "Lähetimme uuden vahvistusviestin sinulle osoitteeseen <b>{{sentTo}}</b>. Viestin saapumisessa voi kestää muutama minuutti, muista tarkastaa myös roskapostikansio."
+      sent_activation_email_again: "Lähetimme uuden vahvistusviestin sinulle osoitteeseen <b>{{currentEmail}}</b>. Viestin saapumisessa voi kestää muutama minuutti; muista tarkastaa myös roskapostikansio."
       to_continue: "Ole hyvä ja kirjaudu sisään"
       preferences: "Sinun täytyy olla kirjautuneena sisään muokataksesi tilisi asetuksia"
       forgot: "En muista käyttäjätilini tietoja"
@@ -1131,6 +1133,7 @@ fi:
     not_logged_in_user: 'käyttäjäsivu, jossa on tiivistelmä käyttäjän viimeaikaisesta toiminnasta sekä käyttäjäasetukset'
     current_user: 'siirry omalle käyttäjäsivullesi'
     topics:
+      new_messages_marker: "edellinen vierailu"
       bulk:
         unlist_topics: "Poista ketjuja listauksista"
         reset_read: "Palauta lukutila"
@@ -2820,12 +2823,14 @@ fi:
           developer: 'Kehittäjä'
           embedding: "Upottaminen"
           legal: "Säännöt"
+          user_api: 'Käyttäjärajapinta'
           uncategorized: 'Muut'
           backups: "Varmuuskopiot"
           login: "Kirjautuminen"
           plugins: "Lisäosat"
           user_preferences: "Käyttäjäasetukset"
           tags: "Tunnisteet"
+          search: "Haku"
       badges:
         title: Ansiomerkit
         new_badge: Uusi ansiomerkki
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 8adee78dc3..290aaf3284 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -474,6 +474,7 @@ fr:
           Les sujets et catégories passés en silencieux ne sont pas inclus dans ces courriels.
         daily: "Envoyer des informations quotidiennes"
         individual: "Envoyer un courriel pour chaque nouveau message"
+        individual_no_echo: "Envoyer un courriel pour chaque nouveau message sauf les miens"
         many_per_day: "M'envoyer un courriel pour chaque nouveau message (environ {{dailyEmailEstimate}} par jour)"
         few_per_day: "M'envoyer un courriel pour chaque nouveau message (environ 2 par jour)"
       tag_settings: "Tags"
@@ -508,10 +509,7 @@ fr:
       apps: "Applications"
       revoke_access: "Révoquer l'accès"
       undo_revoke_access: "Annuler la révocation d'accès"
-      api_permissions: "Permissions :"
       api_approved: "Approuvé :"
-      api_read: "lecture"
-      api_read_write: "lecture et écriture"
       staff_counters:
         flags_given: "signalements utiles"
         flagged_posts: "messages signalés"
@@ -1328,8 +1326,8 @@ fr:
         unpin: "Désépingler le sujet…"
         unarchive: "Désarchiver le sujet"
         archive: "Archiver le sujet"
-        invisible: "Retirer de la liste des sujets"
-        visible: "Afficher dans la liste des sujets"
+        invisible: "Rendre invisible"
+        visible: "Rendre visible"
         reset_read: "Réinitialiser les données de lecture"
         make_public: "Rendre le sujet public"
         make_private: "Rendre le sujet privé"
@@ -1701,6 +1699,7 @@ 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".'
       suppress_from_homepage: "Retirer cette catégorie de la page d'accueil"
+      sort_order: "Tri par défaut :"
       allow_badges_label: "Autoriser les badges à être accordé dans cette catégorie"
       edit_permissions: "Modifier les permissions"
       add_permission: "Ajouter la permission"
@@ -1726,6 +1725,18 @@ fr:
         muted:
           title: "Silencieux"
           description: "Vous ne serez jamais notifié de rien concernant les nouveaux sujets dans ces catégories, et elles n'apparaîtront pas dans les dernières catégories."
+      sort_options:
+        default: "standard"
+        likes: "J'aime"
+        op_likes: "J'aime du premier message"
+        views: "Vues"
+        posts: "Messages"
+        activity: "Activité"
+        posters: "Auteurs"
+        category: "Catégorie"
+        created: "Création"
+      sort_ascending: 'Croissant'
+      sort_descending: 'Décroissant'
     flagging:
       title: 'Merci d''aider à garder notre communauté civilisée !'
       action: 'Signaler ce message'
@@ -2711,7 +2722,7 @@ fr:
         moderator: "Modérateur ?"
         admin: "Administrateur ?"
         blocked: "Bloqué ?"
-        staged: "En attente?"
+        staged: "En attente ?"
         show_admin_profile: "Administration"
         edit_title: "Modifier le titre"
         save_title: "Sauvegarder le titre"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 7ff6cd4eb6..e2077ed76a 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -107,7 +107,7 @@ he:
       close: 'סגור'
       twitter: 'שתפו קישור זה בטוויטר'
       facebook: 'שתפו קישור זה בפייסבוק'
-      google+: 'שתף קישור זה בגוגל+'
+      google+: 'שתפו קישור זה בגוגל+'
       email: 'שלח קישור בדוא"ל'
     action_codes:
       public_topic: "הפכו נושא זה לפומבי %{when}"
@@ -137,7 +137,7 @@ he:
         disabled: 'הוצא מהרשימה %{when}'
     topic_admin_menu: "פעולות ניהול לנושא"
     wizard_required: "הגיע הזמן לכוונן את הפורום שלכם! <a href='%{url}' data-auto-route='true'>התחילו את אשף ההקמה</a>!"
-    emails_are_disabled: "כל הדוא\"ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא\"ל, מכל סוג שהוא, תשלח."
+    emails_are_disabled: "כל הדוא\"ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא\"ל, מכל סוג שהוא, לא תשלח."
     bootstrap_mode_enabled: "כדי להקל על הקמת האתר החדש שלכם, אתם במצב איתחול-ראשוני. כל המשתמשים החדשים יקבלו רמת אמון 1 ויקבלו סיכומים יומיים במייל. אפשרות זו תכובה אוטומטית כאשר יהיו יותר מ %{min_users} משתמשים."
     bootstrap_mode_disabled: "מצב איתחול-ראשוני יכובה ב 24 השעות הקרובות."
     s3:
@@ -205,7 +205,7 @@ he:
       simple_title: "אודות"
       title: "אודות %{title}"
       stats: "סטטיסטיקות אתר"
-      our_admins: "המנהלים שלנו"
+      our_admins: "האדמיניסטרטורים שלנו"
       our_moderators: "המנחים שלנו"
       stat:
         all_time: "כל הזמנים"
@@ -326,7 +326,7 @@ he:
         posts: "אין פוסט של חברים בקבוצה זו"
         members: "אין חברים בקבוצה זו."
         mentions: "אין אזכורים של קבוצה זו."
-        messages: "אין מסרים לקבוצה זו."
+        messages: "אין הודעות לקבוצה זו."
         topics: "אין נושא מטעם חברים בקבוצה זו."
       add: "הוספה"
       selector_placeholder: "הוספת חברים וחברות"
@@ -419,7 +419,7 @@ he:
       trust_level: "רמת-אמון"
       read_time: "זמן צפייה"
       topics_entered: "כניסה לנושאים"
-      post_count: "# פרסומים"
+      post_count: "# פוסטים"
       confirm_delete_other_accounts: "אתם בטוחים שברצונכם למחוק חשבונות אלו?"
     user_fields:
       none: "(בחרו אפשרות)"
@@ -452,7 +452,7 @@ he:
         each_browser_note: "הערה: עליך לשנות הגדרה זו עבור כל דפדפן בנפרד."
       dismiss_notifications: "בטלו הכל"
       dismiss_notifications_tooltip: "סימון כל ההתראות שלא נקראו כהתראות שנקראו"
-      disable_jump_reply: "אל תקפצו לפרסומים שלי לאחר שאני משיב/ה"
+      disable_jump_reply: "אל תקפצו לפוסטים שלי לאחר שאני משיב/ה"
       dynamic_favicon: "הצגת מספר נושאים חדשים/מעודכנים על האייקון של הדפדפן"
       external_links_in_new_tab: "פתח את כל הקישורים החיצוניים בעמוד חדש"
       enable_quoting: "אפשרו תגובת ציטוט לטקסט מסומן"
@@ -460,7 +460,7 @@ he:
       moderator: "{{user}} הוא מנחה"
       admin: "{{user}} הוא מנהל מערכת"
       moderator_tooltip: "משתמש זה הינו מנחה (Moderator)"
-      admin_tooltip: "משתמש זה הינו מנהל מערכת (Admin)"
+      admin_tooltip: "משתמש זה הינו אדמיניסטרטור"
       blocked_tooltip: "משתמש זה חסום"
       suspended_notice: "המשתמש הזה מושעה עד לתאריך: {{date}}."
       suspended_reason: "הסיבה: "
@@ -474,6 +474,7 @@ he:
           נושאים וקטגוריות שהושתקו לא יכללו במיילים אלו.
         daily: "שלח עדכונים יומיים"
         individual: "שליחת מייל עבור כל פוסט חדש"
+        individual_no_echo: "שלח מייל עבור כל פוסט חדש מלבד שלי"
         many_per_day: "שלחו לי מייל עבור כל פוסט חדש (בערך {{dailyEmailEstimate}} ביום)"
         few_per_day: "שלחו לי מייל עבור כל פוסט חדש (בערך 2 ביום)"
       tag_settings: "תגיות"
@@ -484,7 +485,7 @@ he:
       muted_tags: "מושתק"
       muted_tags_instructions: "אתם לא תיודעו לגבי דבר בנוגע לנושאים חדשים עם תגיות אלו, והם לא יופיעו ברשימת האחרונים."
       watched_categories: "נצפה"
-      watched_categories_instructions: "תעקבו באופן אוטומטי אחרי כל הנושאים בקטגוריות אלו. תקבלו התראה על כל הפרסומים והנושאים החדשים. מספר הפרסומים יופיע לצד כותרת הנושא."
+      watched_categories_instructions: "תעקבו באופן אוטומטי אחרי כל הנושאים בקטגוריות אלו. תקבלו התראה על כל הפוסטים והנושאים החדשים. מספר הפוסטים יופיע לצד כותרת הנושא."
       tracked_categories: "במעקב"
       tracked_categories_instructions: "אתם תעקבו אוטומטית אחר כל הנושאים עם קטגוריות אלו. ספירה של פוסטים חדשים תופיע ליד הנושא."
       watched_first_post_categories: "צפייה בפוטס הראשון"
@@ -508,10 +509,7 @@ he:
       apps: "אפליקציות"
       revoke_access: "שלילת גישה"
       undo_revoke_access: "ביטול שלילת גישה"
-      api_permissions: "הרשאות:"
       api_approved: "אושרו:"
-      api_read: "קריאה"
-      api_read_write: "קריאה וכתיבה"
       staff_counters:
         flags_given: "דגלים שעוזרים"
         flagged_posts: "פסטים מדוגלים"
@@ -554,7 +552,7 @@ he:
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, מבוסס על"
         gravatar_title: "שנו את הדמות שלכם באתר-Gravatar"
         refresh_gravatar_title: "רענון האווטר שלכם"
-        letter_based: "תמונת פרופיל משובצת מערכתית"
+        letter_based: "תמונת פרופיל משובצת מהמערכת"
         uploaded_avatar: "תמונה אישית"
         uploaded_avatar_empty: "הוסיפו תמונה אישית"
         upload_title: "העלו את התמונה שלכם"
@@ -570,8 +568,8 @@ he:
       email:
         title: "דואר אלקטרוני"
         instructions: "לא נצפו מעולם"
-        ok: "נשלח לך דואר אלקטרוני לאישור"
-        invalid: "בבקשה הכנס כתובת דואר אלקטרוני חוקית"
+        ok: "נשלח אליכם דואר אלקטרוני לאישור"
+        invalid: "בבקשה הכניסו כתובת דואר אלקטרוני תקינה"
         authenticated: "כתובת הדואר האלקטרוני שלך אושרה על ידי {{provider}}"
         frequency_immediately: "נשלח לכם מייל מיידית אם לא קראתם את מה ששלחנו לכם עליו מייל."
         frequency:
@@ -767,7 +765,7 @@ he:
       reasons:
         network: "שגיאת רשת"
         server: "שגיאת שרת"
-        forbidden: "תקלת גישה"
+        forbidden: "גישה נדחתה"
         unknown: "תקלה"
         not_found: "העמוד אותו אתם מחפשים לא נמצא"
       desc:
@@ -782,7 +780,7 @@ he:
         again: "ניסיון נוסף"
         fixed: "טעינת עמוד"
     close: "סגור"
-    assets_changed_confirm: "האתר עבר עדכון. תרצו לרענן לגרסא המתקדמת ביותר?"
+    assets_changed_confirm: "האתר עבר עדכון. תרצו לרענן לגרסה המתקדמת ביותר?"
     logout: "נותקת מהמערכת"
     refresh: "רענן"
     read_only_mode:
@@ -822,7 +820,7 @@ he:
       hide_forever: "לא תודה"
       hidden_for_session: "אוקיי, אשאל אתכם מחר. אתם כם תמיד יכולים להשתמש ב'התחברו' כדי ליצור משתמשים."
       intro: "שלום לך :heart_eyes: זה נראה כאילו אתם נהנים מקריאה אבל אתם לא רשומים."
-      value_prop: "כשאת/ה נרשמ/ת, אנחנו זוכרים בדיוק מה קראת כך שכשתחזרו תמשיכו בדיוק איפה שהפסקתם. בנוסף תקבלו התראות דרך האתר ודרך הדואר האלקטרוני שלך כשפרסומים חדשים נוצרים ועוד משהו, את/ה יכול/ה לעשות לייק לפוסטים שאהבת. :heartbeat:"
+      value_prop: "כשאתם נרשמים, אנחנו זוכרים בדיוק מה קראתם כך שכשתחזרו תמשיכו בדיוק איפה שהפסקתם. בנוסף תקבלו התראות דרך האתר ודרך הדואר האלקטרוני שלכם כשפוסטים חדשים נוצרים. ואתם יכולים לעשות לייק לפוסטים שאהבתם. :heartbeat:"
     summary:
       enabled_description: "אתם צופים בסיכום נושא זה: הפוסטים המעניינים ביותר כפי שסומנו על ידי הקהילה."
       description: "ישנן <b>{{replyCount}}</b> תגובות."
@@ -832,8 +830,8 @@ he:
     deleted_filter:
       enabled_description: "נושא זה מכיל פוסטים שנמחקו ולכן אינם מוצגים."
       disabled_description: "פוסטים שנמחקו בנושא זה מוצגים כעת."
-      enable: "הסתר פרסומים שנמחקו"
-      disable: "הצגת פרסומים שנמחקו"
+      enable: "הסתרת פוסטים שנמחקו"
+      disable: "הצגת פוסטים שנמחקו"
     private_message_info:
       title: "הודעה"
       invite: "הזמינו אחרים..."
@@ -1036,8 +1034,8 @@ he:
       granted_badge: "<i title='עיטור הוענק' class='fa fa-certificate'></i><p>הרוויחו '{{description}}'</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>נושא חדש</span> {{description}}</p>"
       group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> הודעה {{count}} בתיבת הודעת הקבוצה  {{group_name}} inbox</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} הודעת בתיבת הקבוצה {{group_name}} inbox</p>"
+        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} הודעה בתיבת הודעות הקבוצה {{group_name}}</p>"
+        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} הודעות בתיבת הודעות הקבוצה {{group_name}}</p>"
       alt:
         mentioned: "הוזכר על ידי"
         quoted: "צוטט על ידי"
@@ -1093,7 +1091,7 @@ he:
       searching: "מחפש ..."
       post_format: "#{{post_number}} מאת {{username}}"
       context:
-        user: "חיפוש פרסומים לפי @{{username}}"
+        user: "חיפוש פוסטים לפי @{{username}}"
         category: "חפשו את הקטגוריה #{{category}}"
         topic: "חפשו בנושא זה"
         private_messages: "חיפוש הודעות"
@@ -1292,7 +1290,7 @@ he:
           '2': 'תקבלו התראות כיוון ש<a href="/users/{{username}}/preferences">קראתם את הנושא הזה</a>.'
           '1_2': 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלכם או ישיב לכם.'
           '1': 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלכם או ישיב לכם.'
-          '0_7': 'את/ה מתעלם/מתעלמת מכל ההתראות בקטגוריה זו.'
+          '0_7': 'אתם מתעלמים מכל ההתראות בקטגוריה זו.'
           '0_2': 'אתם מתעלמים מכל ההתראות בנושא זה.'
           '0': 'אתם מתעלמים מכל ההתראות בנושא זה.'
         watching_pm:
@@ -1324,7 +1322,7 @@ he:
         delete: "מחיקת נושא"
         open: "פתיחת נושא"
         close: "סגירת נושא"
-        multi_select: "בחר/י פרסומים..."
+        multi_select: "בחרו פוסטים..."
         auto_close: "סגירה אוטומטית..."
         pin: "נעיצת נושא..."
         unpin: "שחרור נעיצת נושא..."
@@ -1672,7 +1670,7 @@ he:
       delete: 'מחק קטגוריה'
       create: 'קטגוריה חדשה'
       create_long: 'יצירת קטגוריה חדשה'
-      save: 'שמור קטגוריה'
+      save: 'שמירת קטגוריה'
       slug: 'כתובת חלזונית לקטגוריה'
       slug_placeholder: '(אופציונאלי) מלים-מחוברות-במקפים-לכתובת-URL'
       creation_error: ארעה שגיאה במהלך יצירת הקטגוריה הזו.
@@ -1703,6 +1701,7 @@ he:
       email_in_disabled: "אפשרות הפרסום של נושאים חדשים דרך דוא\"ל נוטרלה בהגדרות האתר. כדי לאפשר פרסום באמצעות  משלוח דוא\"ל,"
       email_in_disabled_click: 'אפשרו את את ההגדרה "דוא"ל נכנס"'
       suppress_from_homepage: "הרחיקו קטגוריה זו מהעמוד הראשי."
+      sort_order: "סידור ברירת מחדל:"
       allow_badges_label: "הרשו לעיטורים להיות מוענקים בקטגוריה זו"
       edit_permissions: "ערוך הרשאות"
       add_permission: "הוסף הרשאה"
@@ -1728,6 +1727,18 @@ he:
         muted:
           title: "מושתק"
           description: "לא תקבלו התראות על נושאים חדשים בקטגוריות אלו, והם לא יופיעו בעמוד הלא-נקראו שלך."
+      sort_options:
+        default: "ברירת מחדל"
+        likes: "לייקים"
+        op_likes: "לייקים של הפוסט המקורי"
+        views: "מבטים"
+        posts: "פוסטים"
+        activity: "פעילות"
+        posters: "מפרסמים"
+        category: "קטגוריה"
+        created: "נוצרו"
+      sort_ascending: 'בסדר עולה'
+      sort_descending: 'בסדר יורד'
     flagging:
       title: 'תודה על עזרתך לשמירה על תרבות הקהילה שלנו!'
       action: 'דגלו פוסט'
@@ -1747,8 +1758,8 @@ he:
         off_topic: "אוף-טופיק"
         inappropriate: "לא ראוי"
         spam: "זהו ספאם"
-      custom_placeholder_notify_user: "היה ממוקד, חיובי ואדיב תמיד."
-      custom_placeholder_notify_moderators: "ספר לנו מה בדיוק מטריד אותך וצרף קישורים רלוונטיים ודוגמאות במידת האפשר."
+      custom_placeholder_notify_user: "היו ממוקדים, חיובים ותמיד אדיבים."
+      custom_placeholder_notify_moderators: "ספרו לנו מה בדיוק מטריד אתכם וצרפו קישורים רלוונטיים ודוגמאות במידת האפשר."
       custom_message:
         at_least:
           one: "הכניסו לפחות תו אחד"
@@ -1855,7 +1866,7 @@ he:
       unread:
         title: "לא-נקראו"
         title_with_count:
-          one: "לא נקרא(1)"
+          one: "לא נקרא (1)"
           other: "לא-נקראו ({{count}})"
         help: "נושאים שאתם כרגע צופים או עוקבים אחריהם עם פוסטים שלא נקראו"
         lower_title_with_count:
@@ -1907,7 +1918,7 @@ he:
         other_periods: "ראה חלק עליון"
     browser_update: 'למרבה הצער, <a href="http://www.discourse.org/faq/#browser">הדפדפן שלכם זקן מידי מכדי לעבוד באתר זה.</a>. אנא <a href="http://browsehappy.com">שדרגו את הדפדפן שלכם</a>.'
     permission_types:
-      full: "צרו / תגובה/ צפייה"
+      full: "יצירה / תגובה / צפייה"
       create_post: "תגובה / צפייה"
       readonly: "צפה"
     lightbox:
@@ -2127,7 +2138,7 @@ he:
           7_days_ago: "לפני שבעה ימים"
           30_days_ago: "לפני 30 ימים"
           all: "הכל"
-          view_table: "טבלא"
+          view_table: "טבלה"
           view_graph: "גרף"
           refresh_report: "רענון דו\"ח"
           start_date: "תאריך התחלה"
@@ -2173,7 +2184,7 @@ he:
           deferred: "נדחה"
         flagged_by: "דוגל על ידי"
         resolved_by: "נפתר על ידי"
-        took_action: "ננקטה פעוללה"
+        took_action: "ננקטה פעולה"
         system: "מערכת"
         error: "משהו השתבש"
         reply_message: "תגובה"
@@ -2212,7 +2223,7 @@ he:
         delete: "מחק"
         delete_confirm: "למחוק קבוצה זו?"
         delete_failed: "לא ניתן למחוק קבוצה זו. אם זו קבוצה אוטומטית, היא בלתי ניתנת למחיקה."
-        delete_member_confirm: "להסיר את '%{username}' מהקבוצה '%{group}' ?"
+        delete_member_confirm: "להסיר את '%{username}' מהקבוצה '%{group}'?"
         delete_owner_confirm: "הסרת הרשאות מנהל עבור '%{username}'?"
         name: "שם"
         add: "הוספה"
@@ -2334,7 +2345,7 @@ he:
         not_enabled: "N"
         change_settings: "שינוי הגדרות"
         change_settings_short: "הגדרות"
-        howto: "איך אני מתקין/מתקינה הרחבות?"
+        howto: "איך אני מתקין/ה הרחבות?"
       backups:
         title: "גיבויים"
         menu:
@@ -2646,7 +2657,7 @@ he:
           title: "רישום תקלות"
       impersonate:
         title: "התחזות"
-        help: "השתמשו בכלי כזה כדי להתחזות לחשבון משתמש לצרכי דיבוג. עליכם להתנתק ברגע שתסיימו."
+        help: "השתמשו בכלי זה כדי להתחזות לחשבון משתמש לצרכי דיבוג. עליכם להתנתק ברגע שתסיימו."
         not_found: "לא ניתן למצוא את המשתמש הזה."
         invalid: "סליחה, אך אינך מורשה להתחזות למשתמש הזה."
       users:
@@ -2812,8 +2823,8 @@ he:
           topics_replied_to: "נושאים להם הגיבו"
           topics_viewed: "נושאים שנצפו"
           topics_viewed_all_time: "נושאים שנצפו (בכל זמן)"
-          posts_read: "פרסומים שנקראו"
-          posts_read_all_time: "פרסומים שנקראו (בכל זמן)"
+          posts_read: "פוסטים שנקראו"
+          posts_read_all_time: "פוסטים שנקראו (בכל זמן)"
           flagged_posts: "פוסטים מדוגלים"
           flagged_by_users: "משתמשים שדיגלו"
           likes_given: "לייקים שהוענקו"
@@ -2901,7 +2912,7 @@ he:
           seo: 'SEO'
           spam: 'ספאם'
           rate_limits: 'מגבלות קצב'
-          developer: 'מפתח'
+          developer: 'מפתחים'
           embedding: "הטמעה"
           legal: "משפטי"
           user_api: 'API של משתמש'
@@ -2974,7 +2985,7 @@ he:
           grant_count:
             one: "עיטור אחד להקצאה."
             other: "<b>%{count}</b> עיטורים להקצאה."
-          sample: "דוגמא:"
+          sample: "דוגמה:"
           grant:
             with: <span class="username">%{username}</span>
             with_post: <span class="username">%{username}</span> לפוסט ב %{link}
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index a472a281ff..f0d8ddc7b3 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -450,8 +450,6 @@ id:
       muted_users_instructions: "Menekan semua pemberitahuan dari semua pengguna."
       muted_topics_link: "Menampilkan topik yang diredam"
       apps: "Aplikasi"
-      api_read: "baca"
-      api_read_write: "baca dan tulis"
       staff_counters:
         deleted_posts: "menghapus posting"
         suspensions: "penangguhan"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 01f34a4ec3..7e771eef45 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -136,6 +136,7 @@ it:
         enabled: 'listato %{when}'
         disabled: 'delistato %{when}'
     topic_admin_menu: "azioni amministrative sull'argomento"
+    wizard_required: "E' il momento di configurare il tuo forum! <a href='%{url}' data-auto-route='true'>Avvia la configurazione guidata</a>!"
     emails_are_disabled: "Tutte le email in uscita sono state disabilitate a livello globale da un amministratore. Non sarà inviata nessun tipo di notifica via email."
     bootstrap_mode_enabled: "Per aiutarti ad avviare il tuo nuovo sito, adesso sei in modalità bootstrap. Tutti i nuovi utenti saranno automaticamente promossi al livello 1 e riceveranno il riassunto quotidiano degli aggiornamenti via email. Questa modalità sarà disattivata automaticamente quando avrai più di %{min_users} utenti."
     bootstrap_mode_disabled: "La modalità bootstrap sarà disattivata entro 24 ore."
@@ -496,10 +497,7 @@ it:
       watched_topics_link: "Mostra argomenti osservati"
       automatically_unpin_topics: "Spunta automaticamente gli argomenti quando arrivi in fondo."
       revoke_access: "Revoca Accesso"
-      api_permissions: "Permessi:"
       api_approved: "Approvato:"
-      api_read: "lettura"
-      api_read_write: "lettura e scrittura"
       staff_counters:
         flags_given: "segnalazioni utili"
         flagged_posts: "messaggi segnalati"
@@ -665,9 +663,9 @@ it:
         rescind: "Rimuovi"
         rescinded: "Invito revocato"
         reinvite: "Rinvia Invito"
-        reinvite_all: "Re-invia tutti gli Inviti"
+        reinvite_all: "Rispedisci tutti gli Inviti"
         reinvited: "Invito rinviato"
-        reinvited_all: "Tutti gli inviti re-inviati"
+        reinvited_all: "Tutti gli inviti sono stati rispediti!"
         time_read: "Ora di Lettura"
         days_visited: "Presenza (giorni)"
         account_age_days: "Età dell'utente in giorni"
@@ -1782,7 +1780,7 @@ it:
         jump: '<b>#</b> Vai al messaggio n°'
         back: '<b>u</b> Indietro'
         up_down: '<b>k</b>/<b>j</b> Sposta la selezione &uarr; &darr;'
-        open: '<b>o</b> o <b>Enter</b> Apri l''argomento selezionato'
+        open: '<b>o</b> o <b>Invio</b> Apri argomento selezionato'
         next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Prossima/precedente sezione'
       application:
         title: 'Applicazione'
@@ -1802,16 +1800,16 @@ it:
         pin_unpin_topic: '<b>shift</b>+<b>p</b> Appunta/Spunta argomento'
         share_topic: '<b>shift</b>+<b>s</b> Condividi argomento'
         share_post: '<b>s</b> Condividi messaggio'
-        reply_as_new_topic: '<b>t</b> Rispondi con argomento collegato'
+        reply_as_new_topic: '<b>t</b> Rispondi come argomento collegato'
         reply_topic: '<b>shift</b>+<b>r</b> Rispondi all''argomento'
         reply_post: '<b>r</b> Rispondi al messaggio'
-        quote_post: '<b>q</b> Quota messaggio'
+        quote_post: '<b>q</b> Cita messaggio'
         like: '<b>l</b> Metti "Mi piace" al messaggio'
-        flag: '<b>!</b> Segnala il messaggio'
+        flag: '<b>!</b> Segnala messaggio'
         bookmark: '<b>b</b> Aggiungi un segnalibro al messaggio'
-        edit: '<b>e</b> Modifica il messaggio'
-        delete: '<b>d</b> Cancella il messaggio'
-        mark_muted: '<b>m</b>, <b>m</b> Ignora argomento'
+        edit: '<b>e</b> Modifica messaggio'
+        delete: '<b>d</b> Cancella messaggio'
+        mark_muted: '<b>m</b>, <b>m</b> Silenzia argomento'
         mark_regular: '<b>m</b>, <b>r</b> Argomento normale (default)'
         mark_tracking: '<b>m</b>, <b>t</b> Segui argomento'
         mark_watching: '<b>m</b>, <b>w</b> Osserva argomento'
@@ -1823,21 +1821,21 @@ it:
       others_count: "Altri utenti con questo distintivo (%{count})"
       title: Distintivi
       allow_title: "titolo disponibile"
-      multiple_grant: "assegnata più volte"
+      multiple_grant: "assegnato più volte"
       badge_count:
         one: "1 Distintivo"
         other: "%{count} Distintivi"
       select_badge_for_title: Seleziona un distintivo da usare come tuo titolo
-      none: "<none>"
+      none: "<nessuno>"
       badge_grouping:
         getting_started:
-          name: Inizia
+          name: Iniziali
         community:
-          name: Community
+          name: Comunità
         trust_level:
           name: Livello Esperienza
         other:
-          name: Altro
+          name: Altri
         posting:
           name: Pubblicazione
     google_search: |
@@ -1871,19 +1869,19 @@ it:
       notifications:
         watching:
           title: "In osservazione"
-          description: "Visualizzerai automaticamente tutti gli argomenti di questa categoria. Riceverai una notifica per tutti i nuovi messaggi e argomenti. Inoltre, accanto all'argomento apparirà il conteggio dei messaggi non letti e di quelli nuovi."
+          description: "Visualizzerai automaticamente tutti gli argomenti con questa etichetta. Riceverai una notifica per tutti i nuovi messaggi e argomenti. Inoltre, accanto all'argomento apparirà il conteggio dei messaggi non letti e di quelli nuovi."
         watching_first_post:
           title: "Osservando Primo Messaggio"
-          description: "Riceverai solo la notifica per il primo messaggio di ogni nuovo argomenti in questa categoria."
+          description: "Riceverai solo la notifica per il primo messaggio di ogni nuovo argomenti con questa etichetta."
         tracking:
-          title: "Tracking"
-          description: "Seguirai automaticamente tutti gli argomenti di questa categoria. Accanto all'argomento visualizzerai un conteggio dei messaggi non letti e di quelli nuovi."
+          title: "Seguiti"
+          description: "Seguirai automaticamente tutti gli argomenti con questa etichetta. Accanto all'argomento apparirà un conteggio dei messaggi non letti e di quelli nuovi."
         regular:
           title: "Normale"
-          description: "Riceverai una notifica se qualcuno tagga il tuo @nome o risponde ad un tuo messaggio."
+          description: "Riceverai una notifica se qualcuno menziona il tuo @nome o risponde al tuo messaggio."
         muted:
           title: "Silenziato"
-          description: "Non riceverai nessuna notifiche dei nuovi argomenti in questa categoria, e non comparirà il tab dei messaggi non letti."
+          description: "Non riceverai alcuna notifica per nuovi argomenti con questa etichetta, e non compariranno nella tab dei messaggi non letti."
       groups:
         title: "Gruppi Etichette"
         about: "Aggiungi etichette a gruppi per poterle gestire più facilmente."
@@ -1919,10 +1917,10 @@ it:
           bookmarks: "Non ci sono ulteriori argomenti nei segnalibri."
           search: "Non ci sono ulteriori risultati di ricerca."
     invite:
-      custom_message: "Rendi il tuo invito un po' più personale scrivendo un"
+      custom_message: "Rendi l'invito un po' più personale scrivendo un"
       custom_message_link: "messaggio personalizzato"
       custom_message_placeholder: "Inserisci il tuo messaggio personalizzato"
-      custom_message_template_forum: "Hey, unisciti a questo forum!"
+      custom_message_template_forum: "Ehi, unisciti a questo forum!"
   admin_js:
     type_to_filter: "digita per filtrare..."
     admin:
@@ -2104,7 +2102,7 @@ it:
         save: "Salva"
         destroy: "Elimina"
         description: "Descrizione"
-        controls: "Controlli"
+        controls: "Componenti"
         go_back: "Torna all'elenco"
         payload_url: "Aggiungi URL"
         payload_url_placeholder: "https://example.com/postreceive"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 5af99c7348..74cb676454 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -457,10 +457,7 @@ ko:
       muted_users_instructions: "이 회원이 보낸 알림 모두 숨김"
       muted_topics_link: "알림을 끈 주제 보기"
       automatically_unpin_topics: "글 끝에 다다르면 자동으로 주제 고정을 해제합니다."
-      api_permissions: "사용 권한:"
       api_approved: "승인됨:"
-      api_read: "읽기"
-      api_read_write: "읽기와 쓰기"
       staff_counters:
         flags_given: "유용한 신고"
         flagged_posts: "신고된 글"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index f67fe9ebb8..5fbd39f07e 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -38,6 +38,7 @@ nb_NO:
       long_date_with_year_without_time: "D MMM, 'YY"
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
       long_date_with_year_with_linebreak: "D MMM, 'YY <br/>LT"
+      wrap_ago: "%{date} siden"
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
@@ -112,6 +113,7 @@ nb_NO:
       private_topic: "gjorde dette emnet privat %{when}"
       invited_user: "inviterte %{who} %{when}"
       removed_user: "fjernet %{who} %{when}"
+      removed_group: "fjernet %{who} %{when}"
       autoclosed:
         enabled: 'lukket %{when}'
         disabled: 'åpnet %{when}'
@@ -128,6 +130,12 @@ nb_NO:
         enabled: 'festet globalt %{when}'
     topic_admin_menu: "admin-handlinger for emne"
     emails_are_disabled: "All utgående e-post har blitt deaktivert globalt av en administrator. Ingen e-postvarslinger vil bli sendt."
+    bootstrap_mode_disabled: "Bootstrap modus vil være deaktivert i de neste 24 timene"
+    s3:
+      regions:
+        eu_west_1: "EU (Irland)"
+        eu_central_1: "EU (Frankfurt)"
+        cn_north_1: "Kina (Beijing)"
     edit: 'rediger tittelen og kategorien til dette emnet'
     not_implemented: "Beklager, denne funksjonen har ikke blitt implementert enda."
     no_value: "Nei"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 2a0773b84a..2da1da4e0f 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -136,6 +136,7 @@ nl:
         enabled: 'zichtbaar %{when}'
         disabled: 'niet zichtbaar %{when}'
     topic_admin_menu: "Adminacties voor topic"
+    wizard_required: "Het is tijd om je forum te configureren! <a href='%{url}' data-auto-route='true'>Start de Setup Wizard</a>!"
     emails_are_disabled: "Alle uitgaande e-mails zijn uitgeschakeld door een beheerder. Geen enkele vorm van e-mail notificatie wordt verstuurd."
     bootstrap_mode_enabled: "Om het lanceren van een website makkelijker te maken, zit je nu in bootstrapmodus. Alle nieuwe gebruikers krijgen trustlevel 1 en zullen dagelijkse e-mailupdates krijgen. Dit wordt automatisch uitgeschakeld wanneer het totale gebruikersaantal hoger dan %{min_users} gebruikers wordt."
     bootstrap_mode_disabled: "Bootstrap modus zal uitgeschakeld worden in de komende 24 uur."
@@ -505,12 +506,9 @@ nl:
       watched_topics_link: "Toon in de gaten gehouden topics"
       automatically_unpin_topics: "Topics automatisch lospinnen als ik het laatste bericht bereik."
       apps: "Apps"
-      revoke_access: "Toegang intrekken"
-      undo_revoke_access: "Toegang intrekken ongedaan maken"
-      api_permissions: "Permissies:"
+      revoke_access: "Toegang Intrekken"
+      undo_revoke_access: "Toegang Intrekken Ongedaan Maken"
       api_approved: "Goedgekeurd:"
-      api_read: "lezen"
-      api_read_write: "lezen en schrijven"
       staff_counters:
         flags_given: "behulpzame markeringen"
         flagged_posts: "gemarkeerde berichten"
@@ -599,6 +597,7 @@ nl:
         title: "Interfacetaal"
         instructions: "De taal waarin het forum wordt getoond. Deze verandert als je de pagina herlaadt."
         default: "(standaard)"
+        any: "elke"
       password_confirmation:
         title: "Nogmaals het wachtwoord"
       last_posted: "Laatste bericht"
@@ -656,6 +655,7 @@ nl:
         after_4_minutes: "na 4 minuten"
         after_5_minutes: "na 5 minuten"
         after_10_minutes: "na 10 minuten"
+      notification_level_when_replying: "Als ik een bericht in een topic plaats , zet dat topic op"
       invited:
         search: "Typ om uitnodigingen te zoeken..."
         title: "Uitnodigingen"
@@ -1094,12 +1094,51 @@ nl:
         category: "Doorzoek de #{{category}} categorie"
         topic: "Zoek in deze topic"
         private_messages: "Zoek berichten"
+      advanced:
+        title: Uitgebreid Zoeken
+        posted_by:
+          label: Gepost door
+        in_category:
+          label: In Categorie
+        in_group:
+          label: In Groep
+        with_badge:
+          label: Meld Badge
+        with_tags:
+          label: Met Tags
+        filters:
+          label: Alleen topics/posts vinden...
+          likes: die ik geliked heb
+          posted: waar ik in gepost heb
+          watching: die ik watch
+          tracking: die ik volg
+          private: die in mijn berichten staan
+          bookmarks: die ik opgeslagen heb als favoriet
+          first: die het eerste bericht zijn
+          pinned: die gepind zijn
+          unpinned: die niet gepind zijn
+          wiki: die een wiki zijn
+        statuses:
+          label: Waar onderwerpen
+          open: open zijn
+          closed: gesloten zijn
+          archived: gearchiveerd zijn
+          noreplies: geen reacties hebben
+          single_user: een enkele gebruiker bevatten
+        post:
+          count:
+            label: Minimaal Bericht Aantal
+          time:
+            label: Geplaatst
+            before: voor
+            after: na
     hamburger_menu: "ga naar een andere topiclijst of categorie"
     new_item: "nieuw"
     go_back: 'ga terug'
     not_logged_in_user: 'gebruikerspagina met samenvatting van huidige activiteit en voorkeuren'
     current_user: 'ga naar je gebruikerspagina'
     topics:
+      new_messages_marker: "laatste bezoek"
       bulk:
         unlist_topics: "Topics van lijst halen"
         reset_read: "markeer als ongelezen"
@@ -1306,6 +1345,9 @@ nl:
       share:
         title: 'Deel'
         help: 'deel een link naar deze topic'
+      print:
+        title: 'Printen'
+        help: 'Open een printervriendelijke versie van dit topic'
       flag_topic:
         title: 'Markeer'
         help: 'geef een privé-markering aan deze topic of stuur er een privé-bericht over'
@@ -1916,6 +1958,7 @@ nl:
         mark_regular: '<b>m</b>, <b>r</b> Markeer topic als normaal'
         mark_tracking: '<b>m</b>, <b>t</b> Volg topic'
         mark_watching: '<b>m</b>, <b>w</b> Houd topic in de gaten'
+        print: '<b>ctrl</b>+<b>p</b> Print topic'
     badges:
       earned_n_times:
         one: "Deze badge is 1 keer verdiend"
@@ -2980,3 +3023,22 @@ nl:
           label: "Nieuw:"
           add: "Voeg toe"
           filter: "Zoeken (URL of Externe URL)"
+  wizard_js:
+    wizard:
+      done: "Klaar"
+      back: "Vorige"
+      next: "Volgende"
+      step: "%{current} van %{total}"
+      upload: "Uploaden"
+      uploading: "Uploaden..."
+      quit: "Misschien Later"
+      staff_count:
+        one: "Jouw community heeft 1 staflid."
+        other: "Jouw community heeft %{count} stafleden."
+      invites:
+        add_user: "toevoegen"
+        none_added: "Je hebt geen stafleden uitgenodigd. Weet je zeker dat je verder wilt gaan?"
+        roles:
+          admin: "Beheerder"
+          moderator: "Moderator"
+          regular: "Normale Gebruiker"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index ee9ef25f16..6989f7375e 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -527,10 +527,7 @@ pl_PL:
       apps: "Aplikacje"
       revoke_access: "Zablokuj dostęp"
       undo_revoke_access: "Cofnij zablokowanie dostępu"
-      api_permissions: "Uprawnienia:"
       api_approved: "Zatwierdzony:"
-      api_read: "odczyt"
-      api_read_write: "odczyt i zapis"
       staff_counters:
         flags_given: "uczynnych oflagowań"
         flagged_posts: "oflagowane wpisy"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 23fcff8137..22d5cdfb9f 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -166,7 +166,7 @@ pt:
     age: "Idade"
     joined: "Juntou-se"
     admin_title: "Administração"
-    flags_title: "Sinalizações"
+    flags_title: "Denúncias"
     show_more: "mostrar mais"
     show_help: "opções"
     links: "Hiperligações"
@@ -359,13 +359,13 @@ pt:
           title: "A Vigiar a Primeira Publicação"
           description: "Será apenas notificado acerca da primeira publicação em cada tópico deste grupo."
         tracking:
-          title: "A Acompanhar"
+          title: "A Seguir"
           description: "Será notificado se alguém mencionar o seu @nome ou lhe responder, e uma contagem de novas respostas será exibida."
         regular:
           title: "Habitual"
           description: "Será notificado se alguém mencionar o seu @nome ou responder-lhe."
         muted:
-          title: "Mudo"
+          title: "Silenciado"
           description: "Não será notificado de nada relacionado com novos tópicos neste grupo."
     user_action_groups:
       '1': "Gostos Dados"
@@ -471,22 +471,23 @@ pt:
         enabled: "Ativar modo de lista de distribuição"
         instructions: |
           Esta configuração sobrepõe o sumário de actividade.<br />
-          Tópicos e categorias mudos não são incluídos nestes correios electrónicos.
+          Tópicos e categorias silenciados não são incluídos nestes correios electrónicos.
         daily: "Enviar actualizações diárias"
         individual: "Enviar um email por cada nova publicação"
+        individual_no_echo: "Enviar um email por cada nova publicação excepto as minhas"
         many_per_day: "Mandar-me um email por cada nova publicação (cerca de {{dailyEmailEstimate}} por dia)"
         few_per_day: "Mandar-me um email por cada nova publicação (cerca de 2 por dia)"
       tag_settings: "Etiquetas"
       watched_tags: "Visto"
       watched_tags_instructions: "Irá vigiar automaticamente todos os novos tópicos nestas categorias. Será notificado de todas as novas respostas e tópicos, e uma contagem de novas respostas irá aparecer junto ao tópico."
-      tracked_tags: "Vigiado"
-      tracked_tags_instructions: "Irá acompanhar automaticamente todos os novos tópicos nestas categorias. Uma contagem de novas respostas irá aparecer junto ao tópico."
+      tracked_tags: "Seguido"
+      tracked_tags_instructions: "Irá seguir automaticamente todos os novos tópicos nestas categorias. Uma contagem de novas respostas irá aparecer junto ao tópico."
       muted_tags: "Silenciado"
       muted_tags_instructions: "Não será notificado de nada acerca de novos tópicos nestas categorias, e estes não irão aparecer nos recentes."
       watched_categories: "Vigiado"
       watched_categories_instructions: "Irá vigiar automaticamente todos os novos tópicos nestas categorias. Será notificado de todas as novas respostas e tópicos, e uma contagem de novas respostas irá aparecer junto ao tópico."
-      tracked_categories: "Acompanhado"
-      tracked_categories_instructions: "Irá acompanhar automaticamente todos os novos tópicos nestas categorias. Uma contagem de novas respostas irá aparecer junto ao tópico."
+      tracked_categories: "Seguido"
+      tracked_categories_instructions: "Irá seguir automaticamente todos os novos tópicos nestas categorias. Uma contagem de novas respostas irá aparecer junto ao tópico."
       watched_first_post_categories: "A Vigiar a Primeira Resposta"
       watched_first_post_categories_instructions: "Será notificado acerca da primeira resposta em cada novo tópico nestas categorias."
       watched_first_post_tags: "A Vigiar a Primeira Resposta"
@@ -500,20 +501,17 @@ pt:
       unread_message_count: "Mensagens"
       admin_delete: "Apagar"
       users: "Utilizadores"
-      muted_users: "Mudo"
+      muted_users: "Silenciado"
       muted_users_instructions: "Suprimir todas as notificações destes utilizadores."
-      muted_topics_link: "Mostrar tópicos mudos"
+      muted_topics_link: "Mostrar tópicos silenciados"
       watched_topics_link: "Mostrar tópicos vigiados"
       automatically_unpin_topics: "Desafixar tópicos automaticamente quando eu chegar ao final."
       apps: "Aplicações"
       revoke_access: "Rescindir Acesso"
       undo_revoke_access: "Cancelar Rescissão de Acesso"
-      api_permissions: "Permissões:"
       api_approved: "Aprovado:"
-      api_read: "ler"
-      api_read_write: "ler e escrever"
       staff_counters:
-        flags_given: "sinalizações úteis"
+        flags_given: "denúncias úteis"
         flagged_posts: "publicações denunciadas"
         deleted_posts: "publicações eliminadas"
         suspensions: "suspensões"
@@ -607,10 +605,10 @@ pt:
       last_emailed: "Último Email"
       last_seen: "Visto"
       created: "Juntou-se"
-      log_out: "Terminar sessão"
+      log_out: "Sair"
       location: "Localização"
       card_badge:
-        title: "Medalha de cartão de utilizador"
+        title: "Distintivo de Cartão de Utilizador"
       website: "Sítio da Internet"
       email_settings: "Email"
       like_notification_frequency:
@@ -647,7 +645,7 @@ pt:
         after_2_days: "criado nos últimos 2 dias"
         after_1_week: "criado na última semana"
         after_2_weeks: "criado nas últimas 2 semanas"
-      auto_track_topics: "Acompanhar automaticamente os tópicos em que eu entro"
+      auto_track_topics: "Seguir automaticamente os tópicos em que eu entro"
       auto_track_options:
         never: "nunca"
         immediately: "imediatamente"
@@ -735,9 +733,9 @@ pt:
         top_topics: "Melhores Tópicos"
         no_topics: "Nenhum tópico ainda."
         more_topics: "Mais Tópicos"
-        top_badges: "Melhores Medalhas"
-        no_badges: "Nenhuma medalha ainda."
-        more_badges: "Mais Medalhas"
+        top_badges: "Melhores Distintivos"
+        no_badges: "Nenhuma distintivo ainda."
+        more_badges: "Mais Distintivos"
         top_links: "Melhores hiperligações"
         no_links: "Não há nenhuma hiperligação ainda."
         most_liked_by: "Por mais apreciados"
@@ -810,7 +808,7 @@ pt:
     day: 'dia'
     first_post: Primeira publicação
     mute: Silenciar
-    unmute: Reativar
+    unmute: Desactivar silenciamento
     last_post: Última publicação
     last_reply_lowercase: última resposta
     replies_lowercase:
@@ -967,8 +965,10 @@ pt:
       show_preview: 'mostrar pré-visualização &raquo;'
       hide_preview: '&laquo; esconder pré-visualização'
       quote_post_title: "Citar publicação inteira"
+      bold_label: "B"
       bold_title: "Negrito"
       bold_text: "texto em negrito"
+      italic_label: "I"
       italic_title: "Itálico"
       italic_text: "texto em itálico"
       link_title: "Hiperligação"
@@ -980,11 +980,13 @@ pt:
       quote_text: "Bloco de Citação"
       code_title: "Texto pré-formatado"
       code_text: "identar texto pré-formatado até 4 espaços"
+      paste_code_text: "escreva ou cole código aqui"
       upload_title: "Carregar"
       upload_description: "digite aqui a descrição do ficheiro carregado"
       olist_title: "Lista numerada"
       ulist_title: "Lista de items"
       list_item: "Item da Lista"
+      heading_label: "H"
       heading_title: "Título"
       heading_text: "Título"
       hr_title: "Barra horizontal"
@@ -993,6 +995,9 @@ pt:
       modal_ok: "OK"
       modal_cancel: "Cancelar"
       cant_send_pm: "Desculpe, não pode enviar uma mensagem para %{username}."
+      yourself_confirm:
+        title: "Esqueceu-se de adicionar destinatários?"
+        body: "Neste momento esta mensagem está a ser enviada a você apenas!"
       admin_options_title: "Configurações opcionais do pessoal para este tópico"
       auto_close:
         label: "Tempo de fecho automático do tópico:"
@@ -1006,6 +1011,7 @@ pt:
     notifications:
       title: "notificações de menções de @nome, respostas às suas publicações e tópicos, mensagens, etc"
       none: "Impossível de carregar as notificações neste momento."
+      empty: "Nenhumas notificações encontradas."
       more: "ver notificações antigas"
       total_flagged: "total de publicações denunciadas"
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -1025,7 +1031,8 @@ pt:
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> aceitou o seu convite</p>"
       moved_post: "<i title='publicação movida' class='fa fa-sign-out'></i><p><span>{{username}}</span> moveu {{description}}</p>"
       linked: "<i title='publicação ligada' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Ganhou '{{description}}'</p>"
+      granted_badge: "<i title='distintivo concedido' class='fa fa-certificate'></i><p>Ganhou '{{description}}'</p>"
+      watching_first_post: "<i title='novo tópico' class='fa fa-dot-circle-o'></i><p><span>Novo Tópico</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagem na caixa de entrada do seu grupo {{group_name}}</p>"
         other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagens na caixa de entrada do seu grupo {{group_name}}</p>"
@@ -1069,11 +1076,12 @@ pt:
     search:
       sort_by: "Ordenar por"
       relevance: "Relevância"
-      latest_post: "Última Publicação"
+      latest_post: "Publicação Mais Recente"
       most_viewed: "Mais Visto"
       most_liked: "Mais Gostos"
       select_all: "Selecionar Tudo"
       clear_all: "Limpar Tudo"
+      too_short: "O seu termo de pesquisa é demasiado curto."
       result_count:
         one: "1 resultado para <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} resultados para <span class='term'>\"{{term}}\"</span>"
@@ -1084,26 +1092,54 @@ pt:
       post_format: "#{{post_number}} por {{username}}"
       context:
         user: "Procurar publicações por @{{username}}"
+        category: "Pesquise na categoria #{{category}}"
         topic: "Pesquisar este tópico"
         private_messages: "Pesquisar mensagens"
       advanced:
+        title: Pesquisa Avançada
         posted_by:
           label: Publicado por
+        in_category:
+          label: Na Categoria
+        in_group:
+          label: No Grupo
+        with_badge:
+          label: Com Distintivo
+        with_tags:
+          label: Com Etiquetas
         filters:
           label: Apenas devolver tópicos/respostas que...
+          likes: eu gostei
           posted: Eu publiquei em
+          watching: estou a vigiar
+          tracking: estou a seguir
+          private: estão nas minhas mensagens
+          bookmarks: eu adicionei marcadores
           first: são a primeira publicação
+          pinned: estão afixados
+          unpinned: não estão afixados
+          wiki: são wiki
+        statuses:
+          label: Aonde tópicos
+          open: estão abertos
+          closed: estão fechados
+          archived: estão arquivados
+          noreplies: têm zero respostas
+          single_user: contêm um único utilizador
         post:
           count:
             label: Número Mínimo de Publicações
           time:
             label: Publicado
+            before: antes
+            after: depois
     hamburger_menu: "ir para outra lista de tópicos ou categorias"
     new_item: "novo"
     go_back: 'voltar atrás'
     not_logged_in_user: 'página de utilizador com resumo da atividade atual e preferências  '
     current_user: 'ir para a sua página de utilizador'
     topics:
+      new_messages_marker: "última visita"
       bulk:
         unlist_topics: "Remover Tópicos da Lista"
         reset_read: "Repor Leitura"
@@ -1111,8 +1147,8 @@ pt:
         dismiss: "Marcar Visto"
         dismiss_read: "Marcar todos os não lidos como vistos"
         dismiss_button: "Marcar visto..."
-        dismiss_tooltip: "Marcar como vistas apenas novas mensagens ou parar o acompanhamento de tópicos"
-        also_dismiss_topics: "Parar de acompanhar estes tópicos para que estes nunca me apareçam como não lidos novamente"
+        dismiss_tooltip: "Marcar como vistas apenas novas mensagens ou parar de seguir tópicos"
+        also_dismiss_topics: "Parar de seguir estes tópicos para que estes nunca me apareçam como não lidos novamente"
         dismiss_new: "Marcar Visto Novos"
         toggle: "ativar seleção em massa de tópicos"
         actions: "Ações em Massa"
@@ -1140,7 +1176,7 @@ pt:
         search: "Não há resultados na pesquisa."
         educate:
           new: '<p>Os seus novos tópicos aparecem aqui.</p><p>Por defeito, os tópicos são considerados novos e mostrarão o indicador <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">novo</span> caso tenham sido criados nos últimos 2 dias.</p><p>Pode alterar isto nas suas <a href="%{userPrefsUrl}"> preferências</a>.</p>'
-          unread: '<p>As suas publicações não lidas aparecem aqui.</p><p>Por defeito, tópicos são considerados não lidos e mostrarão contadores de não lidos <span class="badge new-posts badge-notification">1</span> se você:</p><ul><li>Criou o tópico</li><li>Respondeu ao tópico</li><li>Leu o tópico durante mais de 4 minutos</li></ul><p>Ou marcou explicitamente  o tópico como Acompanhado ou Vigiado via o controle de notificações no fundo de cada tópico.</p><p>Visite as suas <a href="%{userPrefsUrl}">preferências</a> para mudar isto.</p>'
+          unread: '<p>As suas publicações não lidas aparecem aqui.</p><p>Por defeito, tópicos são considerados não lidos e mostrarão contadores de não lidos <span class="badge new-posts badge-notification">1</span> se você:</p><ul><li>Criou o tópico</li><li>Respondeu ao tópico</li><li>Leu o tópico durante mais de 4 minutos</li></ul><p>Ou marcou explicitamente  o tópico como Seguido ou Vigiado via o controle de notificações no fundo de cada tópico.</p><p>Visite as suas <a href="%{userPrefsUrl}">preferências</a> para mudar isto.</p>'
       bottom:
         latest: "Não existem mais tópicos recentes."
         hot: "Não existem mais tópicos quentes."
@@ -1222,7 +1258,9 @@ pt:
         one: "A última publicação neste tópico já tem 1 hora, por isso o tópico será fechado imediatamente."
         other: "A última publicação neste tópico já tem %{count} horas, por isso o tópico será fechado imediatamente."
       timeline:
+        back: "Retroceder"
         back_description: "Voltar à última publicação não lida"
+        replies_short: "%{current} / %{total}"
       progress:
         title: progresso do tópico
         go_top: "topo"
@@ -1235,15 +1273,18 @@ pt:
         total: total de publicações
         current: publicação atual
       notifications:
+        title: mudar quão frequentemente é notificado sobre este tópico
         reasons:
+          mailing_list_mode: "Tem o modo de lista de mailing activado, por isso será notificado de respostas a este tópico por email."
+          '3_10': 'Receberá notificações porque está a vigiar uma etiqueta neste tópico.'
           '3_6': 'Receberá notificações porque está a vigiar esta categoria.'
           '3_5': 'Receberá notificações porque começou a vigiar automaticamente este tópico.'
           '3_2': 'Receberá notificações porque está a vigiar este tópico.'
           '3_1': 'Receberá notificações porque criou este tópico.'
           '3': 'Receberá notificações porque está a vigiar este tópico.'
-          '2_8': 'Receberá notificações porque está a acompanhar esta categoria.'
+          '2_8': 'Receberá notificações porque está a seguir esta categoria.'
           '2_4': 'Receberá notificações porque publicou uma resposta a este tópico.'
-          '2_2': 'Receberá notificações porque está a acompanhar este tópico.'
+          '2_2': 'Receberá notificações porque está a seguir este tópico.'
           '2': 'Receberá notificações porque <a href="/users/{{username}}/preferences">leu este tópico</a>.'
           '1_2': 'Será notificado se alguém mencionar o seu @nome ou responder-lhe.'
           '1': 'Será notificado se alguém mencionar o seu @nome ou responder-lhe.'
@@ -1257,10 +1298,10 @@ pt:
           title: "A vigiar"
           description: "Será notificado de cada nova resposta neste tópico, e uma contagem de novas respostas será exibida."
         tracking_pm:
-          title: "Acompanhar"
+          title: "A Seguir"
           description: "Uma contagem de novas respostas será exibida para esta mensagem. Será notificado se alguém mencionar o seu @nome ou responder-lhe."
         tracking:
-          title: "Acompanhar"
+          title: "A Seguir"
           description: "Uma contagem de novas respostas será exibida para este tópico. Será notificado se alguém mencionar o seu @nome ou responder-lhe."
         regular:
           title: "Habitual"
@@ -1305,10 +1346,13 @@ pt:
       share:
         title: 'Partilhar'
         help: 'Partilhar uma hiperligação para este tópico'
+      print:
+        title: 'Imprimir'
+        help: 'Abrir uma versão para impressão deste tópico'
       flag_topic:
-        title: 'Sinalizar'
-        help: 'sinalizar privadamente este tópico para consideração ou enviar uma notificação privada sobre o mesmo'
-        success_message: 'Sinalizou este tópico com sucesso.'
+        title: 'Denunciar'
+        help: 'denunciar privadamente este tópico para consideração ou enviar uma notificação privada sobre o mesmo'
+        success_message: 'Denunciou este tópico com sucesso.'
       feature_topic:
         title: "Destacar este tópico"
         pin: "Fazer este tópico aparecer no topo da categoria {{categoryLink}} até"
@@ -1319,8 +1363,8 @@ pt:
         pin_validation: "É necessária uma data para fixar este tópico."
         not_pinned: "Não há tópicos fixados em {{categoryLink}}."
         already_pinned:
-          one: "Tópicos atualmente fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Tópicos atualmente fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Tópicos atualmente afixados em {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Tópicos atualmente afixados em {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Fazer com que este tópico apareça no topo da lista de todos os tópicos até"
         confirm_pin_globally: "Já tem {{count}} tópicos fixados globalmente. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do topo de todas as listas de tópicos."
@@ -1328,20 +1372,22 @@ pt:
         global_pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios."
         not_pinned_globally: "Não existem tópicos fixados globalmente."
         already_pinned_globally:
-          one: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "Tópicos atualmente afixados globalmente: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Tópicos atualmente afixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Tornar este tópico numa faixa que apareça no topo de todas as páginas."
         remove_banner: "Remover a faixa que aparece no topo de todas as páginas."
         banner_note: "Os utilizadores podem  marcar vista a faixa por fecharem-na. Apenas um tópico pode ser posto como faixa em qualquer momento."
         no_banner_exists: "Não existe tópico de faixa."
         banner_exists: "<strong class='badge badge-notification unread'>Existe</strong> atualmente um tópico de faixa."
       inviting: "A Convidar..."
+      automatically_add_to_groups: "Este convite também inclui acesso a estes grupos:"
       invite_private:
         title: 'Convidar para Mensagem'
         email_or_username: "Email ou Nome de Utilizador do Convidado"
         email_or_username_placeholder: "endereço de email ou nome de utilizador"
         action: "Convidar"
         success: "Convidámos esse utilizador para participar nesta mensagem."
+        success_group: "Convidámos esse grupo para participar nesta mensagem."
         error: "Pedimos desculpa, ocorreu um erro ao convidar esse utilizador."
         group_name: "nome do grupo"
       controls: "Controlos de Tópico"
@@ -1496,48 +1542,48 @@ pt:
         unhide: "Mostrar"
         change_owner: "Mudar Titularidade"
       actions:
-        flag: 'Sinalizar'
+        flag: 'Denunciar'
         defer_flags:
-          one: "Diferir sinalização"
-          other: "Diferir sinalizações"
+          one: "Diferir denúncia"
+          other: "Diferir denúncias"
         undo:
-          off_topic: "Retirar sinalização"
-          spam: "Retirar sinalização"
-          inappropriate: "Retirar sinalização"
+          off_topic: "Retirar denúncia"
+          spam: "Retirar denúncia"
+          inappropriate: "Retirar denúncia"
           bookmark: "Remover marcador"
           like: "Retirar gosto"
           vote: "Retirar voto"
         people:
-          off_topic: "sinalizou isto como fora de contexto"
-          spam: "sinalizou isto como spam"
-          inappropriate: "sinalizou isto como inapropriado"
+          off_topic: "denunciou isto como fora de contexto"
+          spam: "denunciou isto como spam"
+          inappropriate: "denunciou isto como inapropriado"
           notify_moderators: "moderadores notificados"
           notify_user: "enviou uma mensagem"
           bookmark: "adicionou um marcador disto"
           like: "gostou disto"
           vote: "votou nisto"
         by_you:
-          off_topic: "Sinalizou isto como fora de contexto"
-          spam: "Sinalizou isto como spam"
-          inappropriate: "Sinalizou isto como inapropriado"
-          notify_moderators: "Sinalizou isto para moderação"
+          off_topic: "Denunciou isto como fora de contexto"
+          spam: "Denunciou isto como spam"
+          inappropriate: "Denunciou isto como inapropriado"
+          notify_moderators: "Denunciou isto para moderação"
           notify_user: "Enviou uma mensagem a este utilizador"
           bookmark: "Adicionou um marcador a esta publicação"
           like: "Gostou disto"
           vote: "Votou nesta publicação"
         by_you_and_others:
           off_topic:
-            one: "Para além de si, 1 pessoa sinalizou isto como fora de contexto"
-            other: "Para além de si, {{count}} pessoas sinalizaram isto como fora de contexto"
+            one: "Para além de si, 1 pessoa denunciou isto como fora de contexto"
+            other: "Para além de si, {{count}} pessoas denunciaram isto como fora de contexto"
           spam:
-            one: "Para além de si, 1 pessoa sinalizou isto como spam"
-            other: "Para além de si, {{count}} pessoas sinalizaram isto como spam"
+            one: "Para além de si, 1 pessoa denunciou isto como spam"
+            other: "Para além de si, {{count}} pessoas denunciaram isto como spam"
           inappropriate:
-            one: "Para além de si, 1 pessoa sinalizou isto como inapropriado"
-            other: "Para além de si, {{count}} pessoas sinalizaram isto como inapropriado"
+            one: "Para além de si, 1 pessoa denunciou isto como inapropriado"
+            other: "Para além de si, {{count}} pessoas denunciaram isto como inapropriado"
           notify_moderators:
-            one: "Para além de si, 1 pessoa sinalizaram isto para moderação"
-            other: "Para além de si, {{count}} pessoas sinalizaram isto para moderação"
+            one: "Para além de si, 1 pessoa denunciou isto para moderação"
+            other: "Para além de si, {{count}} pessoas denunciaram isto para moderação"
           notify_user:
             one: "Para além de si, 1 outro utilizador enviaram uma mensagem a este utilizador"
             other: "Para além de si, {{count}} outros utilizadores enviaram uma mensagem a este utilizador"
@@ -1552,17 +1598,17 @@ pt:
             other: "Para além de si, {{count}} pessoas votaram nesta publicação"
         by_others:
           off_topic:
-            one: "1 pessoa sinalizou isto como fora de contexto"
-            other: "{{count}} pessoas sinalizaram isto como fora de contexto"
+            one: "1 pessoa denunciou isto como fora de contexto"
+            other: "{{count}} pessoas denunciaram isto como fora de contexto"
           spam:
-            one: "1 pessoa sinalizou isto como spam"
-            other: "{{count}} pessoas sinalizaram isto como spam"
+            one: "1 pessoa denunciou isto como spam"
+            other: "{{count}} pessoas denunciaram isto como spam"
           inappropriate:
-            one: "1 pessoa sinalizou isto como impróprio"
-            other: "{{count}} pessoas sinalizaram isto como inapropriado"
+            one: "1 pessoa denunciou isto como impróprio"
+            other: "{{count}} pessoas denunciaram isto como inapropriado"
           notify_moderators:
-            one: "1 pessoa sinalizou isto para moderação"
-            other: "{{count}} pessoas sinalizaram isto para moderação"
+            one: "1 pessoa denunciou isto para moderação"
+            other: "{{count}} pessoas denunciaram isto para moderação"
           notify_user:
             one: "1 pessoa enviou uma mensagem a este utilizador"
             other: "{{count}} enviaram uma mensagem a este utilizador"
@@ -1614,6 +1660,11 @@ pt:
       general: 'Geral'
       settings: 'Configurações'
       topic_template: "Modelo do Tópico"
+      tags: "Etiquetas"
+      tags_allowed_tags: "Etiquetas que só podem ser usadas nesta categoria:"
+      tags_allowed_tag_groups: "Grupos de etiquetas que só podem ser usados nesta categoria:"
+      tags_placeholder: "(Opcional) lista de etiquetas perimitidas"
+      tag_groups_placeholder: "(Opcional) lista de grupos de etiquetas permitidos"
       delete: 'Eliminar Categoria'
       create: 'Nova Categoria'
       create_long: 'Criar uma nova categoria'
@@ -1663,8 +1714,10 @@ pt:
           description: "Irá vigiar automaticamente todos os novos tópicos nestas categorias. Será notificado de todas as novas respostas em cada tópico, e uma contagem de novas respostas será mostrada."
         watching_first_post:
           title: "A Vigiar a Primeira Publicação"
+          description: "Será notificado acerca da primeira resposta em cada novo tópico nestas categorias."
         tracking:
-          title: "Acompanhar"
+          title: "A Seguir"
+          description: "Irá seguir automaticamente todos os novos tópicos nestas categorias. Será notificado sempre que alguém menciona o seu @nome ou responde a si, e uma contagem de novas respostas será mostrada."
         regular:
           title: "Normal"
           description: "Será notificado se alguém mencionar o seu @nome ou responder-lhe."
@@ -1673,17 +1726,18 @@ pt:
           description: "Nunca será notificado de nada acerca de novos tópicos nestas categorias, e estes não irão aparecer nos recentes."
     flagging:
       title: 'Obrigado por ajudar a manter a nossa comunidade cívica!'
-      action: 'Sinalizar Mensagem'
+      action: 'Denunciar Mensagem'
       take_action: "Acionar"
       notify_action: 'Mensagem'
       official_warning: 'Aviso Oficial'
       delete_spammer: "Eliminar Spammer"
+      delete_confirm_MF: "Está prestes a apagar {POSTS, plural, one {<b>1</b> publicação} other {<b>#</b> publicações}} e {TOPICS, plural, one {<b>1</b> tópico} other {<b>#</b> tópicos}}  deste utilizador, remover a conta do mesmo, bloquear acessos a partir do endereço IP <b>%{ip_address}</b> correspondente, e adicionar o endereço de email <b>{email}</b> a uma lista negra permanente. Tem a certeza que este utilizador é de facto um spammer?"
       yes_delete_spammer: "Sim, Eliminar Spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(escondido)"
-      submit_tooltip: "Submeter a sinalização privada"
-      take_action_tooltip: "Atingir imediatamente o limite de sinalizações, em vez de esperar por mais denúncias da comunidade"
-      cant: "Pedimos desculpa, não é possível colocar uma sinalização nesta mensagem neste momento."
+      submit_tooltip: "Submeter a denúncia privada"
+      take_action_tooltip: "Atingir imediatamente o limite de denúncias, em vez de esperar por mais denúncias da comunidade"
+      cant: "Pedimos desculpa, não é possível colocar uma denúncia nesta mensagem neste momento."
       notify_staff: 'Notificar o pessoal privadamente'
       formatted_name:
         off_topic: "Está fora do contexto"
@@ -1691,17 +1745,33 @@ pt:
         spam: "É Spam"
       custom_placeholder_notify_user: "Seja específico, seja construtivo e seja sempre amável."
       custom_placeholder_notify_moderators: "Diga-nos especificamente quais são as suas preocupações, e forneça-nos hiperligações relevantes e exemplo se possível."
+      custom_message:
+        at_least:
+          one: "insira pelo menos 1 caráter"
+          other: "insira pelo menos {{count}} carateres"
+        more:
+          one: "1 a seguir..."
+          other: "{{count}} a seguir..."
+        left:
+          one: "1 restante"
+          other: "{{count}} restantes"
     flagging_topic:
       title: "Obrigado por ajudar a manter a nossa comunidade cívica!"
-      action: "Sinalizar Tópico"
+      action: "Denunciar Tópico"
       notify_action: "Mensagem"
     topic_map:
       title: "Sumário do Tópico"
       participants_title: "Autores Frequentes"
       links_title: "Hiperligações Populares"
+      links_shown: "mostrar mais ligações..."
       clicks:
         one: "1 clique"
         other: "%{count} cliques"
+    post_links:
+      about: "expandir mais ligações para esta publicação"
+      title:
+        one: "1 mais"
+        other: "%{count} mais"
     topic_statuses:
       warning:
         help: "Este é um aviso oficial."
@@ -1783,7 +1853,7 @@ pt:
         title_with_count:
           one: "Não Lido (1)"
           other: "Não Lidos ({{count}})"
-        help: "tópicos que está atualmente a vigiar ou a acompanhar com mensagens não lidas"
+        help: "tópicos que está atualmente a vigiar ou a seguir com publicações não lidas"
         lower_title_with_count:
           one: "1 não lido"
           other: "{{count}} não lidos"
@@ -1836,10 +1906,177 @@ pt:
       full: "Criar / Responder / Ver"
       create_post: "Responder / Ver"
       readonly: "Ver"
+    lightbox:
+      download: "descarregar"
     keyboard_shortcuts_help:
+      title: 'Atalhos de Teclado'
+      jump_to:
+        title: 'Ir Para'
+        home: '<b>g</b>, <b>h</b> Início'
+        latest: '<b>g</b>, <b>l</b> Recentes'
+        new: '<b>g</b>, <b>n</b> Novo'
+        unread: '<b>g</b>, <b>u</b> Não lido'
+        categories: '<b>g</b>, <b>c</b> Categorias'
+        top: '<b>g</b>, <b>t</b> Topo'
+        bookmarks: '<b>g</b>, <b>b</b> Marcadores'
+        profile: '<b>g</b>, <b>p</b> Perfil'
+        messages: '<b>g</b>, <b>m</b> Mensagens'
+      navigation:
+        title: 'Navegação'
+        jump: '<b>#</b> Ir para a publicação #'
+        back: '<b>u</b> Retroceder'
+        up_down: '<b>k</b>/<b>j</b> Mover seleção &uarr; &darr;'
+        open: '<b>o</b> ou <b>Enter</b> Abrir tópico selecionado'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Secção seguinte/anterior'
       application:
+        title: 'Aplicação'
+        create: '<b>c</b> Criar um novo tópico'
+        notifications: '<b>n</b> Abrir notificações'
+        hamburger_menu: '<b>=</b> Abrir menu hamburger'
+        user_profile_menu: '<b>p</b> Abrir menu de utilizador'
+        show_incoming_updated_topics: '<b>.</b> Mostrar tópicos atualizados'
+        search: '<b>/</b> Pesquisar'
+        help: '<b>?</b> Abrir ajuda do teclado'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Marcar Visto Novos/Publicações'
         dismiss_topics: '<b>x</b>, <b>t</b> Marcar Visto Tópicos'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Sair'
+      actions:
+        title: 'Ações'
+        bookmark_topic: '<b>f</b> Alternar marcador de tópico'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> Afixar/Desafixar tópico'
+        share_topic: '<b>shift</b>+<b>s</b> Partilhar tópico'
+        share_post: '<b>s</b> Partilhar publicação'
+        reply_as_new_topic: '<b>t</b> Responder como tópico ligado'
+        reply_topic: '<b>shift</b>+<b>r</b> Responder ao tópico'
+        reply_post: '<b>r</b> Responder à publicação'
+        quote_post: '<b>q</b> Citar publicação'
+        like: '<b>l</b> Gostar da publicação'
+        flag: '<b>!</b> Denunciar publicação'
+        bookmark: '<b>b</b> Adicionar publicação aos marcadores'
+        edit: '<b>e</b> Editar publicação'
+        delete: '<b>d</b> Eliminar publicação'
+        mark_muted: '<b>m</b>, <b>m</b> Silenciar tópico'
+        mark_regular: '<b>m</b>, <b>r</b> Tópico Habitual (por defeito)'
+        mark_tracking: '<b>m</b>, <b>t</b> Seguir tópico'
+        mark_watching: '<b>m</b>, <b>w</b> Vigiar tópico'
+        print: '<b>ctrl</b>+<b>p</b> Imprimir tópico'
+    badges:
+      earned_n_times:
+        one: "Ganhou este distintivo 1 vez"
+        other: "Ganhou este distintivo %{count} vezes"
+      granted_on: "Concedido %{date}"
+      others_count: "Outros com este distintivo (%{count})"
+      title: Distintivos
+      allow_title: "título disponivel"
+      multiple_grant: "atribuido multiplas vezes"
+      badge_count:
+        one: "1 Distintivo"
+        other: "%{count} Distintivos"
+      more_badges:
+        one: "+1 Mais"
+        other: "+%{count} Mais"
+      granted:
+        one: "1 concedido"
+        other: "%{count} concedidos"
+      select_badge_for_title: Selecionar um distintivo para usar como seu título
+      none: "<none>"
+      badge_grouping:
+        getting_started:
+          name: Começar
+        community:
+          name: Comunidade
+        trust_level:
+          name: Nível de Confiança
+        other:
+          name: Outros
+        posting:
+          name: A publicar
+    google_search: |
+      <h3>Pesquisar com o Google</h3>
+      <p>
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <input type="text" id='user-query' value="">
+      <input type='hidden' id='google-query' name="q">
+      <button class="btn btn-primary">Google</button>
+      </form>
+      </p>
+    tagging:
+      all_tags: "Todas as Etiquetas"
+      selector_all_tags: "todas as etiquetas"
+      selector_no_tags: "sem etiquetas"
+      changed: "etiquetas modificadas:"
+      tags: "Etiquetas"
+      choose_for_topic: "escolha etiquetas opcionais para este tópico"
+      delete_tag: "Remover Etiqueta"
+      delete_confirm: "Tem a certeza que deseja remover esta etiqueta?"
+      rename_tag: "Renomear Etiqueta"
+      rename_instructions: "Escolha o novo nome para a etiqueta:"
+      sort_by: "Ordenar por:"
+      sort_by_count: "contagem"
+      sort_by_name: "nome"
+      manage_groups: "Gerir Grupos de Etiquetas"
+      manage_groups_description: "Definir grupos para organizar etiquetas"
+      filters:
+        without_category: "%{filter} %{tag} tópicos"
+        with_category: "%{filter} %{tag} tópicos em %{category}"
+        untagged_without_category: "%{filter} tópicos sem etiquetas"
+        untagged_with_category: "%{filter} tópicos sem etiquetas em %{category}"
+      notifications:
+        watching:
+          title: "A vigiar"
+          description: "Vigiará automaticamente todos os tópicos nesta etiqueta. Será notificado acerca de todas as novas publicações e tópicos, e será-lhe apresentada a contagem de publicações novas e por ler ao lado do tópico."
+        watching_first_post:
+          title: "A Vigiar a Primeira Publicação"
+          description: "Será notificado acerca da primeira publicação em cada tópico deste grupo."
+        tracking:
+          title: "A Seguir"
+          description: "Irá automaticamente seguir todos os tópicos nesta etiqueta. Uma contagem de publicações não lidas e novas aparecerá ao lado to tópico."
+        regular:
+          title: "Regular"
+          description: "Será notificado se alguém mencionar o seu @nome ou responder à sua publicação."
+        muted:
+          title: "Silenciado"
+          description: "Não será notificado acerca de novos tópicos sob esta etiqueta, não aparecendo eles no seu separador de não lidos."
+      groups:
+        title: "Grupos de Etiquetas"
+        about: "Adicione grupos de etiquetas para geri-las mais facilmente."
+        new: "Novo Grupo"
+        tags_label: "Etiquetas neste grupo:"
+        parent_tag_label: "Etiqueta pai:"
+        parent_tag_placeholder: "Opcional"
+        parent_tag_description: "Etiquetas deste grupo não podem ser usadas sem ter a etiqueta pai presente."
+        one_per_topic_label: "Limitar a uma etiqueta por tópico deste grupo"
+        new_name: "Novo Grupo de Etiquetas"
+        save: "Guardar"
+        delete: "Apagar"
+        confirm_delete: "Tem a certeza que quer apagar este grupo de etiquetas?"
+      topics:
+        none:
+          unread: "Não tem tópicos por ler."
+          new: "Não tem novos tópicos."
+          read: "Ainda não leu nenhum tópico."
+          posted: "Ainda não publicou em qualquer tópico."
+          latest: "Não há tópicos recentes."
+          hot: "Não há tópicos quentes."
+          bookmarks: "Ainda não marcou nenhum tópico."
+          top: "Não há melhores tópicos."
+          search: "Não há resultados da pesquisa."
+        bottom:
+          latest: "Não existem mais tópicos recentes."
+          hot: "Não existem mais tópicos quentes."
+          posted: "Não existem mais tópicos publicados."
+          read: "Não existem mais tópicos lidos."
+          new: "Não existem mais tópicos novos."
+          unread: "Não existem mais tópicos não lidos."
+          top: "Não existem mais melhores tópicos."
+          bookmarks: "Não há mais tópicos marcados."
+          search: "Não há mais resultados da pesquisa."
+    invite:
+      custom_message: "Torne o seu convite mais pessoal escrevendo uma"
+      custom_message_link: "mensagem personalizada"
+      custom_message_placeholder: "Insira a sua mensagem personalizada"
+      custom_message_template_forum: "Olá, devia juntar-se a este fórum!"
+      custom_message_template_topic: "Olá, achei que poderia gostar deste tópico!"
   admin_js:
     type_to_filter: "digite para filtrar..."
     admin:
@@ -1896,51 +2133,51 @@ pt:
         latest_changes: "Últimas alterações: atualize com frequência!"
         by: "por"
       flags:
-        title: "Sinalizações"
+        title: "Denúncias"
         old: "Antigo"
         active: "Ativo"
         agree: "Aceitar"
-        agree_title: "Confirmar esta sinalização como válida e correta"
+        agree_title: "Confirmar esta denúncia como válida e correta"
         agree_flag_modal_title: "Aceitar e..."
         agree_flag_hide_post: "Aceitar (esconder mensagem + enviar MP)"
         agree_flag_hide_post_title: "Esconder esta publicação e enviar automaticamente uma mensagem ao utilizador solicitando a edição urgente da mesma"
         agree_flag_restore_post: "Concordar (restaurar mensagem)"
         agree_flag_restore_post_title: "Restaurar esta mensagem"
-        agree_flag: "Concordar com a sinalização"
-        agree_flag_title: "Concordar com a sinalização e manter a mensagem inalterada"
+        agree_flag: "Concordar com a denúncia"
+        agree_flag_title: "Concordar com a denúncia e manter a publicação inalterada"
         defer_flag: "Diferir"
-        defer_flag_title: "Remover esta sinalização; não requer qualquer ação de momento."
+        defer_flag_title: "Remover esta denúncia; não requer qualquer ação de momento."
         delete: "Eliminar"
-        delete_title: "Eliminar a mensagem associada a esta sinalização."
-        delete_post_defer_flag: "Eliminar mensagem e diferir a sinalização."
+        delete_title: "Eliminar a publicação associada a esta denúncia."
+        delete_post_defer_flag: "Eliminar publicação e diferir a denúncia."
         delete_post_defer_flag_title: "Eliminar mensagem; se é a primeira do tópico então eliminar o tópico"
-        delete_post_agree_flag: "Eliminar mensagem e Concordar com a sinalização"
+        delete_post_agree_flag: "Eliminar publicação e Concordar com a denúncia"
         delete_post_agree_flag_title: "Eliminar mensagem; se é a primeira do tópico então eliminar o tópico"
         delete_flag_modal_title: "Eliminar e…"
         delete_spammer: "Eliminar Spammer"
         delete_spammer_title: "Remover utilizador e todos as mensagens e tópicos do mesmo."
         disagree_flag_unhide_post: "Discordar (exibir mensagem)"
-        disagree_flag_unhide_post_title: "Remover qualquer sinalização desta mensagem e torná-la visível novamente"
+        disagree_flag_unhide_post_title: "Remover qualquer denúncia desta publicação e torná-la visível novamente"
         disagree_flag: "Discordar"
-        disagree_flag_title: "Negar esta sinalização como inválida ou incorreta"
+        disagree_flag_title: "Negar esta denúncia como inválida ou incorreta"
         clear_topic_flags: "Concluído"
-        clear_topic_flags_title: "Este tópico foi investigado e os problemas foram resolvidos. Clique em Concluído para remover as sinalizações."
+        clear_topic_flags_title: "Este tópico foi investigado e os problemas foram resolvidos. Clique em Concluído para remover as denúncias."
         more: "(mais respostas...)"
         dispositions:
           agreed: "concordado"
           disagreed: "discordado"
           deferred: "diferido"
-        flagged_by: "Sinalizado por"
+        flagged_by: "Denunciado por"
         resolved_by: "Resolvido por"
         took_action: "Realizou uma ação"
         system: "Sistema"
         error: "Aconteceu um erro"
         reply_message: "Responder"
-        no_results: "Não há sinalizações."
-        topic_flagged: "Este <strong>tópico</strong> foi sinalizado."
+        no_results: "Não há denúncias."
+        topic_flagged: "Este <strong>tópico</strong> foi denunciado."
         visit_topic: "Visitar tópico para acionar medidas"
-        was_edited: "A mensagem foi editada após a primeira sinalização"
-        previous_flags_count: "Esta mensagem já foi sinalizada {{count}} vezes."
+        was_edited: "A publicação foi editada após a primeira denúncia"
+        previous_flags_count: "Esta publicação já foi denunciada {{count}} vezes."
         summary:
           action_type_3:
             one: "fora do contexto"
@@ -1990,6 +2227,14 @@ pt:
         add_owners: Adicionar proprietários
         incoming_email: "Endereço de email de entrada personalizado"
         incoming_email_placeholder: "introduza o endereço de email"
+        flair_url: "Imagem da Marca de Avatar"
+        flair_url_placeholder: "(Opcional) URL da Imagem ou classe de Font Awesome"
+        flair_bg_color: "Cor de fundo da Marca de Avatar"
+        flair_bg_color_placeholder: "(Opcional) Valor Hexadecimal da cor"
+        flair_color: "Cor da Marca de Avatar"
+        flair_color_placeholder: "(Opcional) Valor Hexadecimal da cor"
+        flair_preview: "Pré-visualização"
+        flair_note: "Nota: a Marca de um utilizador só aparecerá para o seu grupo primário."
       api:
         generate_master: "Gerar Chave Mestra API "
         none: "Não existem chaves API ativas neste momento."
@@ -2004,6 +2249,76 @@ pt:
         info_html: "A sua chave API permitirá a criação e edição de tópicos usando pedidos JSON."
         all_users: "Todos os Utilizadores"
         note_html: "Manter esta chave <strong>secreta</strong>, todos os utilizadores que a tenham poderão criar mensagens arbitrárias como qualquer utilizador."
+      web_hooks:
+        title: "Webhooks"
+        none: "Não existem webhooks neste momento."
+        instruction: "Webhooks permitem ao Discourse notificar serviços externos quando certos eventos acontecem no seu site. Quando o webhook é despoletado, um pedido POST será enviado aos URLs fornecidos."
+        detailed_instruction: "Um pedido POST será enviado ao URL fornecido quando o evento escolhido acontecer."
+        new: "Novo Webhook"
+        create: "Criar"
+        save: "Guardar"
+        destroy: "Apagar"
+        description: "Descrição"
+        controls: "Controlos"
+        go_back: "Voltar à lista"
+        payload_url: "URL de carga"
+        payload_url_placeholder: "https://example.com/postreceive"
+        warn_local_payload_url: "Parece que está a tentar configurar um webhook para um url local. Eventos entregues num endereço local poderão causar efeitos secundários ou comportamentos inesperados. Continuar?"
+        secret_invalid: "O segredo não pode ter espaços."
+        secret_too_short: "O segredo tem de ter pelo menos 12 caracteres."
+        secret_placeholder: "Um texto adicional, usado para gerar uma assinatura"
+        event_type_missing: "Tem de configurar pelo menos um tipo de evento."
+        content_type: "Tipo de Conteúdo"
+        secret: "Segredo"
+        event_chooser: "Que eventos gostaria que este webhook despoletasse?"
+        wildcard_event: "Enviar-me tudo."
+        individual_event: "Selecionar eventos individuais."
+        verify_certificate: "Verificar certificado TLS do url de carga"
+        active: "Ativo"
+        active_notice: "Entregaremos detalhes do evento quando este acontecer."
+        categories_filter_instructions: "Webhooks relevantes serão despoletados apenas se o evento estiver relacionado com as categorias especificadas. Deixar em branco para despoletar webhooks para todas as categorias."
+        categories_filter: "Categorias Despoletadas"
+        groups_filter_instructions: "Webhooks relevantes serão despoletados apenas se o evento estiver relacionado com grupos especificados. Deixar em branco para despoletar webhooks para todos os grupos."
+        groups_filter: "Grupos Despoletados"
+        delete_confirm: "Apagar este webhook?"
+        topic_event:
+          name: "Evento de Tópico"
+          details: "Quando um tópico é novo, revisto, modificado ou apagado. "
+        post_event:
+          name: "Evento de Publicação"
+          details: "Quando uma resposta é nova, editada, apagada ou recuperada. "
+        user_event:
+          name: "Evento de Utilizador"
+          details: "Quando um utilizador é criado ou aprovado."
+        delivery_status:
+          title: "Estado de Entrega"
+          inactive: "Inativo"
+          failed: "Falhado"
+          successful: "Sucesso"
+        events:
+          none: "Não há eventos relacionados."
+          redeliver: "Re-entregar."
+          incoming:
+            one: "Existe 1 evento novo."
+            other: "Existem {{count}} eventos novos."
+          completed_in:
+            one: "Completado em 1 segundos."
+            other: "Completado em {{count}} segundo."
+          request: "Pedido"
+          response: "Resposta"
+          redeliver_confirm: "Tem a certeza de que quer re-entregar a mesma carga?"
+          headers: "Cabeçalhos"
+          payload: "Carga"
+          body: "Corpo"
+          go_list: "Ir para à lista"
+          go_details: "Editar webhook"
+          go_events: "Ir para eventos"
+          ping: "Ping"
+          status: "Código de Estado"
+          event_id: "ID"
+          timestamp: "Criado"
+          completion: "Tempo de Resposta"
+          actions: "Ações"
       plugins:
         title: "Plugins"
         installed: "Plugins Instalados"
@@ -2090,7 +2405,7 @@ pt:
         long_title: "Personalizações do Sítio"
         css: "CSS"
         header: "Cabeçalho"
-        top: "Topo"
+        top: "Os Melhores"
         footer: "Rodapé"
         embedded_css: "CSS incorporado"
         head_tag:
@@ -2292,6 +2607,7 @@ pt:
             backup_operation: "operação de cópia de segurança"
             deleted_tag: "etiqueta removida"
             renamed_tag: "etiqueta renomeada"
+            revoke_email: "revogar email"
         screened_emails:
           title: "Emails Filtrados"
           description: "Quando alguém tenta criar uma nova conta, os seguintes endereços de email serão verificados e o registo será bloqueado, ou outra ação será executada."
@@ -2359,7 +2675,7 @@ pt:
           newuser: 'Utilizadores no Nível de Confiança 0 (Novo Utilizador)'
           basic: 'Utilizadores no Nível de Confiança 1 (Utilizador Básico)'
           member: 'Utilizadores no Nível de Confiança 2 (Membro)'
-          regular: 'Utilizadores no Nível de Confiança 3 (Habitual)'
+          regular: 'Utilizadores no Nível de Confiança 3 (Regular)'
           leader: 'Utilizadores no Nível de Confiança 4 (Líder)'
           staff: "Pessoal"
           admins: 'Utilizadores da Administração'
@@ -2386,6 +2702,7 @@ pt:
         suspend_reason: "Motivo"
         suspended_by: "Suspendido por"
         delete_all_posts: "Eliminar todas as mensagens"
+        delete_all_posts_confirm_MF: "Está prestes a apagar {POSTS, plural, one {1  publicação} other {# publicações}}  e {TOPICS, plural, one {1 tópico} other {# tópicos}}. Tem a certeza de que quer continuar?"
         suspend: "Suspender"
         unsuspend: "Retirar a suspensão"
         suspended: "Suspendido?"
@@ -2401,7 +2718,7 @@ pt:
         show_public_profile: "Mostrar Perfil Público"
         impersonate: 'Personificar'
         ip_lookup: "Pesquisa de IP"
-        log_out: "Terminar Sessão"
+        log_out: "Sair"
         logged_out: "Sessão do utilizador encerrada em todos os dispositivos"
         revoke_admin: 'Revogar Administração'
         grant_admin: 'Conceder Administração'
@@ -2418,10 +2735,10 @@ pt:
         posts_read_count: Mensagens lidas
         post_count: Mensagens criadas
         topics_entered: Tópicos Visualizados
-        flags_given_count: Sinalizações Dadas
-        flags_received_count: Sinalizações Recebidas
+        flags_given_count: Denúncias Dadas
+        flags_received_count: Denúncias Recebidas
         warnings_received_count: Avisos Recebidos
-        flags_given_received_count: 'Sinalizações Dadas / Recebidas'
+        flags_given_received_count: 'Denúncias Dadas / Recebidas'
         approve: 'Aprovar'
         approved_by: "aprovado por"
         approve_success: "Utilizador aprovado e email enviado com instruções de ativação."
@@ -2459,9 +2776,18 @@ pt:
         block_failed: 'Ocorreu um problema ao bloquear o utilizador.'
         block_confirm: 'Tem a certeza que pretende bloquear este utilizador? Este não será capaz de criar novos tópicos ou mensagens.'
         block_accept: 'Sim, bloquear este utilizador'
+        bounce_score: "Número de Redirecionamentos"
+        reset_bounce_score:
+          label: "Repor"
+          title: "Repor número de redirecionamentos a 0"
         deactivate_explanation: "Um utilizador desativado deve revalidar o seu email."
         suspended_explanation: "Um utilizador suspenso não pode iniciar sessão."
         block_explanation: "Um utilizador bloqueado não pode publicar mensagens ou iniciar tópicos."
+        staged_explanation: "Um utilizador temporário pode apenas publicar por email em tópicos específicos."
+        bounce_score_explanation:
+          none: "Nenhum redirecionamento foi recebido recentemente desse email."
+          some: "Alguns redirecionamentos foram recebidos recentemente desse email."
+          threshold_reached: "Demasiados redirecionamentos recebidos desse email."
         trust_level_change_failed: "Ocorreu um problema ao alterar o Nível de Confiança do utilizador."
         suspend_modal_title: "Utilizador Suspenso"
         trust_level_2_users: "Utilizadores no Nível de Confiança 2"
@@ -2472,6 +2798,9 @@ pt:
         unlock_trust_level: "Desbloquear Nível de Confiança"
         tl3_requirements:
           title: "Requisitos para o Nível de Confiança 3"
+          table_title:
+            one: "Nos último dia:"
+            other: "Nos últimos %{count}  dias:"
           value_heading: "Valor"
           requirement_heading: "Requisito"
           visits: "Visitas"
@@ -2481,8 +2810,8 @@ pt:
           topics_viewed_all_time: "Tópicos Visualizados (desde sempre)"
           posts_read: "Mensagens lidas"
           posts_read_all_time: "Mensagens lidas (desde sempre)"
-          flagged_posts: "Mensagens Sinalizadas"
-          flagged_by_users: "Utilizadores Que Sinalizaram"
+          flagged_posts: "Publicações Denunciadas"
+          flagged_by_users: "Utilizadores Que Denunciaram"
           likes_given: "Gostos Dados"
           likes_received: "Gostos Recebidos"
           likes_received_days: "Gostos recebidos: dias únicos"
@@ -2568,15 +2897,17 @@ pt:
           seo: 'SEO'
           spam: 'Spam'
           rate_limits: 'Limites de Classificação'
-          developer: 'Programador'
+          developer: 'Desenvolvedor'
           embedding: "Incorporação"
           legal: "Legal"
+          user_api: 'API de Utlizador'
           uncategorized: 'Outro'
           backups: "Fazer Cópias de Segurança"
           login: "Iniciar Sessão"
           plugins: "Plugins"
           user_preferences: "Preferências do Utilizador"
           tags: "Etiquetas"
+          search: "Pesquisar"
       badges:
         title: Distintivos
         new_badge: Novo Distintivo
@@ -2631,10 +2962,10 @@ pt:
           plan_text: "Pré-visualizar com plano de consulta"
           modal_title: "Pré-visualização da \"Query\" de Distintivo"
           sql_error_header: "Ocorreu um erro com a consulta."
-          error_help: "Veja as seguintes hiperligações para obter ajuda com \"queries\" de distintivos"
+          error_help: "Veja as seguintes ligações para obter ajuda com \"queries\" de distintivos"
           bad_count_warning:
             header: "AVISO!"
-            text: "Estão em falta amostras de concessão. Isto acontece quando a \"query\" do sistema de distintivos devolve IDs de nomes de utilizador ou IDs de mensagens que não existem. Isto pode causar resultados inesperados futuramente, sendo que deverá rever a sua \"query\"."
+            text: "Estão em falta amostras de concessão. Isto acontece quando a \"query\" do sistema de distintivos devolve IDs de nomes de utilizador ou IDs de publicações que não existem. Isto pode causar resultados inesperados futuramente, sendo que deverá rever a sua \"query\"."
           no_grant_count: "Nenhuns distintivos a atribuir."
           grant_count:
             one: "<b>1</b> distintivo a atribuir."
@@ -2658,6 +2989,7 @@ pt:
         sample: "Utilize o seguinte código HTML no seu sítio para criar e incorporar tópicos do discourse. Substitua <b>REPLACE_ME</b> pelo URL canónico da página onde está a incorporá-los."
         title: "Incorporação"
         host: "Servidores Permitidos"
+        path_whitelist: "Lista Branca de Caminhos"
         edit: "editar"
         category: "Mensagem para Categoria"
         add_host: "Adicionar Servidor"
@@ -2669,9 +3001,11 @@ pt:
         embed_by_username: "Nome de uilizador para criação do tópico"
         embed_post_limit: "Número máximo de mensagens a incorporar"
         embed_username_key_from_feed: "Chave para puxar o nome de utilizador discouse do feed"
+        embed_title_scrubber: "Expressão regular usada para filtrar o título de publicações"
         embed_truncate: "Truncar as mensagens incorporadas"
         embed_whitelist_selector: "Seletor CSS para elementos que são permitidos nas incorporações"
         embed_blacklist_selector: "Seletor CSS para elementos que são removidos das incorporações"
+        embed_classname_whitelist: "Nomes de classes CSS permitidas"
         feed_polling_enabled: "Importar mensagens através de RSS/ATOM"
         feed_polling_url: "URL do feed RSS/ATOM para rastreio"
         save: "Guardar Configurações de Incorporação"
@@ -2690,3 +3024,22 @@ pt:
           label: "Novo:"
           add: "Adicionar"
           filter: "Pesquisar (URL ou URL Externo)"
+  wizard_js:
+    wizard:
+      done: "Concluído"
+      back: "Retroceder"
+      next: "Próximo"
+      step: "%{current} de %{total}"
+      upload: "Carregar"
+      uploading: "A carregar…"
+      quit: "Talvez Mais Tarde"
+      staff_count:
+        one: "A sua comunidade tem 1 membro na equipa de apoio."
+        other: "A sua comunidade tem %{count} membros na equipa de apoio."
+      invites:
+        add_user: "adicionar"
+        none_added: "Não convidou ninguém para a equipa de apio. Tem a certeza de que quer continuar?"
+        roles:
+          admin: "Administrador"
+          moderator: "Moderador"
+          regular: "Utilizador Regular"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 5d5af5f1ca..2d63e841f0 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -504,8 +504,9 @@ pt_BR:
       muted_topics_link: "Mostrar tópicos silenciados"
       watched_topics_link: "Mostrar tópicos observados"
       automatically_unpin_topics: "Desafixar automaticamente os tópicos quando eu chegar ao fundo."
-      api_permissions: "Permissões:"
-      api_read_write: "ler e escrever"
+      apps: "Aplicativos"
+      revoke_access: "Revogar Acesso"
+      api_approved: "Aprovada:"
       staff_counters:
         flags_given: "sinalizadas úteis"
         flagged_posts: "posts sinalizados"
@@ -904,6 +905,7 @@ pt_BR:
       win10: "Win10"
     category_page_style:
       categories_only: "Categorias Apenas"
+      categories_with_featured_topics: "Categorias com Tópicos em Destaque"
       categories_and_latest_topics: "Categorias e Últimos Tópicos"
     shortcut_modifier_key:
       shift: 'Shift'
@@ -1082,12 +1084,46 @@ pt_BR:
         category: "Procurar a categoria #{{category}}"
         topic: "Procurar nesse tópico"
         private_messages: "Procurar mensagens"
+      advanced:
+        title: Busca avançada
+        posted_by:
+          label: Postado por
+        in_category:
+          label: Em Categoria
+        in_group:
+          label: Em Grupo
+        with_badge:
+          label: Com Emblema
+        with_tags:
+          label: Com Etiquetas
+        filters:
+          label: Retornar apenas tópicos/publicações que...
+          likes: Eu gostei
+          posted: Eu publiquei em
+          watching: Eu estou assistindo
+          tracking: Eu estou rastreando
+          private: estão em minhas mensagens
+          bookmarks: Eu marquei
+          pinned: está fixado
+          unpinned: não está fixado
+        statuses:
+          open: está aberto
+          closed: está fechado
+          archived: está arquivado
+          noreplies: tem zero respostas
+          single_user: contém um único usuário
+        post:
+          time:
+            label: Publicado
+            before: antes
+            after: depois
     hamburger_menu: "ir para outra listagem de tópicos ou categoria"
     new_item: "novo"
     go_back: 'voltar'
     not_logged_in_user: 'página do usuário com resumo de atividades correntes e preferencias'
     current_user: 'ir para a sua página de usuário'
     topics:
+      new_messages_marker: "última visita"
       bulk:
         unlist_topics: "Tópicos Não Listados"
         reset_read: "Redefinir Lido"
@@ -1187,7 +1223,7 @@ pt_BR:
       toggle_information: "alternar detalhes do tópico"
       read_more_in_category: "Quer ler mais? Procure outros tópicos em {{catLink}} ou {{latestLink}}."
       read_more: "Quer ler mais? {{catLink}} ou {{latestLink}}."
-      read_more_MF: "Há { UNREAD, plural, =0 {} one { <a href='/unread'>1 não lido</a> }\tother { are <a href='/unread'># não lidos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {} other{}} <a href='/new'>1 novo</a> tópico} other { {BOTH, select, true{e } false {} other{}} <a href='/new'># novos</a> tópicos} } ou {CATEGORY, select, true {veja outros tópicos em {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "Há { UNREAD, plural, =0 {} one { <a href='/unread'>1 não lido</a> }\tother {<a href='/unread'># não lidos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {} other{}} <a href='/new'>1 novo</a> tópico} other { {BOTH, select, true{e } false {} other{}} <a href='/new'># novos</a> tópicos} } ou {CATEGORY, select, true {veja outros tópicos em {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Procurar em todas as categorias
       view_latest_topics: ver tópicos mais recentes
       suggest_create_topic: Que tal criar um tópico?
@@ -2154,6 +2190,7 @@ pt_BR:
         add_owners: Adicionar proprietários
         incoming_email: "Endereço de email de entrada personalizado"
         incoming_email_placeholder: "Insira um endereço de email"
+        flair_preview: "Pré-visualizar"
       api:
         generate_master: "Gerar chave Mestra de API"
         none: "Não existem chaves API ativas no momento."
@@ -2168,6 +2205,31 @@ pt_BR:
         info_html: "Sua chave de API permitirá a criação e edição de tópicos usando requests JSON."
         all_users: "Todos os Usuários"
         note_html: "Guarde esta chave <strong>secretamente</strong>, todos usuários que tiverem acesso a ela poderão criar posts arbritários no forum como qualquer usuário."
+      web_hooks:
+        create: "Criar"
+        save: "Salvar"
+        destroy: "Excluir"
+        description: "Descrição"
+        controls: "Controles"
+        go_back: "Volta à lista"
+        payload_url_placeholder: "https://example.com/postreceive"
+        secret: "Segredo"
+        wildcard_event: "Envie-me tudo."
+        individual_event: "Selecionar eventos individuais."
+        active: "Ativo"
+        post_event:
+          name: "Publicar Evento"
+        delivery_status:
+          title: "Status de Entrega"
+          inactive: "Inativo"
+          failed: "Falhou"
+          successful: "Sucesso"
+        events:
+          response: "Resposta"
+          headers: "Cabeçalhos"
+          body: "Corpo"
+          timestamp: "Criado"
+          actions: "Ações"
       plugins:
         title: "Plugins"
         installed: "Plugins Instalados"
@@ -2751,6 +2813,7 @@ pt_BR:
           plugins: "Plugins"
           user_preferences: "Preferências de Usuário"
           tags: "Marcações"
+          search: "Procurar"
       badges:
         title: Emblemas
         new_badge: Novo Emblema
@@ -2865,3 +2928,17 @@ pt_BR:
           label: "Novo:"
           add: "Adicionar"
           filter: "Busca (URL ou URL Externa)"
+  wizard_js:
+    wizard:
+      done: "Feito"
+      back: "Voltar"
+      next: "Próximo"
+      upload: "Enviar"
+      uploading: "Enviando..."
+      quit: "Talvez Depois"
+      invites:
+        add_user: "adicionar"
+        roles:
+          admin: "Admin"
+          moderator: "Moderador"
+          regular: "Usuário Regular"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 698a5f827c..8a5b657060 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -503,6 +503,7 @@ ro:
           Subiectele setate pe silențios și categoriile nu sunt incluse în aceste emailuri."
         daily: "Trimite actualizări zilnice"
         individual: "Trimite un email pentru fiecare postare nouă"
+        individual_no_echo: "Trimite un email pentru fiecare postare nouă în afară de postările mele"
         many_per_day: "Trimite câte un email pentru pentru fiecare nouă postare (aproximativ {{dailyEmailEstimate}} pe zi)"
         few_per_day: "Trimite câte un email pentru fiecare nouă postare (aproximativ 2 pe zi)"
       tag_settings: "Etichete"
@@ -537,10 +538,7 @@ ro:
       apps: "Aplicații"
       revoke_access: "Revocă accesul"
       undo_revoke_access: "Anulează revocarea accesului"
-      api_permissions: "Permisiuni:"
       api_approved: "Aprobate:"
-      api_read: "citire"
-      api_read_write: "citire și scriere"
       staff_counters:
         flags_given: "Marcaje ajutătoare"
         flagged_posts: "Postări marcate"
@@ -1787,6 +1785,7 @@ ro:
       email_in_disabled: "Postarea subiectelor noi prin email este dezactivată din setările siteului. Pentru a activa postarea subiectelor noi prin email,"
       email_in_disabled_click: 'activează opțiunea "primire email ".'
       suppress_from_homepage: "Elimină această categorie de pe pagina principală."
+      sort_order: "Sortare implicită:"
       allow_badges_label: "Permite acordarea de ecusoane în această categorie"
       edit_permissions: "Editează permisiuni"
       add_permission: "Adaugă permisiune"
@@ -1812,6 +1811,18 @@ ro:
         muted:
           title: "Setat pe silențios"
           description: "Nu vei fi niciodată notificat cu privire la nimic legat de noile subiecte din aceste categorii și ele nu vor apărea în listă."
+      sort_options:
+        default: "implicit"
+        likes: "Aprecieri"
+        op_likes: "Aprecieri la postarea originală"
+        views: "Vizualizări"
+        posts: "Postări"
+        activity: "Activitate"
+        posters: "Autori"
+        category: "Categorie"
+        created: "Creat"
+      sort_ascending: 'Crescător'
+      sort_descending: 'Descrescător'
     flagging:
       title: 'Îți mulțumim că ne ajuți să păstrăm o comunitate civilizată!'
       action: 'Marcare'
@@ -2209,7 +2220,7 @@ ro:
         admins: 'Admini:'
         blocked: 'Blocați:'
         suspended: 'Suspendați:'
-        private_messages_short: "Msje"
+        private_messages_short: "Mesje"
         private_messages_title: "Mesaje"
         mobile_title: "Mobil"
         space_free: "{{size}} liber"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 4f186a3a65..6f336f57cb 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -172,6 +172,7 @@ ru:
         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 часов."
@@ -408,9 +409,11 @@ ru:
           title: "Наблюдать"
           description: "Уведомлять по каждому ответу на это сообщение и показывать счетчик новых непрочитанных ответов."
         watching_first_post:
+          title: "Просмотр Первого сообщения"
           description: "Уведомлять только о первом сообщении в каждой новой теме в этой группе."
         tracking:
           title: "Следить"
+          description: "Вы будете уведомлены если кто-то упомянет ваше @name или ответит вам. А так же вам будет показано общее количество новых ответов"
         regular:
           title: "Уведомлять"
           description: "Вам придёт уведомление, если кто-нибудь упомянет ваш @псевдоним или ответит вам."
@@ -514,6 +517,7 @@ ru:
       suspended_notice: "Пользователь заморожен до {{date}}."
       suspended_reason: "Причина:"
       github_profile: "Github"
+      email_activity_summary: "Сводка Активности"
       mailing_list_mode:
         label: "Режим почтовой рассылки"
         enabled: "Включить почтовую рассылку"
@@ -522,14 +526,23 @@ ru:
           Темы и разделы с выключенными уведомлениями не будут включены в письма рассылки.
         daily: "Присылать ежедневные обновления"
         individual: "Присылать письмо для каждого нового сообщения"
+        individual_no_echo: "Присылать письмо для каждого нового сообщения, кроме тех случаев когда пост явлается моим"
         many_per_day: "Присылать письмо для каждого нового сообщения (примерно {{dailyEmailEstimate}} в день)"
         few_per_day: "Присылать письмо для каждого нового сообщения (примерно 2 в день)"
       tag_settings: "Теги"
       watched_tags: "Наблюдение"
+      watched_tags_instructions: "Вы будете автоматически отслеживать все новые темы в этих тэгах. Вам будут приходить уведомления о новых сообщениях и темах, а также количество непрочитанных и новых сообщений будет показано рядом с названиями тем. "
+      tracked_tags: "Отслеживаемая"
+      tracked_tags_instructions: "Вы будете автоматически отслеживать новые темы в этих разделах. Рядом со списком тем будет отображено количество непрочитанных и новых сообщений."
       muted_tags: "Выключено"
+      muted_tags_instructions: "Вы не будете получать уведомления о новых темах в этих разделах. Также, они не будут показываться во вкладке Непрочитанное."
       watched_categories: "Наблюдение"
+      watched_categories_instructions: "Вы будете автоматически отслеживать новые темы в этих разделах. Вам будут приходить уведомления о новых сообщениях и темах, а также рядом со списком тем будет отображено количество  новых сообщений."
       tracked_categories: "Отслеживаемые разделы"
+      tracked_categories_instructions: "Вы будете получать уведомления о каждом новом сообщении в этой теме. Рядом со списком тем также будет показано количество новых сообщений."
+      watched_first_post_categories: "Просмотр Первого сообщения"
       watched_first_post_categories_instructions: "Уведомлять только о первом сообщении в каждой новой теме в этих разделах."
+      watched_first_post_tags: "Просмотр Первого сообщения"
       watched_first_post_tags_instructions: "Уведомлять только о первом сообщении в каждой новой теме с этими тегами."
       muted_categories: "Выключенные разделы"
       muted_categories_instructions: "Не уведомлять меня о новых темах в этих разделах и не показывать новые темы на странице «Непрочитанные»."
@@ -545,6 +558,10 @@ ru:
       muted_topics_link: "Показать темы \"Без уведомлений\""
       watched_topics_link: "Показать наблюдаемые темы"
       automatically_unpin_topics: "Автоматически откреплять топики после прочтения."
+      apps: "Приложения"
+      revoke_access: "Лишить прав доступа"
+      undo_revoke_access: "Отменить Лишение прав доступа"
+      api_approved: "Подтверждено"
       staff_counters:
         flags_given: "полезные жалобы"
         flagged_posts: "сообщения с жалобами"
@@ -573,6 +590,7 @@ ru:
         error: "При изменении значения произошла ошибка."
       change_username:
         title: "Изменить псевдоним"
+        confirm: "Если вы измените имя пользователя, то все предыдущие цитирования и обращения по @name станут неработоспособными. Вы уверены, что вы хотите это сделать?"
         taken: "Этот псевдоним уже занят."
         error: "При изменении псевдонима произошла ошибка."
         invalid: "Псевдоним должен состоять только из цифр и латинских букв"
@@ -633,6 +651,7 @@ ru:
         title: "Язык интерфейса"
         instructions: "Язык сайта. Необходимо перезагрузить страницу, чтобы изменения вступили в силу."
         default: "(по умолчанию)"
+        any: "любой"
       password_confirmation:
         title: "Пароль еще раз"
       last_posted: "Последнее сообщение"
@@ -652,15 +671,20 @@ ru:
         first_time: "Только для первой симпатии"
         never: "Никогда"
       email_previous_replies:
+        title: "Добавить предыдущие ответы к концу электронных писем"
+        unless_emailed: "если ранее не отправляли"
         always: "всегда"
         never: "никогда"
       email_digests:
+        title: "В случае моего отсутствия на форуме, присылайте мне сводку популярных новостей"
         every_30_minutes: "каждые 30 минут"
         every_hour: "каждый час"
         daily: "ежедневно"
         every_three_days: "каждые 3 дня"
         weekly: "еженедельно"
         every_two_weeks: "каждые 2 недели"
+      include_tl0_in_digests: "Включить контент от новых пользователей в сводки, отправляемые по электронной почте"
+      email_in_reply_to: "Добавить отрывок \"ответил на сообщение\" в электронных писмах"
       email_direct: "Присылать почтовое уведомление, когда кто-то цитирует меня, отвечает на мой пост, упоминает мой @псевдоним или приглашает меня в тему"
       email_private_messages: "Присылать почтовое уведомление, когда кто-то оставляет мне сообщение"
       email_always: "Присылать почтовое уведомление, даже если я присутствую на сайте"
@@ -685,6 +709,7 @@ ru:
         after_4_minutes: "более 4х минут"
         after_5_minutes: "более 5 минут"
         after_10_minutes: "более 10 минут"
+      notification_level_when_replying: "Когда я пишу в теме, установить эту тему для"
       invited:
         search: "Введите текст для поиска по приглашениям..."
         title: "Приглашения"
@@ -746,6 +771,16 @@ ru:
           few: "сообщения написал"
           many: "сообщений написал"
           other: "сообщений написал"
+        likes_given:
+          one: "<i class='fa fa-heart'></i> поставил"
+          few: "<i class='fa fa-heart'></i> given"
+          many: "<i class='fa fa-heart'></i> given"
+          other: "<i class='fa fa-heart'></i> given"
+        likes_received:
+          one: "<i class='fa fa-heart'></i> получил"
+          few: "<i class='fa fa-heart'></i> получил"
+          many: "<i class='fa fa-heart'></i> получил"
+          other: "<i class='fa fa-heart'></i> получил"
         days_visited:
           one: "день заходил"
           few: "дня заходил"
@@ -758,9 +793,9 @@ ru:
           other: "сообщений прочел"
         bookmark_count:
           one: "закладка"
-          few: "закладок"
-          many: "закладки"
-          other: "закладки"
+          few: "закладки"
+          many: "закладок"
+          other: "закладок"
         top_replies: "Лучшие сообщения"
         no_replies: "Пока не написал ни одного сообщения."
         more_replies: "... другие сообщения"
@@ -770,10 +805,11 @@ ru:
         top_badges: "Самые престижные награды"
         no_badges: "Еще не получил ни одной награды."
         more_badges: "... другие награды"
-        top_links: "Лучшие темы"
-        no_links: "Пока нет ссылок"
-        most_liked_by: "Больше всего симпатий от"
-        most_liked_users: "Больше всего симпатий"
+        top_links: "Лучшие ссылки"
+        no_links: "Пока нет ссылок."
+        most_liked_by: "Поклонники"
+        most_liked_users: "Фавориты"
+        most_replied_to_users: "Самые активные собеседники"
         no_likes: "Пока ни одной симпатии."
       associated_accounts: "Связанные аккаунты"
       ip_address:
@@ -823,6 +859,8 @@ ru:
     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> сообщений. Новым пользователям будет интереснее тут, если появится больше сообщений для обсуждения."
     learn_more: "подробнее..."
+    all_time: 'всего'
+    all_time_desc: 'всего создано тем'
     year: 'год'
     year_desc: 'темы, созданные за последние 365 дней'
     month: 'месяц'
@@ -934,6 +972,10 @@ ru:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+    category_page_style:
+      categories_only: "Только разделы"
+      categories_with_featured_topics: "Разделы и их лучшие темы"
+      categories_and_latest_topics: "Разделы и список последних тем форума"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -943,14 +985,22 @@ ru:
       more_emoji: "еще..."
       options: "Дополнительные опции"
       whisper: "внутреннее сообщение"
+      unlist: "исключена из списков тем"
       add_warning: "Это официальное предупреждение."
       toggle_whisper: "Внутреннее сообщение"
+      toggle_unlisted: "Спрятать из списков тем"
       posting_not_on_topic: "В какой теме вы хотите ответить?"
       saving_draft_tip: "Сохранение..."
       saved_draft_tip: "Сохранено"
       saved_local_draft_tip: "Сохранено локально"
       similar_topics: "Ваша тема похожа на..."
       drafts_offline: "Черновики, сохраненные в офлайн"
+      group_mentioned:
+        one: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>1му пользователю</a> – вы уверены?"
+        few: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
+        many: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
+        other: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
+      duplicate_link: "Эту же самую ссылку на <b>{{domain}}</b> уже писал <b>@{{username}}</b> в <a href='{{post_url}}'>своем ответе {{ago}}</a> – вы уверены, что хотите повторить ссылку снова?"
       error:
         title_missing: "Требуется название темы"
         title_too_short: "Название темы должно быть не короче {{min}} символов"
@@ -980,33 +1030,40 @@ ru:
       show_preview: 'показать предпросмотр &raquo;'
       hide_preview: '&laquo; скрыть предпросмотр'
       quote_post_title: "Процитировать сообщение целиком"
+      bold_label: "Ж"
       bold_title: "Жирный"
-      bold_text: "текст, выделенный жирным"
+      bold_text: "вставьте сюда текст, которный нужно выделить жирным"
+      italic_label: "К"
       italic_title: "Курсив"
-      italic_text: "текст, выделенный курсивом"
+      italic_text: "вставьте сюда текст, который нужно выделить курсивом"
       link_title: "Ссылка"
       link_description: "введите описание ссылки"
       link_dialog_title: "Вставить ссылку"
-      link_optional_text: "текст ссылки"
+      link_optional_text: "кликабельный текст ссылки"
       link_url_placeholder: "http://example.com"
       quote_title: "Цитата"
-      quote_text: "Впишите текст цитаты сюда"
+      quote_text: "Впишите сюда текст цитаты"
       code_title: "Текст \"как есть\" (без применения форматирования)"
-      code_text: "впишите текст сюда; также, отключить форматирование текста можно, начав строку с четырех пробелов"
-      upload_title: "Загрузить"
-      upload_description: "введите описание загружаемого объекта"
+      code_text: "Впишите сюда текст; также, отключить форматирование текста можно, начав строку с 4х пробелов"
+      paste_code_text: "Напечатайте или вставьте сюда код"
+      upload_title: "Вставить картинку или прикрепить файл"
+      upload_description: "Впишите сюда описание файла"
       olist_title: "Нумерованный список"
       ulist_title: "Ненумерованный список"
       list_item: "Пункт первый"
+      heading_label: "А"
       heading_title: "Заголовок"
       heading_text: "Заголовок"
       hr_title: "Горизонтальный разделитель"
       help: "Справка по форматированию (Markdown)"
-      toggler: "скрыть / показать панель редактирования"
+      toggler: "Закрыть / открыть панель редактирования"
       modal_ok: "OK"
       modal_cancel: "Отмена"
       cant_send_pm: "К сожалению, вы не можете отправлять сообщения пользователю %{username}."
-      admin_options_title: "Дополнительные настройки темы"
+      yourself_confirm:
+        title: "Забыли указать получателей?"
+        body: "В списке получателей сейчас только вы сами!"
+      admin_options_title: "Дополнительные настройки темы для персонала"
       auto_close:
         label: "Закрыть тему через:"
         error: "Пожалуйста, введите корректное значение."
@@ -1079,6 +1136,7 @@ ru:
       most_liked: "Больше всего симпатий"
       select_all: "Выбрать все"
       clear_all: "Сбросить все"
+      too_short: "Слишком короткое слово для поиска."
       result_count:
         one: "Найдено 1: <span class='term'>\"{{term}}\"</span>"
         few: "Найдено {{count}}: <span class='term'>\"{{term}}\"</span>"
@@ -1091,9 +1149,47 @@ ru:
       post_format: "#{{post_number}} от {{username}}"
       context:
         user: "Искать сообщения от @{{username}}"
-        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: Не закреплены
+          wiki: Являются вики
+        statuses:
+          label: Характеристика темы
+          open: Открыта
+          closed: Закрыта
+          archived: Заархивирована
+          noreplies: Без ответов
+          single_user: Писал только один пользователь
+        post:
+          count:
+            label: Минимум сообщений в теме
+          time:
+            label: Дата
+            before: До (включая)
+            after: Начиная с
     hamburger_menu: "перейти к другому списку тем или другому разделу"
     new_item: "новый"
     go_back: 'вернуться'
@@ -1715,7 +1811,7 @@ ru:
           description: "Не уведомлять о новых темах в этом разделе и скрыть их из последних."
     flagging:
       title: 'Спасибо за вашу помощь в поддержании порядка!'
-      action: 'Пожаловаться'
+      action: 'Пожаловаться на сообщение'
       take_action: "Принять меры"
       notify_action: 'Сообщение'
       official_warning: 'Официальное предупреждение'
@@ -1723,18 +1819,35 @@ ru:
       yes_delete_spammer: "Да, удалить спамера"
       ip_address_missing: "(не доступно)"
       hidden_email_address: "(скрыто)"
-      submit_tooltip: "Отправить приватную отметку"
-      take_action_tooltip: "Достигнуть порога жалоб не дожидаясь большего количества жалоб от сообщества"
-      cant: "Извините, но вы не можете сейчас послать жалобу."
+      submit_tooltip: "Отправить приватную жалобу"
+      take_action_tooltip: "Симитировать достижение порога количества жалоб, не дожидаясь их от сообщества"
+      cant: "Вы не можете отправить жалобу на это сообщение сейчас."
+      notify_staff: 'Сообщить персоналу приватно'
       formatted_name:
         off_topic: "Это не по теме"
         inappropriate: "Это неприемлемо"
         spam: "Это спам"
-      custom_placeholder_notify_user: "Будьте точны, конструктивны и всегда доброжелательны."
-      custom_placeholder_notify_moderators: "Сообщите нам, чем конкретно вы обеспокоены и предоставьте соответствующие ссылки, если это возможно."
+      custom_placeholder_notify_user: "Будьте точны, конструктивны и доброжелательны."
+      custom_placeholder_notify_moderators: "Поясните суть проблемы: на что нам следует обратить внимание. Предоставьте соответствующие ссылки, если это возможно."
+      custom_message:
+        at_least:
+          one: "Введите хотя бы 1 символ"
+          few: "Введите хотя бы {{count}} символа"
+          many: "Введите хотя бы {{count}} символов"
+          other: "Введите хотя бы {{count}} символов"
+        more:
+          one: "Еще 1 символ..."
+          few: "Еще хотя бы {{count}} символа..."
+          many: "Еще хотя бы {{count}} символов..."
+          other: "Еще хотя бы {{count}} символов..."
+        left:
+          one: "Осталось не более 1 символа"
+          few: "Осталось не более {{count}} символов"
+          many: "Осталось не более {{count}} символов"
+          other: "Осталось не более {{count}} символов"
     flagging_topic:
-      title: "Спасибо за вашу помощь!"
-      action: "Пометить тему"
+      title: "Спасибо за помощь в поддержании порядка!"
+      action: "Пожаловаться на тему"
       notify_action: "Сообщение"
     topic_map:
       title: "Сводка по теме"
@@ -2018,6 +2131,12 @@ ru:
           top: "Больше нет обсуждаемых тем."
           bookmarks: "Больше нет тем в закладках."
           search: "Больше нет результатов поиска."
+    invite:
+      custom_message: "Сделайте приглашение более дружелюбным, добавив в него"
+      custom_message_link: "личное сообщение от себя"
+      custom_message_placeholder: "Напишите сюда ваше личное сообщение"
+      custom_message_template_forum: "Привет. Подумал, что тебе будет интересно зарегистрироваться на этом форуме!"
+      custom_message_template_topic: "Привет! Подумал, что тебя может заинтересовать эта тема!"
   admin_js:
     type_to_filter: "Введите текст для фильтрации..."
     admin:
@@ -2065,6 +2184,7 @@ ru:
           30_days_ago: "30 дней назад"
           all: "Всего"
           view_table: "Таблица"
+          view_graph: "График"
           refresh_report: "Обновить отчет"
           start_date: "Дата от"
           end_date: "Дата до"
@@ -2346,57 +2466,64 @@ ru:
             name: 'любовь'
             description: "Цвет кнопки «Мне нравится»."
       email:
+        title: "Почта"
         settings: "Настройки"
         templates: "Шаблоны"
-        preview_digest: "Просмотр сводки"
+        preview_digest: "Сводка новостей"
         sending_test: "Отправка тестового письма..."
         error: "<b>ОШИБКА</b> - %{server_error}"
-        test_error: "При отправке тестового письма произошла ошибка. Пожалуйста, внимательно проверьте ваши почтовые настройки, проверьте, что ваш сервер не блокирует почтовые соединения, и попытайтесь снова."
+        test_error: "При отправке тестового письма произошла ошибка. Проверьте почтовые настройки, убедитесь, что ваш почтовый провайдер не блокирует почтовые соединения, и попробуйте снова."
         sent: "Отправлено"
-        skipped: "Пропущенные"
+        skipped: "Пропущено"
+        bounced: "Возвращено"
         received: "Принято"
         rejected: "Отклонено"
-        sent_at: "Отправлено"
+        sent_at: "Дата"
         time: "Время"
         user: "Пользователь"
-        email_type: "Тип e-mail"
-        to_address: "Адрес"
-        test_email_address: "Электронный адрес для проверки"
+        email_type: "Тип письма"
+        to_address: "Адресат"
+        test_email_address: "E-mail для тестового письма"
         send_test: "Отправить тестовое письмо"
-        sent_test: "отправлено!"
+        sent_test: "Отправлено!"
         delivery_method: "Метод отправки"
+        preview_digest_desc: "Предпросмотр сводки новостей на отправку неактивным пользователям."
         refresh: "Обновить"
         format: "Формат"
         html: "html"
         text: "текст"
-        last_seen_user: "Последнее посещение:"
+        last_seen_user: "Последний раз был:"
         reply_key: "Ключ ответа"
         skipped_reason: "Причина пропуска"
         incoming_emails:
           from_address: "От"
           to_addresses: "Кому"
-          cc_addresses: "Скрытая копия"
-          subject: "Тема"
+          cc_addresses: "Кому копия (CC)"
+          subject: "Заголовок"
           error: "Ошибка"
-          none: "Входящих сообщений нет"
+          none: "Письма не найдены."
           modal:
-            title: "Подробности Входящего Email"
+            title: "Подробности входящего письма"
             error: "Ошибка"
-            subject: "Тема"
+            headers: "Заголовки"
+            subject: "Заголовок"
+            body: "Тело"
+            rejection_message: "Письмо отклонения"
           filters:
-            from_placeholder: "from@example.com"
-            to_placeholder: "to@example.com"
-            cc_placeholder: "cc@example.com"
+            from_placeholder: "e-mail отравителя"
+            to_placeholder: "e-mail получателя"
+            cc_placeholder: "e-mail копии"
+            subject_placeholder: "Заголовок..."
             error_placeholder: "Ошибка"
         logs:
-          none: "Записи в журнале регистрации не найдены."
+          none: "Записи в журнале не найдены."
           filters:
             title: "Фильтр"
-            user_placeholder: "псевдоним"
-            address_placeholder: "name@example.com"
+            user_placeholder: "Псевдоним"
+            address_placeholder: "e-mail адрес"
             type_placeholder: "дайджест, подписка..."
-            reply_key_placeholder: "ключ ответа"
-            skipped_reason_placeholder: "причина"
+            reply_key_placeholder: "Ключ ответа"
+            skipped_reason_placeholder: "Причина"
       logs:
         title: "Логи"
         action: "Действие"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index fc0ae6eebc..48bb1841b0 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -524,10 +524,7 @@ sk:
       apps: "Appky"
       revoke_access: "Odvolať prístup"
       undo_revoke_access: "Zrušiť odvolanie prístupu"
-      api_permissions: "Práva:"
       api_approved: "Schválený:"
-      api_read: "čítať"
-      api_read_write: "čítať a zapisovať"
       staff_counters:
         flags_given: "nápomocné značky"
         flagged_posts: "označkované príspevky"
@@ -1100,7 +1097,7 @@ sk:
     new_item: "nový"
     go_back: 'späť'
     not_logged_in_user: 'používateľská stránka so súhrnom aktivít a nastavení'
-    current_user: 'prejsť na Vašu uťívateľskú stránku'
+    current_user: 'prejsť na Vašu používateľskú stránku'
     topics:
       bulk:
         unlist_topics: "Dôverné témy"
@@ -1350,7 +1347,7 @@ sk:
         email_or_username: "Email, alebo používateľské meno pozvaného"
         email_or_username_placeholder: "emailova adresa alebo používateľské meno"
         action: "Pozvi"
-        success: "Pozvali sme tohoto uťívateľa aby sa podieľal na tejto správe"
+        success: "Pozvali sme tohoto používateľa aby sa podieľal na tejto správe"
         error: "Ľutujeme, pri pozývaní tohto používateľa nastala chyba."
         group_name: "názov skupiny"
       controls: "Ovládacie prvky Témy"
@@ -1367,7 +1364,7 @@ sk:
         to_username: "Zadajte používateľské meno osoby, ktorú chcete pozvať. Pošleme mu pozvánku s odkazom na túto tému."
         email_placeholder: 'name@example.com'
         success_email: "Poslali sme email s pozvánkou na <b>{{emailOrUsername}}</b>. Upozorníme vas keď bude pozvánka použítá. Svoje pozvánky môžete sledovať na karte pozvánok vo svojom používateľskom profile."
-        success_username: "Pozvali sme tohoto uťívateľa aby sa podieľal na tejto téme."
+        success_username: "Pozvali sme tohoto používateľa aby sa podieľal na tejto téme."
         error: "Ľutujeme, nepodarilo sa nám pozvať túto osobu. Nebola už náhodou pozvaná? (Počet opakovaných pozvánok je obmedzený)"
       login_reply: 'Príhláste sa ak chcete odpovedať'
       filters:
@@ -2168,7 +2165,7 @@ sk:
         refresh: "Obnoviť"
         new: "Nový"
         selector_placeholder: "zadať používateľské meno"
-        name_placeholder: "Názov skupiny, bez medzier, rovnaké pravidlá ako pre uťívateľa"
+        name_placeholder: "Názov skupiny, bez medzier, rovnaké pravidlá ako pre používateľa"
         about: "Tu upravíte Vaše členstvo v skupinách a mená"
         group_members: "Členovia skupiny"
         delete: "Odstrániť"
@@ -2626,8 +2623,8 @@ sk:
         flags_given_received_count: 'Rozdané a prijaté označenia'
         approve: 'Schváliť'
         approved_by: "schválený"
-        approve_success: "Uťívateľ schválený a bol zaslaný email s aktivačnými inštrukciami"
-        approve_bulk_success: "Úspech! Všetci vybraní uťívateľia boli schválení a oboznáamení."
+        approve_success: "Poožívateľ schválený a bol zaslaný email s aktivačnými inštrukciami"
+        approve_bulk_success: "Úspech! Všetci vybraní používatelia boli schválení a oboznámení."
         time_read: "Doba Čítania"
         anonymize: "Anonymizovať používateľa"
         anonymize_confirm: "Ste si istý že chcete zmeniť tento účet na anonymný? Zmeni to používateľské meno, email a zmažú sa všetky informácie z profilu. "
@@ -2666,7 +2663,7 @@ sk:
         block_accept: 'Ano, zablokovať používateľa'
         deactivate_explanation: "Deaktivovaý používateľ musí znovu overiť svoj email"
         suspended_explanation: "Suspendovaní užívatelia sa nemôžu prihlasovať."
-        block_explanation: "Zablokovaní uťívatelia nemôžu zakladať témy ani pridávať príspevky."
+        block_explanation: "Zablokovaní používatelia nemôžu zakladať témy ani pridávať príspevky."
         staged_explanation: "Dočasný používateľ môže iba prispievať emailom do vybraných tém."
         trust_level_change_failed: "Nastala chyba pri zmene stupňa dôvery používateľa."
         suspend_modal_title: "Zruš práva používateľovi"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 0ecac4345b..fd082a04bf 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -500,10 +500,7 @@ sq:
       apps: "Aplikimet"
       revoke_access: "Hiqi aksesin"
       undo_revoke_access: "Anullo heqjen e aksesit"
-      api_permissions: "Të drejtat"
       api_approved: "Aprovuar më:"
-      api_read: "lexuar"
-      api_read_write: "lexim e shkrim"
       staff_counters:
         flags_given: "sinjalizime të dobishme"
         flagged_posts: "postimet e sinjalizuara"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 512f57d39d..b34fbaed8f 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -508,10 +508,7 @@ sv:
       apps: "Appar"
       revoke_access: "Återkalla åtkomst"
       undo_revoke_access: "Ångra återkallelse av åtkomst"
-      api_permissions: "Rättigheter:"
       api_approved: "Godkända:"
-      api_read: "läs"
-      api_read_write: "läs och skriv"
       staff_counters:
         flags_given: "hjälpsamma flaggor"
         flagged_posts: "flaggade inlägg"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 38c11ffce5..1de7a60685 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -119,7 +119,7 @@ tr_TR:
         disabled: '%{when} listelenmedi'
     topic_admin_menu: "konuyla alakalı yönetici eylemleri"
     wizard_required: "Forumunuzu yapılandırma zamanı geldi! <a href='%{url}' data-auto-route='true'>Kur Sihirbazını çalıştırın</a>!"
-    emails_are_disabled: "Tüm giden e-postalar yönetici tarafından evrensel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
+    emails_are_disabled: "Tüm giden e-postalar yönetici tarafından genel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
     bootstrap_mode_enabled: "Yeni sitenizi kolayca çalıştırmak için bootstrap modundasınız. Tüm yeni kullanıcılar güven seviyesi 1den başlar ve e-posta uyarıcıları açıksa günlük mail alırlar. Bu özellik kullanıcı sayısı %{min_users} rakamına ulaştığında otomatik kapatılacaktır."
     bootstrap_mode_disabled: "Bootstrap modu önümüzdeki 24 saat içinde edilgen olacaktır."
     s3:
@@ -479,10 +479,7 @@ tr_TR:
       apps: "Uygulamalar"
       revoke_access: "Erişimi İptal Et"
       undo_revoke_access: "Erişim İptalini Geri Al"
-      api_permissions: "İzinler:"
       api_approved: "Onaylanmış:"
-      api_read: "okuma"
-      api_read_write: "okuma ve yazma"
       staff_counters:
         flags_given: "yardımcı bildirimler"
         flagged_posts: "bildirilen gönderiler"
@@ -1221,7 +1218,7 @@ tr_TR:
       notifications:
         title: bu konu hakkında ne sıklıkla bildirim alacağını değiştir
         reasons:
-          mailing_list_mode: "E-posta liste modunu etkinleştirdin, böylece bu konuya gelen cevaplarla ilgili bildirimleri e-posta yoluyla alabileceksin. "
+          mailing_list_mode: "Duyuru listesi modunu etkinleştirdin, bundan dolayı bu konuya gelen cevaplarla ilgili bildirimleri e-posta yoluyla alacaksın. "
           '3_10': 'Bu konuyla ilgili bir etiketi gözlediğin için bildirim alacaksın.'
           '3_6': 'Bu kategoriyi gözlediğiniz için bildirimlerini alacaksınız.'
           '3_5': 'Bu konuyu otomatik olarak gözlemeye başladığınız için bildirimlerini alacaksınız.'
@@ -2380,10 +2377,10 @@ tr_TR:
         preview_digest: "Özeti Önizle"
         sending_test: "Test e-postası gönderiliyor..."
         error: "<b>HATA</b> - %{server_error}"
-        test_error: "Test e-postasının gönderilmesinde sorun yaşandı. Lütfen e-posta ayarlarınızı tekrar kontrol edin, yer sağlayıcınızın e-posta bağlantılarını bloke etmediğinden emin olun, ve tekrar deneyin."
+        test_error: "Test e-postasının gönderilmesinde sorun yaşandı. Lütfen e-posta ayarlarınızı tekrar kontrol edin, yer sağlayıcınızın e-posta bağlantılarını engellemediğinden emin olun, ve tekrar deneyin."
         sent: "Gönderildi"
         skipped: "Atlandı"
-        bounced: "Geri sekenler"
+        bounced: "Geri Sekenler"
         received: "Alındı"
         rejected: "Reddedildi"
         sent_at: "Gönderildiği Zaman"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index eec1dd04bf..5ead638675 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -16,7 +16,7 @@ vi:
           format: '%n %u'
           units:
             byte:
-              other: Byte
+              other: Bytes
             gb: GB
             kb: KB
             mb: MB
@@ -26,6 +26,7 @@ vi:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      timeline_date: "MMM YYYY"
       long_no_year: "MMM D h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -37,8 +38,9 @@ vi:
       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} ngày trước"
       tiny:
-        half_a_minute: "< 1m"
+        half_a_minute: "< 1 phút"
         less_than_x_seconds:
           other: "< %{count}s"
         x_seconds:
@@ -90,9 +92,13 @@ vi:
       google+: 'chia sẻ lên Google+'
       email: 'Gửi liên kết này qua thư điện tử'
     action_codes:
+      public_topic: "Hiển thị chủ đề này lúc %{when}"
+      private_topic: "Ẩn chủ đề này lúc %{when}"
       split_topic: "chìa chủ đề này lúc %{when}"
       invited_user: "đã mời bởi %{who} %{when}"
+      invited_group: "Được mời bởi %{who} vào lúc %{when}"
       removed_user: "loại bỏ bởi %{who} %{when}"
+      removed_group: "Bị loại bỏ bởi %{who} vào lúc %{when}"
       autoclosed:
         enabled: 'đóng lúc %{when}'
         disabled: 'mở lúc %{when}'
@@ -221,6 +227,8 @@ vi:
     undo: "Hoàn tác"
     revert: "Phục hồi"
     failed: "Thất bại"
+    switch_to_anon: "Vào chế độ Ẩn danh"
+    switch_from_anon: "Thoát chế độ Ẩn danh"
     banner:
       close: "Xóa biểu ngữ này."
       edit: "Sửa banner này >>"
@@ -268,6 +276,8 @@ vi:
       title: "Thành viên"
       likes_given: "Đưa ra"
       likes_received: "Đã nhận"
+      topics_entered: "Đã xem"
+      topics_entered_long: "Chủ đề đã xem"
       time_read: "Thời gian đọc"
       topic_count: "Chủ đề"
       topic_count_long: "Chủ đề đã được tạo"
@@ -291,6 +301,7 @@ vi:
       selector_placeholder: "Thêm thành viên"
       owner: "chủ"
       visible: "Mọi thành viên có thể nhìn thấy nhóm"
+      index: "Nhóm"
       title:
         other: "các nhóm"
       members: "Các thành viên"
@@ -312,6 +323,9 @@ vi:
         watching:
           title: "Đang xem"
           description: "Bạn sẽ được thông báo khi có bài viết mới trong mỗi tin nhắn, và số lượng trả lời mới sẽ được hiển thị"
+        watching_first_post:
+          title: "Theo dõi chủ đề đầu tiên"
+          description: "Bạn sẽ được thông báo về bài viết đầu tiên của mỗi chủ đề mới trong nhóm này"
         tracking:
           title: "Đang theo dõi"
           description: "Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn, và số lượng trả lời mới sẽ được hiển thị"
@@ -354,6 +368,8 @@ vi:
       latest_by: "mới nhất bởi"
       toggle_ordering: "chuyển lệnh kiểm soát"
       subcategories: "Phân loại phụ"
+      topic_sentence:
+        other: "%{count} chủ đề"
       topic_stat_sentence:
         other: "%{count} số lượng chủ đề mới tỏng quá khứ %{unit}."
     ip_lookup:
@@ -400,6 +416,7 @@ vi:
         disable: "Khóa Notification"
         enable: "Cho phép Notification"
         each_browser_note: "Lưu ý: Bạn phải thay đổi trong cấu hình mỗi trình duyệt bạn sử dụng."
+      dismiss_notifications: "Bỏ qua tất cả"
       dismiss_notifications_tooltip: "Đánh dấu đã đọc cho tất cả các thông báo chưa đọc"
       disable_jump_reply: "Đừng tới bài viết của tôi sau khi tôi trả lời"
       dynamic_favicon: "Hiện số chủ đề mới / cập nhật vào biểu tượng trình duyệt"
@@ -414,6 +431,12 @@ vi:
       suspended_notice: "Thành viên này bị đình chỉ cho đến ngày {{date}}. "
       suspended_reason: "Lý do: "
       github_profile: "Github"
+      email_activity_summary: "Tóm tắt hoạt động"
+      mailing_list_mode:
+        label: "Chế độ mailing list"
+        enabled: "Bật chế độ mailing list"
+        daily: "Gửi cập nhật hàng ngày"
+        individual: "Gửi email cho mỗi bài viết mới."
       watched_categories: "Xem"
       tracked_categories: "Theo dõi"
       muted_categories: "Im lặng"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 230ed6e79f..0ab12aeec8 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -877,7 +877,6 @@ ar:
     s3_backup_config_warning: 'تم تهيئة الخادم لرفع نسخة احتياطية إلى s3، لكن واحدة على الأقل من الإعدادات التالية لم تضبط: s3_access_key_id, s3_secret_access_key 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 لم يثبت. ثبته باستخدام مدير الحزم المفضل لك أو  <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">حمل أحدث نسخة</a>.'
     failing_emails_warning: 'يوجد %{num_failed_jobs} مهام بريد إلكتروني فشلت. تحقق من app.yml الخاص بك وتأكد من إعدادات خادم البريد أنها صحيحة. <a href="/sidekiq/retries" target="_blank">أنظر للمهام الفاشلة في Sidekiq</a>.'
-    consumer_email_warning: "موقعك مهيئ لاستخدام Gmail (أو مستهلك خدمة بريد إلكتروني أخر) لإرسال بريد إلكتروني. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>حدود Gmail كمية رسائل البريد الإلكتروني التي يمكنك إرسالها</a>. فكر باستخدام مزود خدمة بريد إلكتروني مثل mandrill.com لضمان أهداف البريد الإلكتروني."
     subfolder_ends_in_slash: "إعدادات المجلدات الداخلية خاطئ;ال DISCOURSE_RELATIVE_URL_ROOT يجب ان تنتهي ب سلاش."
     missing_mailgun_api_key: "هذا الموقع معد لارسال البريد الالكترونى عن طريق خدمة mailgun لكنكم لم تزودونا بمفتاح  API الخاص بكم لتعريف رسائلكم للخدمة."
   site_settings:
@@ -925,7 +924,6 @@ ar:
     show_pinned_excerpt_mobile: "اظهر مقتطفات من المواضيع المثبتة فى منظر المحمول."
     show_pinned_excerpt_desktop: "اظهر مقتطفات من المواضيع المثبتة فى منظر سطح المكتب."
     post_onebox_maxlength: "الحد الأقصى لطول مشاركة oneboxed Discourse بالأحرف."
-    onebox_domains_whitelist: "قائمة بالمجالات للسماح روابط تفصيلي؛ وينبغي دعم هذه المجالات OpenGraph أو oEmbed. اختبار لهم في http://iframely.com/debug"
     logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا ترك الحقل فارغا فسيتم استخدام اسم الموقع."
     digest_logo_url: "صورة الشعار البديل المستخدم في الجزء العلوي لملخص البريد الالكترونى، يجب أن تكون على شكل مستطيل واسع. لا يجب أن تكون الصورة من نوع SVG.  إذا ترك الحقل فارغا فسيتم استخدام `logo_url`."
     logo_small_url: "صورة الشعار صغيرة في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مربع، وينظر عند التمرير لأسفل. وإذا ترك فارغا أن أظهرت الصورة الرمزية المنزل."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 59505b6719..f7aa14a11a 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -231,7 +231,7 @@ bs_BA:
     title: 'Resetuj Šifru'
     success: "Uspješno ste promjenili šifru i sada se možete ulogovati."
     success_unapproved: "Uspješno ste promjenili šifru."
-    continue: "Idi na Revolucionar.com"
+    continue: "Idi na %{site_name}"
   change_email:
     confirmed: "Your email has been updated."
     please_continue: "Continue to %{site_name}"
@@ -239,7 +239,7 @@ bs_BA:
   activation:
     already_done: "Link za konfirmaciju nije validan. Možda ste već aktivirani?"
     please_continue: "Vaš novi nalog je verifikovan, i možete se ulogovati."
-    continue_button: "Idi na Revolucionar.com"
+    continue_button: "Nastavi na %{site_name}"
     welcome_to: "Dobrodošli na %{site_name}!"
     approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!"
   post_action_types:
@@ -253,7 +253,7 @@ bs_BA:
       long_form: 'opomeni kao spam'
     inappropriate:
       title: 'Neprikladno'
-      description: 'Ovaj post sadrži tekst koji je uvredljiv i pogrdan. I kao takav kosi se sa <a href="/t/dobrodosli-na-revolucionar/8">našim pravilima korišćenja</a>.'
+      description: 'Ovaj post sadrži tekst koji bi razumna osoba smatrala uvredljivim, pogrdnim i neprikladan prema <a href="/guidelines">pravilima naše zajednice</a>.'
       long_form: 'opomeni kao neprikladno'
     notify_user:
       long_form: 'korisnik obavješten'
@@ -281,7 +281,7 @@ bs_BA:
       long_form: 'opomenuo kao spam'
     inappropriate:
       title: 'Inappropriate'
-      description: 'Ova tema sadrži tekst koji je uvredljiv i pogrdan. I kao takav kosi se sa <a href="/t/dobrodosli-na-revolucionar/8">našim pravilima korišćenja</a>.'
+      description: 'Ova tema sadrži tekst koji bi razumna osoba smatrala uvredljivim, pogrdnim i neprikladan prema <a href="/guidelines">pravilima naše zajednice</a>.'
       long_form: 'opomenuto kao neprikladno'
     notify_moderators:
       title: "Obavijesti Moderatore"
@@ -389,7 +389,6 @@ bs_BA:
     s3_config_warning: 'The server is configured to upload files to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     s3_backup_config_warning: 'The server is configured to upload backups to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download the latest release</a>.'
-    consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limits how many emails you can send</a>. Consider using an email service provider like mandrill.com to ensure email deliverability."
   site_settings:
     censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days."
@@ -424,7 +423,6 @@ bs_BA:
     add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\""
     post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
-    onebox_domains_whitelist: "A list of domains to allow oneboxing for; these domains should support OpenGraph or oEmbed. Test them at http://iframely.com/debug"
     apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px."
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
     email_custom_headers: "A pipe-delimited list of custom email headers"
@@ -651,7 +649,7 @@ bs_BA:
   most_recent_poster: "Posljednji Autor"
   frequent_poster: "Čest Autor"
   redirected_to_top_reasons:
-    new_user: "Dobrodošli na Revolucionar! Ovo su najnovije popularne teme."
+    new_user: "Dobrodošli u našu zajednicu! Ovo su najnovije popularne teme."
     not_seen_in_a_month: "Dobrodošli nazad! Nismo vas odavno vidjeli. Ovo su najnovije popularne teme od vaše zadnje posjete."
   change_owner:
     post_revision_text: "Ownership transferred from %{old_user} to %{new_user}"
@@ -705,7 +703,7 @@ bs_BA:
       >
       > %{topic_excerpt}
 
-      na  Revolucionar.com
+      na
 
       > %{site_title} -- %{site_description}
 
@@ -713,9 +711,9 @@ bs_BA:
 
       %{invite_link}
 
-      Ova pozivnica dolazi od člana koji je zaslužio povjerenje na našem sajtu te smo mu/joj omogućili opciju slanja pozivnica. Što vama kao zvanici daje mogućnost da odgovorite na diskusiju bez registracije.
+      Ova pozivnica dolazi od člana koji je zaslužio povjerenje na našem sajtu, što vama kao zvanici daje mogućnost da odmah odgovorite na diskusiju.
   invite_forum_mailer:
-    subject_template: "%{invitee_name} vas poziva na novu socijalnu mrežu Revolucionar.com"
+    subject_template: "%{invitee_name} vas poziva da se pridružite %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Set password for your %{site_name} account"
   test_mailer:
@@ -737,17 +735,19 @@ bs_BA:
     deferred_and_deleted: "Thanks for letting us know. We've removed the post."
   system_messages:
     welcome_user:
-      subject_template: "Dobrodošli na Revolucionar.com!"
+      subject_template: "Dobrodošli na %{site_name}!"
       text_body_template: |
-        Hvala što ste se pridružili Revolucionaru, dobrodošli!
+        Hvala što ste se pridružili %{site_name}, dobrodošli!
 
         %{new_user_tips}
 
         Mi vjerujemo u [civilizovanu diskusiju](%{base_url}/guidelines) na svakom nivou u svako doba.
 
         Uživajte!
+
+        (Ako trebate razgovarati s nekim od [članova osoblja](%{base_url}/about) kao novi korisnik, samo odgovorite na ovu poruku.)
     welcome_invite:
-      subject_template: "Dobrodošli na Revolucionar.com!"
+      subject_template: "Dobrodošli na %{site_name}!"
       text_body_template: |
         Hvala vam što ste primili pozivnicu na %{site_name} -- dobrodošli!
 
@@ -899,7 +899,7 @@ bs_BA:
     popular_topics: "Popularne"
     recent_topics: "Nove"
     see_more: "Više"
-    search_title: "Pretraži Revolucionar"
+    search_title: "Pretraži stranicu"
     search_google: "Google"
   login_required:
     welcome_message: |
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index a1a6d26659..a9f4d7ebc4 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -554,7 +554,6 @@ cs:
     github_config_warning: 'Server je nakonfigurován, aby povoloval registraci a přihlášení přes GitHub (enable_github_logins), ale nejsou nastaveny hodnoty "client id" a "secret". Navštivte <a href="/admin/site_settings">nastevení webu</a> a opravte nastavení. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide" target="_blank">Pro více informací si přečtěte tento návod</a>.'
     s3_config_warning: 'Server je nakonfigurován, aby nahrával soubory na S3, ale chybí nastavení: s3_access_key_id, s3_secret_access_key nebo s3_upload_bucket. Navštivte <a href="/admin/site_settings">nastavení webu</a> a opravte nastavení. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Přečtěte si "How to set up image uploads to S3?" pro více informací</a>.'
     image_magick_warning: 'Server je nakonfigurován, aby vytvářel náhledy velkých obrázků, ale není nainstalován ImageMagick. Nainstalujte ImageMagick pomocí vašeho oblíbeného balíčkovače, nebo navštivte <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">web ImageMagick pro stažení aktuální verze</a>.'
-    consumer_email_warning: "Váš web je nastaven, aby používal Gmail (nebo jinou uživatelskou emailovou službu) k odesílání emailů. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limituje počet emailů, které můžete odeslat</a>. Zvažte použití jiného emailového poskytovatele, jako je třeba mandrill.com k zajištění doručitelnosti emailů."
   site_settings:
     default_locale: "Výchozí jazyk této Discourse instance (kód ve formátu ISO 639-1)"
     allow_user_locale: "Povolit uživatelům nastavit si jazyk fóra"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 912fe80acb..f579948e6a 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -569,7 +569,6 @@ da:
     authorize: "Autoriser"
     read: "læst"
     read_write: "læs/skriv"
-    description: "Ønsker du at give \"%{application_name}\" %{access} adgang til din konto?"
     no_trust_level: "Beklager, du har ikke adgang til brugerens API"
     generic_error: "Beklager, vi er ikke i stand til at give dig API nøgler, denne funktionalitet er muligvis bestemt af sitets administrator"
   reports:
@@ -726,7 +725,6 @@ da:
     s3_config_warning: 'Serveren er konfigureret til at uploade filer til s3, men mindst én af følgende indstillinger er ikke angivet: s3_access_key_id, s3_secret_access_key eller s3_upload_bucket. Gå til <a href="/admin/site_settings">indstillinger</a> og opdatér indstillingerne. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Se "How to set up image uploads to S3?" for mere information</a>.'
     image_magick_warning: 'Serveren er konfigureret til at lave thumbnails af store billeder, men ImageMagick er ikke installeret. Installér ImageMagick med din foretrukne package manager eller <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download den seneste udgave</a>.'
     failing_emails_warning: 'Der er %{num_failed_jobs} email operationer der mislykkede. Tjek din app.yml for at sikre at din mail server indstillinger er korrekte. <a href="/sidekiq/retries" target="_blank">Se mislykkede operationer i Sidekiq</a>.'
-    consumer_email_warning: "Dit site er konfigureret til at bruge Gmail (eller en anden offentlig e-mail-tjeneste) til at sende e-mail. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail har en  grænse for, hvor mange mails du kan sende</a>. Overvej at bruge en e-mail-udbyder som mandrill.com for at sikre at din mail bliver leveret."
     subfolder_ends_in_slash: "Din undermappe er ikke opsat korrekt; DISCOURSE_RELATIVE_URL_ROOT ender med en slash."
     email_polling_errored_recently:
       one: "Email afstemning har afstedkommet en fejl i de seneste 24 timer. Venligst se <a href='/logs' target='_blank'>the logs</a> for detaljer."
@@ -781,7 +779,6 @@ da:
     show_pinned_excerpt_mobile: "Vis uddrag af fastgjorte emner på mobilen."
     show_pinned_excerpt_desktop: "Vis uddrag af fastgjorte emner i desktop visning"
     post_onebox_maxlength: "Max længde af Discourse indlæg i tegn"
-    onebox_domains_whitelist: "En liste af domæner der tillader oneboxing; disse domæner burde supportere OpenGraph eller oEmbed. Test dem på http://iframely.com/debug"
     logo_url: "Logoet på jeres site, øverst til venstre, burde være en bred rektangel. Hvis denne efterlades blank, vil sidens titel tekst blive vist."
     digest_logo_url: "Det alternative logo billede der anvendes øverst på jeres sides email opsummering, burde være en bred rektangel. Skal ikke være et SVG billede. Hvis denne efterlades blank, vil 'logo_url' blive anvendt."
     logo_small_url: "Det lille logo øverst til venstre på siden burde være firkantet når der bladres ned. Såfremt denne efterlades blank. vil home 'glyph' blive vist."
@@ -1042,13 +1039,19 @@ da:
     user_posted_pm:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
     digest:
-      why: "Et kort resume af %{site_link} siden dit sidste besøg %{last_seen_at}"
+      why: "Et kort resumé af %{site_link} siden dit sidste besøg %{last_seen_at}"
+      subject_template: "[%{site_name}] Resumé"
       new_activity: "Ny aktivitet på dine emner og indlæg:"
       top_topics: "Populære emner"
       other_new_topics: "Populære emner"
+      unsubscribe: "Dette resumé sendes fra %{site_link} når vi ikke har set dig i et stykke tid. For at afmelde %{unsubscribe_link}."
       click_here: "klik her"
+      from: "%{site_name} resumé"
       read_more: "Læs mere"
+      more_topics: "Der var %{new_topics_since_seen} andre nye emner."
       more_topics_category: "Flere nye emner: "
+    mailing_list:
+      subject_template: "[%{site_name}] Resumé for %{date}"
     forgot_password:
       subject_template: "[%{site_name}] Nulstil kodeord"
       text_body_template: |
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 1da5dc5b6a..fca73d5f35 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -229,7 +229,7 @@ de:
 
       - Kritik ist in Ordnung, aber bitte kritisiere nur *Ideen*, nicht Menschen.
 
-      Beachte bitte auch [unsere Richtlinien](/guidelines). Dieser Hilfetext wird nur bei deinen ersten %{education_posts_text} Beiträgen angezeigt.
+      Beachte bitte auch [unsere Richtlinien](/guidelines). Dieser Hilfetext wird nur bei deinen ersten %{education_posts_text} angezeigt.
     avatar: |
       ### Wie wäre es mit einem Bild für Deinen Account?
 
@@ -577,7 +577,6 @@ de:
     authorize: "Genehmigen"
     read: "Lesen"
     read_write: "Lesen/Schreiben"
-    description: "Möchtest du \"%{application_name}\" %{access} Zugriff auf dein Konto geben?"
     no_trust_level: "Entschuldige, du hast nicht die erforderliche Vertrauensstufe, um die Benutzer API zu nutzen."
     generic_error: "Entschuldige, wir können keinen Benutzer API Schlüssel erstellen. Dieses Feature ist möglicherweise vom Site Administrator deaktiviert worden."
   reports:
@@ -735,7 +734,6 @@ de:
     s3_backup_config_warning: 'Der Server ist so konfiguriert, dass Datensicherungen auf S3 geladen werden, aber mindestens eine der folgenden Einstellungen: s3_access_key_id, s3_secret_access_key oder s3_backup_bucket ist nicht festgelegt. Gehe zu <a href="/admin/site_settings">den Siteneinstellungen</a> und aktualisiere die Einstellungen. Um mehr darüber zu erfahren siehe <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"Wie konfiguriere ich das Hochladen von Bildern zu S3?" (en)</a>.'
     image_magick_warning: 'Der Server wurde konfiguriert um Vorschaubilder von grossen Bildern zu erstellen, aber ImageMagick ist nicht installiertd. Installiere ImageMagick mit deinem bevorzugten Packetmanager oder besuche <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">um das aktuelle Paket herunterzuladen</a>.'
     failing_emails_warning: "%{num_failed_jobs} E-Mails konnten nicht versendet werden. Überprüfe deine app.yml und stelle sicher, dass die E-Mail Servereinstellungen korrekt gesetzt sind. \n<a href=\"/sidekiq/retries\" target=\"_blank\">Sieh dir hier die nicht versendeten E-Mails an.</a>"
-    consumer_email_warning: "Deine Site verwendet Gmail (oder einen anderen für Endkunden gedachten E-Mailserver) um E-Mails zu versenden. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail hat einen Grenzwert bezüglich des Sendens von E-Mails</a>. Um die E-Mail-Zustellung zu gewährleisten, solltest du die Verwendung eines anderen E-Mail-Dienstes in Erwägung ziehen."
     subfolder_ends_in_slash: "Deine Installation in einem Pfad ist nicht korrekt, DISCOURSE_RELATIVE_URL_ROOT endet mit einem Schrägstrich."
     email_polling_errored_recently:
       one: "Beim Abrufen von E-Mails ist in den letzten 24 Stunden ein Fehler aufgetreten. Weitere Informationen findest du <a href='/logs' target='_blank'>im Fehlerprotokoll</a>."
@@ -791,7 +789,6 @@ de:
     show_pinned_excerpt_mobile: "Zeige einen Auszug hervorgehobener Beiträge in der mobilen Ansicht."
     show_pinned_excerpt_desktop: "Zeige einen Auszug hervorgehobener Beiträge in der Desktop-Ansicht."
     post_onebox_maxlength: "Maximale Länge eines Onebox-Discourse-Beitrags in Zeichen."
-    onebox_domains_whitelist: "Liste von Domains, deren Inhalte für Oneboxen erlaubt sind; diese Domains sollten OpenGraph oder oEmbed unterstützen. Teste ihre Kompatibilität unter http://iframely.com/debug"
     logo_url: "Das Logo oben links auf deiner Site sollte eine breite, rechteckige Form haben. Wenn du kein Logo auswählst, wird stattdessen `title` angezeigt."
     digest_logo_url: "Das alternative Logo oben in den E-Mail-Zusammenfassungen deiner Site. Sollte eine breite, rechteckige Form haben. Sollte kein SVG-Bild sein. Wenn leer, wird `logo_url` verwendet."
     logo_small_url: "Dein Logo in klein für die obere linke Seite deiner Site, in Form eines rechteckigen Quadrates. Es wird angezeigt, wenn der Benutzer scrollt. Wenn du dieses Feld frei lässt, wird stattdessen ein Haus-Symbol angezeigt."
@@ -1197,9 +1194,6 @@ de:
     default_categories_muted: "Liste der standardmäßig stummgeschalteten Kategorien."
     max_user_api_reqs_per_day: "Maximale Zahl der Benutzer API Anfragen pro Schlüssel pro Tag"
     max_user_api_reqs_per_minute: "Maximale Zahl der Benutzer API Anfragen pro Schlüssel pro Minute"
-    allow_read_user_api_keys: "Erlaube die Generierung von nur-lese-berechtigten Benutzer API Schlüsseln"
-    allow_write_user_api_keys: "Erlaube die Generierung von schreib-berechtigten Benutzer API Schlüsseln"
-    allow_push_user_api_keys: "Erlaube die Generierung von push-berechtigten Benutzer API Schlüsseln"
     max_api_keys_per_user: "Maximale Zahl der Benutzer API Anfragen pro Benutzer"
     min_trust_level_for_user_api_key: "Erforderliche Vertrauensstufe für die Generierung von Benutzer API Schlüsseln"
     allowed_user_api_auth_redirects: "Erlaubte URL für die Authentifizierungs-Umleitung von Benutzer API Schlüsseln"
@@ -1217,6 +1211,8 @@ de:
     min_trust_level_to_tag_topics: "Minimale Vertrauensstufe, um Schlagwörter zu Themen hinzuzufügen."
     suppress_overlapping_tags_in_list: "Schlagwort nicht zeigen, wenn es genau so im Thementitel vorkommt"
     remove_muted_tags_from_latest: "Zeige in der Liste der neusten Beiträge keine Themen mit stummgeschalteten Schlagwörtern."
+    company_short_name: "Firmenname (kurz)"
+    company_full_name: "Firmenname (komplett)"
     errors:
       invalid_email: "Ungültige E-Mail-Ad­res­se"
       invalid_username: "Es gibt keinen Benutzer mit diesem Benutzernamen."
@@ -2822,6 +2818,36 @@ de:
     staff_tag_disallowed: "Das Schlagwort \"%{tag}\" kann nur von Mitarbeitern angewendet werden."
     staff_tag_remove_disallowed: "Das Schlagwort \"%{tag}\" kann nur von Mitarbeitern entfernt werden."
   rss_by_tag: "Themen mit dem Schlagwort %{tag}"
+  wizard:
+    step:
+      forum_title:
+        title: "Name"
+      introduction:
+        title: "Einführung"
+      privacy:
+        title: "Zugriff"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "Öffentlich"
+              restricted:
+                label: "Privat"
+      contact:
+        title: "Kontakt"
+        fields:
+          contact_email:
+            label: "Mail"
+            placeholder: "name@example.com"
+      corporate:
+        title: "Organisation"
+        fields:
+          company_short_name:
+            label: "Firmenname (kurz)"
+          company_full_name:
+            label: "Firmenname (komplett)"
+      emoji:
+        title: "Emoji"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index fd7ebcc9b6..d40510aea4 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -817,7 +817,6 @@ en:
     s3_backup_config_warning: 'The server is configured to upload backups to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download the latest release</a>.'
     failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your app.yml and ensure that the mail server settings are correct. <a href="/sidekiq/retries" target="_blank">See the failed jobs in Sidekiq</a>.'
-    consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limits how many emails you can send</a>. Consider using an email service provider like mandrill.com to ensure email deliverability."
     subfolder_ends_in_slash: "Your subfolder setup is incorrect; the DISCOURSE_RELATIVE_URL_ROOT ends in a slash."
     email_polling_errored_recently:
       one: "Email polling has generated an error in the past 24 hours. Look at <a href='/logs' target='_blank'>the logs</a> for more details."
@@ -875,7 +874,8 @@ en:
     show_pinned_excerpt_mobile: "Show excerpt on pinned topics in mobile view."
     show_pinned_excerpt_desktop: "Show excerpt on pinned topics in desktop view."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
-    onebox_domains_whitelist: "A list of domains to allow oneboxing for; these domains should support OpenGraph or oEmbed. Test them at http://iframely.com/debug"
+    onebox_domains_blacklist: "A list of domains that will never be oneboxed."
+    max_oneboxes_per_post: "Maximum number of oneboxes in a post."
 
     logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown."
     digest_logo_url: "The alternate logo image used at the top of your site's email summary. Should be a wide rectangle shape. Should not be an SVG image. If left blank `logo_url` will be used."
@@ -1333,6 +1333,7 @@ en:
     embed_username_key_from_feed: "Key to pull discourse username from feed."
     embed_title_scrubber: "Regular expression for scrubbing embeddable titles."
     embed_truncate: "Truncate the embedded posts."
+    allowed_href_schemes: "Schemes allowed in links in addition to http and https."
     embed_post_limit: "Maximum number of posts to embed."
     embed_username_required: "The username for topic creation is required."
     embed_whitelist_selector: "CSS selector for elements that are allowed in embeds."
@@ -2614,6 +2615,7 @@ en:
     message_to_blank: "message.to is blank"
     text_part_body_blank: "text_part.body is blank"
     body_blank: "body is blank"
+    no_echo_mailing_list_mode: "Mailing list notifications disabled for user's own posts"
 
   color_schemes:
     base_theme_name: "Base"
@@ -3193,7 +3195,7 @@ en:
     staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff."
   rss_by_tag: "Topics tagged %{tag}"
 
-  first_installation:
+  finish_installation:
     congratulations: "Congratulations, you installed Discourse!"
     register:
       button: "Register"
@@ -3203,6 +3205,9 @@ en:
     confirm_email:
       title: "Confirm your Email"
       message: "<p>We sent an activation mail to <b>%{email}</b>. Please follow the instructions in the email to activate your account.</p><p>If it doesn't arrive, ensure you have set up email correctly for your Discourse and check your spam folder.</p>"
+    resend_email:
+      title: "Resend Activation Email"
+      message: "<p>We've re-sent the activation email to <b>%{email}</b>"
 
   wizard:
     title: "Discourse Setup"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 2dfa6680ec..c2a6048d5c 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -111,6 +111,7 @@ es:
     operation_already_running: "Actualmente se está ejecutando una operación. No se puede iniciar un nuevo trabajo en este momento."
     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 . - _."
   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."
@@ -298,6 +299,10 @@ es:
         post_reply:
           base:
             different_topic: "El post y la respuesta deben pertenecer al mismo tema."
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "La URL no es válida. Debería incluir http:// or https://. Y no está permitido ningún espacio en blanco."
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>El campo 'Sobre mí' de tu perfil está vacío, <a href='/users/%{username_lower}/preferences/about-me'>¿Te gustaría completarlo?</a></div>"
@@ -572,9 +577,16 @@ es:
     authorize: "Autorizar"
     read: "lectura"
     read_write: "lectura/escritura"
-    description: "¿Quieres conceder a \"%{application_name}\" %{access} acceso a tu cuenta?"
+    description: "\"%{application_name}\" está solicitando el siguiente acceso a tu cuenta:"
     no_trust_level: "Lo sentimos, no tienes el nivel de confianza requerido para acceder a la API de usuario"
     generic_error: "Lo sentimos, no pudimos emitir claves API de usuario, esta funcionalidad puede estar desactivada por el administrador del sitio"
+    scopes:
+      message_bus: "Actualizaciones en tiempo real"
+      notifications: "Leer y despejar notificaciones"
+      push: "Notificaciones push a servicios externos"
+      session_info: "Leer información de la sesión del usuario"
+      read: "Leer todo"
+      write: "Escribir todo"
   reports:
     visits:
       title: "Visitas de usuario"
@@ -730,7 +742,6 @@ es:
     s3_backup_config_warning: 'El servidor está configurado para permitir subir las copias de seguridad a s3, pero al menos una de las siguientes configuraciones no está realizada: s3_access_key_id, s3_secret_access_key o s3_backup_bucket. Ve a <a href="/admin/site_settings">la Configuración del Sitio</a> y actualiza la configuración. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Revisa "How to set up image uploads to S3?" para aprender más</a>.'
     image_magick_warning: 'El servidor está configurado para permitir miniaturas de imágenes grandes, pero ImageMagick no está instalado. Instala ImageMagick usando tu administrador de paquetes favorito o <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">descárgate la última versión</a>.'
     failing_emails_warning: 'Hay %{num_failed_jobs} jobs de email que fallaron. Revisa tu app.yml y asegúrate que la configuración del servidor de mail es correcta. <a href="/sidekiq/retries" target="_blank">Mira los jobs fallados en Sidekiq</a>.'
-    consumer_email_warning: "Tu sitio está configurado para Utilizar Gmail (u otro servicio de email de consumidor) para enviar email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limita la cantidad de emails que puedes enviar</a>. Considera usar un proveedor de servicio email como mandrill.com para asegurarte la entrega de los emails."
     subfolder_ends_in_slash: "La configuación del subdirectorio no es correcta; el campo DISCOURSE_RELATIVE_URL_ROOT termina con una barra."
     email_polling_errored_recently:
       one: "El email polling ha generado un error en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles."
@@ -786,7 +797,6 @@ es:
     show_pinned_excerpt_mobile: "Mostrar extracto de temas destacados en la vista móvil."
     show_pinned_excerpt_desktop: "Mostrar extracto de temas destacados en la vista de escritorio."
     post_onebox_maxlength: "Extensión máxima en caracteres de un post de Discourse en formato Onebox."
-    onebox_domains_whitelist: "Una lista de dominios a los que permitir el formato Onebox; estos dominios deberán soportar OpenGraph u oEmbed. Pruébalos en http://iframely.com/debug"
     logo_url: "El logo situado en la esquina superior izquierda de tu sitio, debería encajar en las dimensiones de un rectángulo. Si se deja en blanco, se mostrará un texto con el título del sitio."
     digest_logo_url: "La imagen de logo alterno utilizado en la parte superior del resumen del sitio enviado por email. Debería encajar en las dimensiones de un rectángulo. No debería ser una imagen SVG. Si se deja en blanco, se utilizará `logo_url`."
     logo_small_url: "El logo pequeño situado en la esquina superior izquierda del sitio, debería encajar en las dimensiones de un cuadrado y se muestra cuando se hace scroll hacia abajo. Si se deja en blanco, se mostrará un glifo de una casita."
@@ -905,6 +915,7 @@ es:
     enable_facebook_logins: "Activar autenticación por Facebook, requiere una facebook_app_id y un facebook_app_secret"
     facebook_app_id: "App id para la autenticación por Facebook, registrado en https://developers.facebook.com/apps"
     facebook_app_secret: "App secret para autenticación por Facebook, registrado en https://developers.facebook.com/apps"
+    facebook_request_extra_profile_details: "Solicitar sobre mí, localización y sitio web desde facebook. (requiere que tu aplicación de autenticación esté aprobada por facebook)"
     enable_github_logins: "Activar autenticación por Github, requiere una github_client_id y un github_client_secret"
     github_client_id: "Client id para la autenticación por Github, registrado en https://github.com/settings/applications"
     github_client_secret: "Client secret para la autenticación por Github, registrado en https://github.com/settings/applications"
@@ -958,6 +969,7 @@ es:
     external_system_avatars_enabled: "Usar un servicio externo para los avatares."
     external_system_avatars_url: "Dirección URL del servicio externo para los avatares. Sustituciones permitidas: {username} {first_letter} {color} {size}"
     default_opengraph_image_url: "URL de la imagen opengraph por defecto."
+    twitter_summary_large_image_url: "URL de la imagen por defecto para la tarjeta resumen de Twitter (debería ser al menos de 280px de ancho y 150 px de alto)."
     allow_all_attachments_for_group_messages: "Permitir todos los archivos adjuntos de email para los mensajes a grupos."
     convert_pasted_images_to_hq_jpg: "Convertir imágenes pegadas en archivos JPG de alta calidad."
     convert_pasted_images_quality: "Calidad del archivo JPG convertido  (1 es calidad mínima, 100 es máxima calidad)."
@@ -990,6 +1002,7 @@ es:
     tl3_links_no_follow: "No remover rel=nofollow de los enlaces publicados por usuarios con nivel de confianza 3."
     min_trust_to_create_topic: "El mínimo nivel de confianza requerido para crear un nuevo tema."
     min_trust_to_edit_wiki_post: "El mínimo nivel de confianza requerido para editar un post marcado como wiki."
+    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: "Mínimo nivel de confianza requerido para crear nuevos mensajes directos."
     newuser_max_links: "Cuántos enlaces puede un nuevo usuario añadir a un post."
@@ -1127,6 +1140,7 @@ es:
     automatically_unpin_topics: "Quitar destacado automáticamente cuando el usuario llega al final del tema."
     read_time_word_count: "Número de palabras por minuto para calcular el tiempo de lectura estimado."
     topic_page_title_includes_category: "El título de la página del tema incluye el nombre de la categoría."
+    max_prints_per_hour_per_user: "Número máximo de impresiones de página /print (pon un 0 para desactivar esta opción)"
     full_name_required: "El nombre completo es un campo obligatorio del perfil de usuario."
     enable_names: "Mostrar el nombre completo del usuario en su perfil, tarjeta de usuario y emails. Desactiva esta opción para ocultar el nombre completo en todas partes."
     display_name_on_posts: "Mostrar el nombre completo de un usuario en sus posts, además de su @usuario."
@@ -1160,6 +1174,7 @@ es:
     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"
     approve_unless_trust_level: "Los posts de usuarios con un nivel de confianza inferior a este deberán ser aprobados"
+    approve_new_topics_unless_trust_level: "Los nuevos temas de usuarios por debajo de este nivel de confianza deben ser aprobados"
     notify_about_queued_posts_after: "Si hay publicaciones que han estado esperando para ser revisadas por más de este número de horas, se enviará un email a la dirección de contacto del sitio. Pon 0 para desactivar estos emails."
     auto_close_messages_post_count: "Máximo número de publicaciones permitidas en un mensaje antes de que sea cerrado automáticamente (0 para desactivar)"
     auto_close_topics_post_count: "Máximo número de publicaciones permitidas en un tema antes de que sea cerrado automáticamente (0 para desactivar)"
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 30f0f2b7cd..bda3ed11e2 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -534,7 +534,7 @@ et:
       xaxis: "Päev"
       yaxis: "Uute meeldimiste arv"
     flags:
-      title: "Lipud"
+      title: "Tähised"
       xaxis: "Päev"
     bookmarks:
       title: "Järjehoidjad"
@@ -682,8 +682,22 @@ et:
   privacy_topic:
     title: "Puutumatusnormid"
   badges:
+    editor:
+      description: Esimene redigeerimine
+    basic_user:
+      name: Tavakasutaja
+    member:
+      name: Liige
+    regular:
+      name: Püsiliige
+    leader:
+      name: Vedaja
     welcome:
       name: Teretulemast
+    autobiographer:
+      name: Autobiograaf
+    anniversary:
+      name: Tähtpäev
     nice_post:
       name: Mõnus vastus
     good_post:
@@ -697,19 +711,28 @@ et:
     great_topic:
       name: Suurepärane teema
     nice_share:
-      name: Mõnus jagmaine
+      name: Mõnus jagamine
     good_share:
-      name: Hea jagmaine
+      name: Hea jagamine
     great_share:
       name: Suurepärane jagamine
     first_like:
       name: Esimene meeldimine
+    first_flag:
+      name: Esimene tähis
+      description: Teatas lipuga postitusest
+    promoter:
+      name: Promootor
+    campaigner:
+      name: Aktiivne promootor
+    champion:
+      name: Tšempion
     first_share:
       name: Esimene jagamine
       description: Jagas postitust
     first_link:
       name: Esimene viide
-      description: Lisas teise postitusele viite
+      description: Lisas teise postituse viite
     first_quote:
       name: Esimene tsitaat
       description: Tsiteeris postitust
@@ -736,13 +759,17 @@ et:
     crazy_in_love:
       name: Hullult armunud
     thank_you:
-      name: Tänamine
+      name: Tänud
+    gives_back:
+      name: Annab tagasi
     empathetic:
       name: Empaatiline
     first_emoji:
       name: Esimene emotikon
     first_mention:
       name: Esimene mainimine
+    first_reply_by_email:
+      name: Esimene vastamine meiliga
   admin_login:
     success: "Kiri saadetud"
     error: "Viga!"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index e00028be37..4255ce7577 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -585,7 +585,6 @@ fa_IR:
     s3_config_warning: 'سرور تنظیم شده برای بارگزاری فایل به  s3 ولی حداقل یکی از تنظیمات پیش رو تنظیم نشده است:  s3_access_key_id, s3_secret_access_key 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 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"> آخرین نسخه را دانلود کن. '
-    consumer_email_warning: "سایت شما  برای استفاده از ایمیل گوگل پیکربندی شده (یا دیگر سرویس دهندگان ایمیل) برای ارسال ایمیل. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'> جیمیل  محدود می کند که چند ایمیل می توانی بفرستی</a>. استفاده از یک ارائه دهنده خدمات ایمیل را مانند mandrill.com در نظر بگیرید برای اطمنیان از قابلیت تحوبل ایمیل. "
   site_settings:
     censored_words: "کلماتی که به صورت خودکار جایگزین می شوند با  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "پاک کردن خودکار تمام نوشته هایی که بیش از 30 روز بصورت پنهان باقی می مانند. "
@@ -625,7 +624,6 @@ fa_IR:
     exclude_rel_nofollow_domains: "لیست دامنه‌هایی که مقدار nofollow نباید به لینک‌های آن‌ها اضافه شود. tld.com به صورت خودکار اجازه sub.tld.com را نیز می‌دهد. حداقل کاری که می‌توان انجام داد این است که سطح بالاترین دامنه این سایت به این لیست اضافه شود تا کراولرهای وب بتوانند محتوای موجود را پیدا کنند. اگر بعضی قسمت‌های سایت شما روی دامنه‌های دیگری است، آن‌ها نیز باید اضافه شوند."
     post_excerpt_maxlength: "حداکثر طول یک نوشته گزیده شده / خلاصه. "
     post_onebox_maxlength: " حداکثر طول به یک نوشته  ایجاد گروه Discourse در کاراکتر. "
-    onebox_domains_whitelist: "لیست دامنه ها تا اجازه دهد به  oneboxing برای; این دامنه ها باید OpenGraph یا oEmbed را ساپورت کنندو امتحان کنید در http://iframely.com/debug"
     apple_touch_icon_url: "آیکون استفاده شده برای دستگاه های لمسی اپل . سایز پیشنهادی 144px by 144px."
     notification_email: "از : ایمیل آدرس زمان ارسال تمام ایمیل های ضروری سیستم استفاده شد. .دامنه مشخص شده در اینجا باید SPF, DKIM  داشته باشد و سوابق PTR معکوس به درستی برای ورود ایمیل تنظیم شده باشد. "
     email_custom_headers: "لیست  pipe-delimited از هدر ایمیل سفارشی "
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 9c449eaf82..c5d94389ee 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -198,9 +198,9 @@ fi:
       email_already_used_in_category: "'%{email}' on jo käytössä alueella '%{category_name}'."
     default_names:
       everyone: "kaikki"
-      admins: "ylläpitäjät"
+      admins: "yllapitajat"
       moderators: "valvojat"
-      staff: "henkilökunta"
+      staff: "henkilokunta"
       trust_level_0: "luottamustaso_0"
       trust_level_1: "luottamustaso_1"
       trust_level_2: "luottamustaso_2"
@@ -729,7 +729,6 @@ fi:
     s3_backup_config_warning: 'Palvelin on konfiguroitu lataamaan varmuuskopiot s3:een, mutta vähintään yksi arvoista s3_access_key_id, s3_secret_access_key tai s3_backup_bucket ei ole asetettu. Päivitä arvot <a href="/admin/site_settings">sivuston asetuksissa</a>.Voit lukea lisätietoja oppaasta <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"How to set up image uploads to S3?"</a>.'
     image_magick_warning: 'Palvelin on konfiguroitu luomaan esikatselukuvia suurista kuvista, mutta ImageMagickia ei ole asennettu. Asenna ImageMagick paketinhallinnasta tai <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">lataamalla uusin versio</a>.'
     failing_emails_warning: 'Epäonnistuneiden sähköpostitehtävien määrä on %{num_failed_jobs}. Tarkista app.yml ja varmista, että palvelimen asetukset ovat kunnossa. <a href="/sidekiq/retries" target="_blank">Katsele epäonnistuneita tehtäviä Sidekiqissa</a>.'
-    consumer_email_warning: "Sivusto on konfiguroitu käyttämään Gmailia (tai muuta yksityishenkilöille suunnattua sähköpostipalvelua) sähköpostin lähettämiseen. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail rajoittaa lähetettävien sähköpostien määrää</a>. Harkitse sähköpostipalveluntarjoajaa, kuten mandrill.com varmistaaksesi sähköpostin lähetyksen."
     subfolder_ends_in_slash: "Alihakemiston asetuksesi ei kelpaa; DISCOURSE_RELATIVE_URL_ROOT päättyy vinoviivaan."
     email_polling_errored_recently:
       one: "Sähköpostin pollaus on aiheuttanut virheen edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
@@ -782,7 +781,6 @@ fi:
     show_pinned_excerpt_mobile: "Näytä katkelma kiinnitetyistä ketjuista mobiilinäkymässä."
     show_pinned_excerpt_desktop: "Näytä katkelma kiinnitetyistä ketjuista työpöytänäkymässä."
     post_onebox_maxlength: "Discourse-viestin Onebox-esikatselun merkkien maksimimäärä."
-    onebox_domains_whitelist: "Lista verkkotunnuksista, joilta sallitaan onebox-esikatselut; näiden tunnusten pitäisi tukea OpenGraphia tai oEmbedia. Testaa ne osoitteessa http://iframely.com/debug"
     logo_url: "Logo sivustosi vasemmassa yläkulmassa. Sen pitäisi olla leveä suorakulmio muodoltaan. Jos jätetään tyhjäksi, näytetään sivuston otsikkoteksti."
     digest_logo_url: "Vaihtoehtoinen logo, jota käytetään sähköpostikoosteessa. Muodoltaan sen tulisi olla leveä suorakulmio, eikä se saa olla SVG-muodossa. Jos ei aseteta, käytetään `logo_url`-kuvaa."
     logo_small_url: "Pieni logo sivuston vasemmassa reunassa, joka näytettään rullattaessa alaspäin. Sen pitäisi olla neliö muodoltaan. Jos jätetään tyhjäksi, näytetään sen tilalla koti-merkki."
@@ -1185,6 +1183,9 @@ fi:
     min_trust_level_to_tag_topics: "Vähimmäisluottamustaso, jolla voi lisätä tunnisteita ketjuihin"
     suppress_overlapping_tags_in_list: "Jos tunniste esiintyy sanana täsmälleen ketjun otsikossa, älä näytä tunnistetta"
     remove_muted_tags_from_latest: "Jos tunniste on vaimennettu, älä näytä ketjua Tuoreimmissa."
+    company_short_name: "Yrityksen nimi (lyhyesti)"
+    company_full_name: "Yrityksen nimi (virallisesti)"
+    company_domain: "Yrityksen verkkotunnus"
     errors:
       invalid_email: "Sähköpostiosoite ei kelpaa."
       invalid_username: "Tällä nimellä ei löydy käyttäjää."
@@ -2157,6 +2158,7 @@ fi:
     message_to_blank: "message.to on tyhjä"
     text_part_body_blank: "text_part.body on tyhjä"
     body_blank: "body on tyhjä"
+    no_echo_mailing_list_mode: "Postitustilassa ei sähköposti-ilmoituksia käyttäjän omista viesteistä"
   color_schemes:
     base_theme_name: "Pohja"
   about: "Tietoja"
@@ -2505,6 +2507,12 @@ fi:
     staff_tag_disallowed: "Tunnisteen \"%{tag}\" voi lisätä vain henkilökunta"
     staff_tag_remove_disallowed: "Tunnisteen \"%{tag}\" voi poistaa vain henkilökunta"
   rss_by_tag: "Ketjut tunnisteella %{tag}"
+  finish_installation:
+    congratulations: "Onneksi olkoon, asensit Discoursen!"
+    register:
+      button: "Rekisteröidy"
+      title: "Rekisteröi ylläpitäjätunnus"
+      help: "aloita rekisteröimällä uusi tunnus"
   wizard:
     title: "Discoursen asennus"
     step:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 7ff157c55a..644d01a963 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -577,9 +577,16 @@ fr:
     authorize: "Autoriser"
     read: "lecture"
     read_write: "lecture/écriture"
-    description: "Voulez-vous autoriser à \"%{application_name}\" l'accès en %{access} à votre compte ?"
+    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"
+    scopes:
+      message_bus: "Mises à jour en temps réel"
+      notifications: "Lire et supprimer les notifications"
+      push: "Envoyer des notifications à des services externes"
+      session_info: "Lire les informations de la session utilisateur"
+      read: "Tout lire"
+      write: "Tout écrire"
   reports:
     visits:
       title: "Visites d'utilisateurs"
@@ -735,7 +742,6 @@ fr:
     s3_backup_config_warning: 'Le serveur est configuré pour envoyer les sauvegardes sur S3, mais l''un des paramètres suivants n''est pas renseigné: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Allez dans les <a href="/admin/site_settings">Paramètres</a> et mettez les à jour. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Voir "Comment mettre en place une sauvegarde sur S3?" pour en savoir plus</a>.'
     image_magick_warning: 'Le serveur est configuré pour créer des aperçus des grandes images, mais ImageMagick n''est pas installé. Installez ImageMagick en utilisant votre gestionnaire de paquets favori ou bien allez ici <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">pour télécharger la dernière version</a>.'
     failing_emails_warning: 'Il y a %{num_failed_jobs} tâches d''envois de courriel en erreur. Vérifiez votre fichier app.yml et assurez-vous de la conformité des paramètres du serveur de courriel. <a href="/sidekiq/retries" target="_blank">Voir aussi les processus en échec dans Sidekiq</a>.'
-    consumer_email_warning: "Votre site est configuré pour envoyer les courriels en utilisant Gmail (ou un autre site de courriels pour utilisateur standard). <a href='http://support.google.com/a/bin/answer.py?hl=fr&answer=166852' target='_blank'>Gmail limite le nombre d'emails que vous pouvez envoyer</a>. Nous vous conseillons d'utiliser un autre service d'envoi de courriels afin d'assurer une meilleure délivrabilité."
     subfolder_ends_in_slash: "Votre configuration de sous-répertoire est erronée; DISCOURSE_RELATIVE_URL_ROOT se termine avec une barre oblique ."
     email_polling_errored_recently:
       one: "La vérification des courriels a généré une erreur au cours des 24 dernières heures. Vérifiez <a href='/logs' target='_blank'>le journal</a> pour plus de détails."
@@ -791,7 +797,8 @@ fr:
     show_pinned_excerpt_mobile: "Afficher les extraits des sujets épinglés en vue mobile."
     show_pinned_excerpt_desktop: "Afficher les extraits des sujets épinglés en vue bureau."
     post_onebox_maxlength: "Longueur maximale d'un message emboîté en nombre de caractères."
-    onebox_domains_whitelist: "Liste des noms de domaines autorisés pour les 'onebox'. Ces domaines doivent supporter OpenGraph or oEmbed. Testez les sur http://iframely.com/debug"
+    onebox_domains_blacklist: "Une liste de domaines que ne seront jamais transformés en Onebox."
+    max_oneboxes_per_post: "Nombre maximum de Onebox dans un message."
     logo_url: "L'image de votre logo situé en haut à gauche de votre site doit être de forme rectangulaire large. Si vous laissez ce champ vide, le nom de votre site apparaitra."
     digest_logo_url: "L'image alternative de votre logo utilisée en haut du résumé par courriel de votre site. Elle devrait idéalement être en forme de large rectangle et ne pas être une image SVG. Si vide, `logo_url` sera utilisé."
     logo_small_url: "Le petit logo situé en haut à gauche de votre site doit être de forme carré. Si vous laissez ce champ vide, un logo de maison apparaîtra."
@@ -1152,6 +1159,7 @@ fr:
     embed_username_key_from_feed: "Clé pour extraire le pseudo du flux."
     embed_title_scrubber: "Expression régulière pour nettoyer les titres intégrables."
     embed_truncate: "Tronquer les messages embarqué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."
     embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus embarqués."
@@ -1198,9 +1206,8 @@ fr:
     default_categories_muted: "Liste de catégories silencées par défaut."
     max_user_api_reqs_per_day: "Nombre maximum de requêtes de l'API utilisateur par clé et par jour"
     max_user_api_reqs_per_minute: "Nombre maximum de requêtes de l'API utilisateur par clé et par minute"
-    allow_read_user_api_keys: "Autoriser la génération de clés en lecture seule pour l'API utilisateur"
-    allow_write_user_api_keys: "Autoriser la génération de clés en écriture pour l'API utilisateur"
-    allow_push_user_api_keys: "Autoriser la génération de clés pour utiliser le service push pour l'API utilisateur"
+    allow_user_api_keys: "Autoriser la génération des clés de l'API utilisateur"
+    allow_user_api_key_scopes: "Liste des champs d'action autorisés pour les clés de l'API utilisateur"
     max_api_keys_per_user: "Nombre maximum de clés de l'API utilisateur par utilisateur"
     min_trust_level_for_user_api_key: "Niveau de confiance requis pour générer des clés pour l'API utilisateur"
     allowed_user_api_auth_redirects: "URL autorisées pour la redirection d'authentification pour les clés de l'API utilisateur"
@@ -2197,6 +2204,7 @@ fr:
     message_to_blank: "message.to est vide"
     text_part_body_blank: "text_part.body est vide"
     body_blank: "sans contenu"
+    no_echo_mailing_list_mode: "Notifications de la liste de diffusion désactivées pour les messages de l'utilisateur."
   color_schemes:
     base_theme_name: "Base"
   about: "À propos"
@@ -2622,6 +2630,19 @@ fr:
     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."
   rss_by_tag: "Sujets avec le tag %{tag}"
+  finish_installation:
+    congratulations: "Félicitations, vous avez installé Discourse !"
+    register:
+      button: "Créer"
+      title: "Créer un compte administrateur"
+      help: "créez un nouveau compte pour commencer"
+      no_emails: "Malheureusement aucune adresse courriel d'administrateur n'a été définie lors de la configuration ; finaliser la configuration <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>peut être compliqué</a>."
+    confirm_email:
+      title: "Confirmer votre adresse courriel"
+      message: "<p>Nous avons envoyé un courriel d’activation à <b>%{email}</b>. Veuillez suivre les instructions du courriel pour activer votre compte.</p><p>S'il n'est pas réceptionné, assurez-vous que l'adresse courriel est correctement configurée pour votre Discourse et vérifiez vos courriers indésirables.</p>"
+    resend_email:
+      title: "Renvoyer le courriel d'activation"
+      message: "<p>Nous avons renvoyé le courriel d'activation à <b>%{email}</b>"
   wizard:
     title: "Configuration de Discourse"
     step:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index c5e64c8080..19dffb38ba 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -29,8 +29,8 @@ he:
   loading: "טוען"
   powered_by_html: 'מונע ע"י <a href="http://www.discourse.org">Discourse</a>, פועל מיטבית עם Javascript מאופשר'
   log_in: "התחברות"
-  purge_reason: "נחמק אוטומטית כחשבון נטוש ולא פעיל"
-  disable_remote_images_download_reason: "הורדת תמונות מרחוק נחסמה בשל היעדר מספיק שטח אכסון פנוי."
+  purge_reason: "נמחק אוטומטית כחשבון נטוש ולא פעיל"
+  disable_remote_images_download_reason: "הורדת תמונות מרחוק נחסמה בשל היעדר מספיק שטח אחסון פנוי."
   anonymous: "אנונימי"
   emails:
     incoming:
@@ -76,10 +76,10 @@ he:
       less_than_or_equal_to: חייב להיות פחות או שווה ל-%{count}
       not_a_number: אינו מספר
       not_an_integer: חייב להיות מספר שלם
-      odd: חייב להיות א-זוגי
+      odd: חייב להיות אי-זוגי
       record_invalid: 'בדיקה נכשלה: %{errors}'
       restrict_dependent_destroy:
-        one: "לא ניתן למחוק בגלל קיומה של רשומה תלוייה %{record}"
+        one: "לא ניתן למחוק בגלל קיומה של רשומה תלויה %{record}"
         many: "לא ניתן למחוק רשומה בגלל קיומה של רשומה תלויה %{record}"
       too_long:
         one: ארוך מידי (המקסימום האפשרי הוא תו אחד)
@@ -155,7 +155,7 @@ he:
     one: "מצטערים, משתמשים חדשים יכולים להוסיף רק קישור אחד בפוסט."
     other: "מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} קישורים בפוסט."
   spamming_host: "סליחה אך אינכם יכולים להוסיף קישור לאתר זה."
-  user_is_suspended: "משתמשים מושעים אינפ  מורשים לפרסם"
+  user_is_suspended: "משתמשים מושעים אינם מורשים לפרסם."
   topic_not_found: "משהו השתבש אולי נושא זה נסגר או נמחק בזמן שקראתם אותו?"
   just_posted_that: "דומה מידי למה שפרסמתם לאחרונה"
   invalid_characters: "מכיל תווים לא תקניים"
@@ -311,7 +311,7 @@ he:
   meta_category_description: "דיון אודות אתר זה, הארגון שמאחוריו, איך הוא פועל ואיך נוכל לשפר אותו."
   staff_category_name: "צוות"
   staff_category_description: "קטגוריה פרטית לדיוני הצוות. נושאים נראים רק למנהלים ומנהלים ראשיים."
-  assets_topic_body: "זהו נושא קבוע, הגלוי רק לצוות, לשמירת תמונות וקבצים שמשמשים לעיצוב האתר. אל תמחקו אותו!\n\n\nכיצד:\n\n\n1. הגיבו לנושא זה.\n2. העלו כאן את כל התמונות שברצונכם להשתמש כלוגואים, לוגואים מוקטנים (favicons) וכן הלאה. (השתמשו בלוגו ההעלאה בסרגל הכלים בעורך הפרסום, או גררו-שחררו או הדביקו את התמונות.)\n3. שלחו את התגובה כדי לפרסם אותה.\n4. הקליקו עם הכפתור הימני על התמונות בפרסום החש שלכם כדי להשיג את הכתובת של התמונה שהועלתה, או הקליקו על סמל העריכה כדי לערוך את הפרסום ולאחזר את הכתובת של התמונות. העתיקו את הכתובות.\n5. הדביקו את כתובות התמונות אלתוך [הגדרות בסיסיות](/מנהל/הגדרות_אתגר/קטגוריה/נדרש).\n\nאם אתכם צריכים לאפשר העלאת קבצים מסוגים שונים, ערכו את \"הרחבות מאושרות\" בתוך [הגדרות_קובץ](/מנהל/הגדרות_אתר/קטגוריה/קבצים)."
+  assets_topic_body: "זהו נושא קבוע, הגלוי רק לצוות, לשמירת תמונות וקבצים שמשמשים לעיצוב האתר. אל תמחקו אותו!\n\n\nכיצד:\n\n\n1. הגיבו לנושא זה.\n2. העלו כאן את כל התמונות שברצונכם שישמשו כלוגואים, לוגואים מוקטנים (favicons) וכן הלאה. (השתמשו בלוגו ההעלאה בסרגל הכלים בעורך הפוסט, או גררו-שחררו או הדביקו את התמונות.)\n3. שלחו את התגובה כדי לפרסם אותה.\n4. הקליקו עם הכפתור הימני על התמונות בפרסום החדש שלכם כדי להשיג את הכתובת של התמונה שהועלתה, או הקליקו על סמל העריכה כדי לערוך את הפוסט ולאחזר את הכתובת של התמונות. העתיקו את הכתובות.\n5. הדביקו את כתובות התמונות אל תוך [הגדרות בסיסיות](/admin/site_settings/category/required).\n\nאם אתכם צריכים לאפשר העלאת קבצים מסוגים שונים, ערכו את \"הרחבות מאושרות\" בתוך [הגדרות_קובץ](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "ברוכים הבאים ללאונג'"
     body: |2
@@ -339,9 +339,9 @@ he:
     replace_paragraph: "(החליפו פסקה ראשונה זו עם תיאור קצר של הקטגוריה החדשה שלכם. הנחיה זו תופיעה באזור בחירת הקטגוריה, אז נסו לשמור על פחות מ 200 אותיות. **עד שתערכו תיאור זה או תיצרו נושאים, קטגוריה זו לא תופיע בדף הקטגוריות.**)"
     post_template: "%{replace_paragraph}\n\nהשתמשו בפסקאות הבאות לתיאור ארוך יותר, או כדי לגבש הנחיות קטגוריה או חוקים:\n\n- למה להשתמש בקטגוריה זו? למה היא נועדה?\n\n- במה בדיוק היא שונה מקטגוריות אחרות שכבר יש לנו?\n\n- מה בגדול נושאים בקטגוריה זו אמורים להכיל?\n\n- האם אנחנו צריכים את הקטגוריה הזו? אולי נוכל למזג אותה עם קטגוריה אחרת, או תת-קטגוריה?\n"
     errors:
-      uncategorized_parent: "נטול קטגוריה לא יכול להיות עם קטגוריית אם"
+      uncategorized_parent: "ללא-קטגוריה לא יכול להיות עם קטגוריית אם"
       self_parent: "קטגוריית אם לא יכולה להיות הקטגוריה עצמה"
-      depth: "לא ניתן להניח תת-קטגוריה תחת תת-קטגוריה אחרת"
+      depth: "לא ניתן לקנן תת-קטגוריה תחת תת-קטגוריה אחרת"
       invalid_email_in: "'%{email}' אינה כתובת מייל תקפה."
       email_already_used_in_group: "'%{email}' כבר בשימוש על ידי הקבוצה '%{group_name}'."
       email_already_used_in_category: "'%{email}' כבר בשימוש על ידי הקטגוריה '%{category_name}'."
@@ -484,7 +484,7 @@ he:
   activation:
     action: "לחצו כאן להפעיל את חשבונכם"
     already_done: "סליחה, כתובת אישור החשבון הזו אינה זמינה יותר. אולי החשבון שלך כבר פעיל?"
-    please_continue: "חשבונך החדש אושר; הנכם מועברים לעמוד הבית."
+    please_continue: "חשבונכם החדש אושר; הנכם מועברים לעמוד הבית."
     continue_button: "המשך ל-%{site_name}"
     welcome_to: "ברוכים הבאים ל-%{site_name}!"
     approval_required: "מנהל צריך לאשר את החשבון שלכם ידנית לפני שתוכלו להיכנס לפורום הזה. יישלח אליכם דואר אלקטרוני כשהחשבון שלכם יאושר!"
@@ -574,9 +574,16 @@ he:
     authorize: "אישור"
     read: "קריאה"
     read_write: "קריאה/כתיבה"
-    description: "האם תרצו להעניק ל \"%{application_name}\" גישת %{access} לחשבונכם?"
+    description: "\"%{application_name}\" מבקשת את הגישה הבאה לחשבון שלכם:"
     no_trust_level: "מצטערים, אין לכם את רמת האמון הנדרשת כדי לגשת ל API של המשתמשים"
     generic_error: "מצטערים, לא הצלחנו לייצר את מפתחות ה API של המשתמש, ייתכן שיכולת זו מנוטרלת על ידי מנהלי האתר"
+    scopes:
+      message_bus: "עדכונים חיים"
+      notifications: "קיראו ונקו התראות"
+      push: "דחיפת התראות לשירותים חיצוניים"
+      session_info: "קריאת מידע לגבי סשן של משתמש"
+      read: "קריאה להכל"
+      write: "כתיבה להכל"
   reports:
     visits:
       title: "ביקורי משתמש"
@@ -704,7 +711,7 @@ he:
     http_total_reqs:
       title: "סה\"כ"
       xaxis: "יום"
-      yaxis: "סה\"כ הבקשות"
+      yaxis: "סה\"כ בקשות"
     time_to_first_response:
       title: "זמן לתגובה הראשונה"
       xaxis: "יום"
@@ -724,7 +731,7 @@ he:
     sidekiq_warning: 'Sidekiq לא רץ. משימות רבות, כמו שליחת מיילים, מבוצעות אסינכרונית באמצעות Sidekiq. אנא וודאו שלפחות תהליך אחד של Sidekiq רץ. <a href="https://github.com/mperham/sidekiq" target="_blank">לימדו על Sidekiq כאן</a>.'
     queue_size_warning: 'מספר העבודות בתור הוא %{queue_size}, שהוא גבוה. זה עלול להצביע על בעיה עם תהליך(י) Sidekiq, או שייתכן שאתם צריכים יותר Sidekiq workers.'
     memory_warning: 'בשרת שלכם יש פחות מ 1 גיגה זיכרון בסך הכל. מומלץ לפחות 1 גיגה זיכרון.'
-    google_oauth2_config_warning: 'השרת מכוון לאפשר הרשמות והתחברות עם OAuth2 של גוגל (enable_google_oauth2_logins), אבל ערכי זהות הלקוח (client id) וסיסאת הלקוח (client secret) אינם מוגדרים. לכו ל<a href="/admin/site_settings"> הגדרות האתר </a> ועדכנו את הגדרות האתר. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank"> ראו מדריך זה כדי ללמוד עוד</a>.'
+    google_oauth2_config_warning: 'השרת מכוון לאפשר הרשמות והתחברות עם OAuth2 של גוגל (enable_google_oauth2_logins), אבל ערכי זהות הלקוח (client id) וסיסמת הלקוח (client secret) אינם מוגדרים. לכו ל<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: 'השרת מכוון לאפשר הרשמה והתחברות עם פייסבוק (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>.'
@@ -732,7 +739,6 @@ he:
     s3_backup_config_warning: 'השרת מכוון להעלות גיבויים ל s3, אבל לפחות אחת מההגדרות הבאות לא נקבעה: s3_access_key_id, s3_secret_access_key או 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 שלכם כדי לוודא ששרת המייל מוגדר כיאות. <a href="/sidekiq/retries" target="_blank">ראו את העבודות שנכשלו ב Sidekiq</a>.'
-    consumer_email_warning: "השרת שלכם מכוון להשתמש בג׳ימייל (או שירות מייל אחר שנועד לאנשים פרטיים) כדי לשלוח מייל. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>ג׳ימייל מגביל כמה מיילים ניתן לשלוח</a>. שיקלו להשתמש בשירות מייל כמו mandrill.com כדי להבטיח שליחה של מיילים."
     subfolder_ends_in_slash: "הגדרות תיקיית המשנה שלכם לא נכונות, הנתיב DISCOURSE_RELATIVE_URL_ROOT צריך להסתיים בלוכסן."
     email_polling_errored_recently:
       one: "ניסיונות שליחת מיילים יצרו תקלה ב 24 השעות האחרונות. צפו ב<a href='/logs' target='_blank'>יומנים</a> לפרטים נוספים."
@@ -762,10 +768,10 @@ he:
     allow_duplicate_topic_titles: "אשרו נושאים עם כותרות זהות או משוכפלות."
     unique_posts_mins: "כמה דקות לפני שמשתמש יכול לפרסם את אותו תוכן שוב"
     educate_until_posts: "כאשר המשתמש/ת מתחילים להקיש את (n) הפוסטים הראשונים שלהם, הציגו פאנל הנחיה למשתמש באזור חיבור הפוסטים."
-    title: "שם האתר הזה, כפי שהוא משתמש בתגית הכותרת."
+    title: "שם האתר הזה, כפי שהוא משמש בתגית הכותרת."
     site_description: "תארו את האתר הזה במשפט אחד, כפי שהוא מופיע במטא-תגית התיאור."
-    contact_email: "כתובת דוא\"ל של אנשי קשר האחראים לאתר זה. משמשת להתראות חשובות, כמו דגלים שלא טופלו, כמו גם ליצירת קשר חירום בעמוד האודות."
-    contact_url: "כתובת URL ליצירת קשר לעמוד זה. משמשת בטופס ה-/אודות לעניינים דחופים."
+    contact_email: "כתובת דוא\"ל של אנשי קשר האחראים לאתר זה. משמשת להתראות חשובות, כמו דגלים שלא טופלו, כמו גם ליצירת קשר בשעת חירום מעמוד האודות."
+    contact_url: "כתובת URL ליצירת קשר לעמוד זה. משמשת בטופס ה- /about לעניינים דחופים."
     queue_jobs: "מפתחים בלבד! אזהרה! כברירת מחדל, שימו עבודות בתור sidekiq. אם מנוטרל, האתר שלכם ישבר."
     crawl_images: "אחזור תמונות מכתובת URL רחוקה כדי להכניס את מימדי האורך והרוחב הנכונים."
     download_remote_images_to_local: "המרת תמונות מרחוק לתמונות מקומיות באמצעות הורדות; למניעת שגיאות של תמונות חסרות"
@@ -788,7 +794,8 @@ he:
     show_pinned_excerpt_mobile: "הצגת קטע בנושאים נעוצים במבט ניידים."
     show_pinned_excerpt_desktop: "הצגת קטע בנושאים נעוצים בתצוגת מחשב-שולחני."
     post_onebox_maxlength: "מספר תוים מקסימאלי מותר כאורך פוסט Discourse אחד בקופסא (oneboxed Discourse post)."
-    onebox_domains_whitelist: "רשימת מתחמים (דומיינים) מותרים לאריזה (oneboxing); על דומיינים אלה לתמוך ב-OpenGraph או ב-oEmbed. בדקו אותם ב-http://iframely.com/debug."
+    onebox_domains_blacklist: "רשימת מתחמים (דומיינים) שלעולם לא יהיו Oneboxed."
+    max_oneboxes_per_post: "מספר מקסימלי של onebox-ים בפוסט."
     logo_url: "תמונת הלוגו בפינה הימנית עליונה של המסך, אמורה להיות מלבנית רחבה. אם נשארת ריקה, תוצג כותרת האתר."
     digest_logo_url: "תמונת הלוגו האלטרנטיבי שמשמשת בראש המיילים של הסיכום מאתרכם. אמורה להיות צורה מלבנית מוארכת. צריכה לא להיות תמונת SVG. אם נשאר ריק ייעשה שימוש ב `logo_url`."
     logo_small_url: "תמונת לוגו קטנה בפינה הימנית עליונה של האתר, אמורה להיות ריבועית, נראית כאשר גוללים למטה. אם נשארת ריקה תוצג צלמית בית."
@@ -802,8 +809,8 @@ he:
     summary_score_threshold: "הניקוד המינימלי הנדרש כדי שפוסט ייכלל ב\"סיכום נושא זה\""
     summary_posts_required: "מספר הפוסטים המנימלי בנושא לפני שהאפשרות \"סיכום נושא זה\" תתאפשר"
     summary_likes_required: "מינימום הלייקים לנושא לפני שהאפשרות \"סיכום נושא זה\" תתאפשר"
-    summary_percent_filter: "כאשר משתמש/ת מקליקים על \"סיכום נושא זה\", הציגו את  % o הפרסומים הראשונים"
-    summary_max_results: "מספר הפרסומים שיוחזרו באמצעות \"סיכום נושא זה\""
+    summary_percent_filter: "כאשר משתמש/ת מקליקים על \"סיכום נושא זה\", הציגו את % הפוסטים הראשונים"
+    summary_max_results: "מספר הפוסטים שיוחזרו באמצעות \"סיכום נושא זה\""
     enable_private_messages: "הרשו למשתמשי רמת אמון 1 (ניתן להגדרה באמצעות רמת אמון מינימלית לשליחת הודעות) ליצור הודעות ולענות להודעות. שימו לב שהצוות תמיד יכול לשלוח הודעות, לא משנה מה."
     enable_long_polling: "באס הודעות שמשמש להתראות יכול להשתמש בתשאול ארוך (long polling)"
     long_polling_base_url: "בסיס ה-URL שנמצא בשימוש עבור long polling (כאשר CDN מחזיר תוכן דינמי, זכרו להגדיר את ערך זה ל-Origin pull, דוגמת http://origin.site.com)"
@@ -823,7 +830,7 @@ he:
     num_tl3_flags_to_block_new_user: "אם פוסטים של משתמשים חדשים מקבלים כמות זו של דגלים מ num_tl3_users_to_block_new_user משתמשים שונים ברמת אמון 3, הסתירו את כל הפוסטים שלהם ומנעו פרסומים עתידיים. 0 לניטרול."
     num_tl3_users_to_block_new_user: "אם פוסטים של משתמשים חדשים מקבלים num_tl3_flags_to_block_new_user דגלים מכמות זו של משתמשים ברמת אמון 3, הסתירו את הפוסטים שלהם ומנעו פרסומים עתידיים. 0 לניטרול."
     notify_mods_when_user_blocked: "אם משתמש נחסם אוטומטית, שילחו הודעה לכל המנחים."
-    flag_sockpuppets: "אם משתמש/ת חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפרסומים של שניהם כספאם פוטנציאלי."
+    flag_sockpuppets: "אם משתמשים חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפוסטים של שניהם כספאם פוטנציאלי."
     traditional_markdown_linebreaks: "שימוש בשבירת שורות מסורתית בסימון, מה שדורש שני רווחים עוקבים למעבר שורה."
     allow_html_tables: "אפשרו הכנסת טבלאות ב Markdown באמצעות תגיות HTML. התגיות TABLE, THEAD, TD, TR, TH יהיו ברשימה לבנה (מצריך אפייה מחדש של כל הפוסטים הישנים שכוללים טבלאות)"
     post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפוסט (לייק, סימון, וכו')."
@@ -832,7 +839,7 @@ he:
     maximum_session_age: "משתמשים ישארו מחוברים ל n שעות מאז ביקורם האחרון"
     ga_tracking_code: "מיושן: קוד גוגל אנליטיקס (ga.js) למעקב, כגון: UA-12345678-9ֿ; ראו http://google.com/analytics"
     ga_domain_name: "מיושן: שם מתחם (דומיין) לגוגל אנליטיקס (ga.js), למשל: mysite.com; ראו http://google.com/analytics"
-    ga_universal_tracking_code: "קוד מעקב של Google Universal Analytics (analytics.js), למשל: UA-12345678-9; ראו http://google.com/analytics"
+    ga_universal_tracking_code: "קוד מעקב של (Google Universal Analytics (analytics.js, למשל: UA-12345678-9; ראו http://google.com/analytics"
     ga_universal_domain_name: "שם המתחם של (Google Universal Analytics analytics.js), למשל: mysite.com; ראו http://google.com/analytics"
     gtm_container_id: "מזהה קונטיינר של מנהל תגיות גוגל. למשל: GTM-ABCDEF"
     enable_escaped_fragments: "נסיגה ל Ajax-Crawling API של גוגל אם לא מתגלה זחלן-רשת. ראו https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
@@ -845,7 +852,7 @@ he:
     post_menu_hidden_items: "פריטי התפריט להסתרה כברירת מחדל בתפריט הפוסט, אלא אם כן נלחץ לחצן ההרחבה."
     share_links: "החליטו אילו פריטים יופיעו בתיבת השיתוף, ובאיזה סדר."
     track_external_right_clicks: "עקבו אחר קישורים חיצוניים שעליהם נלחץ הכפתור הימני (למשל: פתיחה בטאב חדש) מנוטרל כברירת מחדל כיוון שזה כותב מחדש URLs"
-    site_contact_username: "שם משתמש/ת תקין ממנו ישלחו הודעות פרטיות. אם ישאר ריק חשבון ברירת המחדל של המערכת ישמש לכך."
+    site_contact_username: "שם משתמש/ת תקין של איש צוות ממנו ישלחו כל ההודעות אוטומטיות. אם ישאר ריק חשבון ברירת המחדל של המערכת ישמש לכך."
     send_welcome_message: "שלחו לכל המשתמשים החדשים הודעת \"ברוכים הבאים\" עם הדרכה ראשונית כיצד להתחיל."
     suppress_reply_directly_below: "אל תציגו את סך התגובות המצטבר בפוסט כאשר ישנה תגובה ישירה אחת לפוסט זה."
     suppress_reply_directly_above: "אל תציגו את את אפשרות ההרחבה \"בתגובה ל..\" לפוסט כאשר יש רק תגובה אחת ישירה מעל לפוסט זה."
@@ -855,7 +862,7 @@ he:
     topics_per_period_in_top_page: "מספר הנושאים הראשונים המוצגים בתצוגה המורחבת של \"הצג עוד\"."
     redirect_users_to_top_page: "כוון באופן אוטומטי משתמשים חדשים וכאלה שנעדרו במשך זמן לראש העמוד."
     top_page_default_timeframe: "ברירת מחדל של פרק זמן להצגה בדף המובילים."
-    show_email_on_profile: "הצגת כתובת הדוא\"ל של המשתמש/ת בעמוד הפרופיל שלהם (גלוי רק להם ולצוות)"
+    show_email_on_profile: "הצגת כתובת הדוא\"ל של המשתמשים בעמוד הפרופיל שלהם (גלוי רק להם ולצוות)"
     prioritize_username_in_ux: "הציגו שם-משתמש ראשון בדף המשתמש, כרטיס המשתמש ופוסטים (כשמנוטרל השם מופיע קודם)"
     email_token_valid_hours: "סיסמאות שכחת סיסמה / הפעלת חשבון תקפים במשך (n) שעות."
     email_token_grace_period_hours: "סיסמאות שכחת סיסמה / הפעלת חשבון עדיין זמינים לזמן חסד של (n) שעות לאחר שהופקו."
@@ -865,14 +872,14 @@ he:
     email_domains_blacklist: "רשימה מופרדת בצינור (pipe) של דומיינים של אימייל אשר מהם משתמשים לא מורשים לרשום חשבונות. למשל: mailinator.com|trashmail.net"
     email_domains_whitelist: "רשימה מופרדת בצינור (pipe) אשר ר-ק ממנה משתמשים יכולים לרשום חשבונות. א-ז-ה-ר-ה: משתמשים עם אימיילים מדומיינים אחרים לא יורשו!"
     forgot_password_strict: "אל תיידעו משתמשים בנוגע לקיום חשבון כשהם משתמשים באפשרות של ״שכחתי סיסמה״."
-    log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמ/ת בכל המכשירים"
-    version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה של האדמין"
-    new_version_emails: "שלחו דוא\"ל לכתובת של contact_email כשגרסא חדשה של Discourse זמינה."
+    log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמש/ת בכל המכשירים"
+    version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה ב /admin"
+    new_version_emails: "שלחו דוא\"ל לכתובת של contact_email כשגרסה חדשה של Discourse זמינה."
     port: "מ-פ-ת-ח-י-ם ב-ל-ב-ד! א-ז-ה-ר-ה! התמשו בפורט זה ל HTTP במקום בפורט 80. השאירו ריק בשביל ברירת המחדל פורט 80."
     force_hostname: "מ-פ-ת-ח-י-ם ב-ל-ב-ד! א-ז-ה-ר-ה! הגדירו שם שרת ב URL. השאירו ריק בשביל ברירת המחדל."
     invite_expiry_days: "מה התוקף מפתחות הזמנת משתמשים, בימים"
-    invite_passthrough_hours: "כמה זמן, בשעות, יכול/ה משתמשים לעשות שימוש בהזמנה שנשלחה כדי להתחבר "
-    invite_only: "הרשמה פתוחה מבוטלת, על כל המשתמשים החדשים להיות מוזמנים על ידי חבר/ת בצוות."
+    invite_passthrough_hours: "כמה זמן, בשעות, יכולים משתמשים לעשות שימוש בהזמנה שנשלחה כדי להתחבר "
+    invite_only: "הרשמה פומבית מנוטרלת, כל המשתמשים החדשים חייבים להיות מוזמנים על ידי חברים אחרים באתר."
     login_required: "דרשו הזדהות לקריאת תוכן באתר זה, אל תאפשרו גישה אנונימית."
     min_username_length: "אורך שם משתמש מינימילי בתווים."
     max_username_length: "אורך שם משתמש מקסימלי בתווים."
@@ -889,7 +896,7 @@ he:
     sso_overrides_email: "דורס מייל מקומי עם אתר מייל חיצוני מתוכן SSO בכל התחברות, ומונע שינויים מקומיים. (אזהרה: אי-התאמות עלולות להתרחש בעקבות נורמליזציה של מיילים מקומיים)"
     sso_overrides_username: "דורס שם משתמש מקומי עם שם משתמש של אתר חיצוני מתוכן SSO בכל התחברות, ומונע שינויים מקומיים. (אזהרה: אי-התאמות עלולות להתרחש בעקבות הבדלים בדרישות אורך לגבי שמות משתמשים)"
     sso_overrides_name: "דורס שם מלא מקומי עם שם מלא מאתר חיצוני מתוכן SSO בכל התחברות, מונע שינויים מקומיים."
-    sso_overrides_avatar: "מעקף אווטאר של משתמש בעזרת אווטר אתרחיצוני מ-SSO Payload. אם אפשרות זו מופעלת, מומלץ מאוד לבטל את האפשרות להעלאת אווטר."
+    sso_overrides_avatar: "מעקף אווטאר של משתמש בעזרת אווטר אתר חיצוני מ-SSO Payload. אם אפשרות זו מופעלת, מומלץ מאוד לבטל את האפשרות להעלאת אווטר."
     sso_not_approved_url: "SSO של חשבונות שלא אושרו יופנו ל URL זה"
     enable_local_logins: "אפשרו התחברות שמבוססת על שמות משתמשים וסיסמאות מקומיים. (שימו לב: אפשרות זו חייבת להיות מותרת כדי שהזמנות להצטרפות יפעלו)"
     allow_new_registrations: "אפשרו הרשמות משתמשים חדשים. בטלו סימון זה כדי למנוע יצירת חשבונות חדשים."
@@ -907,12 +914,12 @@ he:
     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: "בקשה עלי, מיקום ואתר מפייסבוק. (מצריך שאפליקציית האימות שלכם תאושר על ידי פייסבוק)"
+    facebook_request_extra_profile_details: "בקשת מידע לגבי \"אודות\", מיקום, ואתר אינטרנט מפייסבוק. (מצריך שאפליקציית האימות שלכם תאושר על ידי פייסבוק)"
     enable_github_logins: "אפשור אימות Github, מצריך github_client_id ו github_client_secret"
     github_client_id: "מזהה לקוח לאימות Github, רשום ב https://github.com/settings/applications"
     github_client_secret: "סוד לקוח לאימות Github, רשום ב https://github.com/settings/applications"
     readonly_mode_during_backup: "אפשרו מצב של קריאה בלבד בזמן גיבוי"
-    allow_restore: "אפשר שחזור, אשר יכול להחליף את כל(!) המידע באתר! הותירו על \"שלילי\"/false אלא אם כן אתם מתכננים לשחזר גיבוי."
+    allow_restore: "אפשר שחזור, אשר יכול להחליף את כל(!) המידע באתר! הותירו על \"שלילי\" (false) אלא אם כן אתם מתכננים לשחזר גיבוי."
     maximum_backups: "המספר המקסימלי של גיבויים לשמירה על הכונן. גיבויים ישנים יותר ימחקו אוטומטית"
     automatic_backups_enabled: "הרץ גיבויים אוטומטים כמו שמוגדר בתדירות הגיבויים"
     backup_frequency: "באיזו תכיפות אנחנו מגבים את האתר, בימים."
@@ -929,30 +936,30 @@ he:
     top_topics_formula_least_likes_per_post_multiplier: "מכפיל של כמות לייקים מינימלית לפוסט (n) בנוסחת הנושאים המובילים: `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: "לאחר יצירת נושא, על המשתמשים להמתין (n) שניות לפני יצירת נושא אחר."
-    rate_limit_create_post: "לאחר הפרסום על המשתמשים להמתין (n) שניות לפני יצירת פרסום חדש."
+    rate_limit_create_post: "לאחר הפרסום על המשתמשים להמתין (n) שניות לפני יצירת פוסט חדש."
     rate_limit_new_user_create_topic: "לאחר יצירת נושא, משתמשים חדשים יחוייבו לחכות (n) שניות לפני שיוכלו ליצור נושא אחר."
-    rate_limit_new_user_create_post: "לאחר פרסום, משתמשים חדשים יחוייבו לחכות (n) שניות לפני שיוכלו ליצור פרסום אחר."
-    max_likes_per_day: "מספר מקסימלי של likes למשתמש/ת ביום."
+    rate_limit_new_user_create_post: "לאחר פרסום, משתמשים חדשים יחוייבו לחכות (n) שניות לפני שיוכלו ליצור פוסט אחר."
+    max_likes_per_day: "מספר מקסימלי של לייקים למשתמש/ת ביום."
     max_flags_per_day: "מספר מקסימלי של דגלים מותרים למשתמשים ביום."
     max_bookmarks_per_day: "מספר מקסימלי של סימניות למשתמשים ביום."
     max_edits_per_day: "מספר עריכות מקסימלי מותר למשתמשים ליום."
     max_topics_per_day: "מספר מקסימלי של נושאים שמשתמשים יכולים ליצור ביום."
     max_private_messages_per_day: "מספר מקסימלי של הודעות שמשתמשים יכולים ליצור ביום."
-    max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמש/ת לשלוח ביום."
+    max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמשים לשלוח ביום."
     max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמשים יכולים לשלוח ביום. "
     alert_admins_if_errors_per_minute: "מספר השגיאות בדקה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
     alert_admins_if_errors_per_hour: "מספר השגיאות בשעה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
-    categories_topics: "מספר נושאים להצגה בדף /קטגוריות."
+    categories_topics: "מספר נושאים להצגה בדף /categories."
     suggested_topics: "מספר הנושאים המוצעים שיופיעו בתחתית הנושא המוצג."
     limit_suggested_to_category: "הצגת רק נושאים מהקטגוריה הנוכחית ברשימת הנושאים המומלצים."
     suggested_topics_max_days_old: "נושאים מוצעים לא אמורים להיות בני יותר מ n ימים."
     clean_up_uploads: "הסירו העלאות יתומות וללא הפניה כדי למנוע אירוח בלתי חוקי של חומר. אזהרה: אתם עלולי לרצות לגבות את תיקיית ה-/uploads שלכם לפנו שתאפשרו הגדרה זו."
     clean_orphan_uploads_grace_period_hours: "תקופת חסד (בשעות) לפני שהעלאות יתומות מוסרות."
     purge_deleted_uploads_grace_period_days: "תקופת חסד (בימים) לפני שהעלאה שהוסרה תמחק."
-    purge_unactivated_users_grace_period_days: "תקופת חסד (בימים) לפני שמשתמש/ת שלא הפעילו את חשבונם ימחקו."
+    purge_unactivated_users_grace_period_days: "תקופת חסד (בימים) לפני שמשתמשים שלא הפעילו את חשבונם ימחקו."
     enable_s3_uploads: "אחסן העלאות (uploads) על תשתית של Amazon S3. חשוב: מצריך מפתח גישה + מפתח גישה סודי שיהיו חוקיים."
     s3_use_iam_profile: 'השתמש ב-AWS EC2 IAM role על מנת לאחזר מפתחות. שימו לב: איפשור של זה ידרוס את ההגדרות "S3 access key id" וכן את "s3 secret access key".'
-    s3_upload_bucket: "השם של Amazon S3 bucket אליו יועלו קבצים. אזהרה: שם זה חייב להיות באותיות קטנות, ללא נקודות וללא קווים תחתונים."
+    s3_upload_bucket: "שם של Amazon S3 bucket אליו יועלו קבצים. אזהרה: שם זה חייב להיות באותיות קטנות, ללא נקודות וללא קווים תחתונים."
     s3_access_key_id: "מפתח הגישה (access key id) של Amazon S3 שישמש להעלאת התמונות."
     s3_secret_access_key: "מפתח הגישה הסודי (secret access key) של Amazon S3 שישמש להעלאת תמונות."
     s3_region: "שם האזור (region name) של Amazon S3 שישמש להעלאת תמונות."
@@ -965,7 +972,7 @@ he:
     allow_all_attachments_for_group_messages: "אפשרו צירוף קבצים להודעות לקבוצות."
     convert_pasted_images_to_hq_jpg: "המירו תמונות מודבקות לקבצי JPG באיכות גבוהה."
     convert_pasted_images_quality: "איכות של קובץ ה JPG המומר (1 זו האיכות הנמוכה ביותר, 100 הטובה ביותר)."
-    enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) בפרסומים. אזהרה: עלול להביא לבעיות בטיחות באתר."
+    enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) ב Oneboxes. אזהרה: עלול להביא לבעיות אבטחה באתר."
     default_invitee_trust_level: "ברירת מחדל של רמת אמון (0-4) של משתמשים מוזמנים."
     default_trust_level: "רמת אמון (0-4) לכל המשתמשים החדשים. אזהרה! שינוי של משתנה זה שם אתכם בסיכון רציני לספאם."
     tl1_requires_topics_entered: "כמה נושאים משתמשים חדשים צריכים להתחיל עד שישודרגו לרמת אמון 1."
@@ -1001,30 +1008,30 @@ he:
     newuser_max_images: "כמה תמונות יכולים משתמשים להוסיף לפוסט."
     newuser_max_attachments: "כמה קבצים מצורפים יכולים משתמשים חדשים להוסיף לפוסט."
     newuser_max_mentions_per_post: "מספר מקסימלי של התראות @שם_משתמש בהן יכולים להשתמש משתמש/ת חדשים בפוסט."
-    newuser_max_replies_per_topic: "מספר התגובות המקסימלי שיכולים משתמש/ת חדשים לפרסם לנושא בודד לפני שיקבלו תגובה ממשתמשים אחרים."
+    newuser_max_replies_per_topic: "מספר התגובות המקסימלי שיכולים משתמשים חדשים לפרסם לנושא בודד לפני שיקבלו תגובה ממשתמשים אחרים."
     max_mentions_per_post: "מספר מקסימלי של התראות @שם_משתמש שיכול כל אחד/אחת להכליל בפוסט."
     max_users_notified_per_group_mention: "מספר מקסימלי של משתמשים שיכולים לקבל התראה אם מוזכרת קבוצה (אם מגיעים לסף זה לא תועלה התראה)"
     create_thumbnails: "יצירת תמונות מוקטנות והארת תמונות גדולות מידי מלהיכלל בפוסט."
-    email_time_window_mins: "המתינו (n) דקות לפני משלוח כל התראת מייל, כדי לאפשר למשתמשים הזדמנות לערוך ולוודא באופן סופי את הפרסומים שלהם."
+    email_time_window_mins: "המתינו (n) דקות לפני משלוח כל התראת מייל, כדי לאפשר למשתמשים הזדמנות לערוך ולוודא באופן סופי את הפוסטים שלהם."
     private_email_time_window_seconds: "המתינו (n) שניות לפני משלוח מיילים אישיים להתראה, על מנת לאפשר למשתמשים לערוך או לתקן את ההודעה."
     email_posts_context: "כמה תגובות קודמות יש לכלול כהקשר במיילים עם התראות."
     flush_timings_secs: "באיזו תדירות אנחנו מזרימים מידע לשרת, בשניות."
     title_max_word_length: "האורך המקסימלי המותר למילה בכותרת נושא, בתווים. "
     title_min_entropy: "האנטרופיה (תווים ייחודים שאינם בשפת הכתיבה) המינימלית הנדרשת בכותרת נושא."
-    body_min_entropy: "האנטרופיה (תוים ייחודיים שאינם בשפת הכתיבה) המינימלית הנדרשת בגוף המסמך."
+    body_min_entropy: "האנטרופיה (תוים ייחודיים, תווים שאינם באנגלית נחשבים יותר) המינימלית הנדרשת בגוף הפוסט."
     allow_uppercase_posts: "אפשרו אותיות אנגליות גדולות (Capitalized) בכותרת נושא או בגוף פוסט."
     title_fancy_entities: "המירו תווי ASCII ליישויות fancy HTML בכותרות נושאים, בסגנון SmartyPants http://daringfireball.net/projects/smartypants/"
     min_title_similar_length: "האורך המינימלי של כותרת לפני שהיא נבדקת עבור איתור נושאים דומים."
     min_body_similar_length: "האורך המינימלי של גוף הפוסט לפני שהוא ייבדק לאיתור נושאים דומים."
-    desktop_category_page_style: "סגנון ויזואלי לדף /קטגוריות."
-    category_colors: "רשימה של ערכי צבעים האקסדיצמלים מותרים לסימון קטגוריות."
+    desktop_category_page_style: "סגנון ויזואלי לדף /categories."
+    category_colors: "רשימה של ערכי צבעים הקסדצימליים מותרים לסימון קטגוריות."
     category_style: "סגנון ויזואלי עבור עיטורי קטגוריות."
-    max_image_size_kb: "גודל קובץ מקסימלי להעלאה בקילו-בייטים (kB). ערך זה חייב להיות מוגדרת גם ב-nginx (client_max_body_size) / apache או בפרוקסי."
-    max_attachment_size_kb: "הגודל המקסימלי בקילובייטים (kBs) של קבצים להעלאה. הגדרה זו חייבת להיות מוגדרת ב-nginx (client_max_body_size) / apache או בפרוקסי."
+    max_image_size_kb: "גודל קובץ מקסימלי להעלאה בקילו-בתים (kB). ערך זה חייב להיות מוגדר גם ב-nginx (client_max_body_size) / apache או בפרוקסי."
+    max_attachment_size_kb: "הגודל המקסימלי בקילו-בתים (kBs) של קבצים להעלאה. הגדרה זו חייבת להיות מוגדרת ב-nginx (client_max_body_size) / apache או בפרוקסי."
     authorized_extensions: "רשימה של סיומות מותרות להעלאה (השתמשו ב '*' כדי לאפשר את כל סוגי הקבצים)"
     max_similar_results: "כמה נושאים דומים להציג מעל לעורך כאשר מחברים נושא חדש. ההשוואה מבוססת על הכותרת וגוף הפוסט."
     title_prettify: "מניעת טעויות נפוצות בכותרת, בכללן טעויות עם אותיות גדולות באנגלית, מספר ! ו ?, נקודה מיותרת בסוף, וכד׳"
-    topic_views_heat_low: "לאחר כמות זו של צפיות,שדה הצפיות יהיה קצת יותר בהיר."
+    topic_views_heat_low: "לאחר כמות זו של צפיות, שדה הצפיות יהיה קצת יותר בהיר."
     topic_views_heat_medium: "לאחר כמות צפיות זו, שדה הצפיות יודגש באופן בינוני."
     topic_views_heat_high: "לאחר כמות צפיות זו, שדה הצפיות יודגש באופן בולט."
     cold_age_days_low: "לאחר מספר זה של ימי שיחה, תאריך הפעילות האחרונה מעט מוכהה."
@@ -1033,20 +1040,20 @@ he:
     history_hours_low: "פוסט שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת קלות."
     history_hours_medium: "פוסט שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת באופן בינוני."
     history_hours_high: "פוסט שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת באופן חזק."
-    topic_post_like_heat_low: "לאחר שהיחס בין לייקים למספר הפרסומים גבוהה מערך זה, שדה ספירת הפרסומים מודגש קלות."
-    topic_post_like_heat_medium: "לאחר שהיחס בין לייקים למספר הפרסומים גבוהה מערך זה, שדה ספירת הפרסומים מודגש באופן בינוני."
-    topic_post_like_heat_high: "לאחר שהיחס בין לייקים למספר הפרסומים גבוהה מערך זה, שדה ספירת הפרסומים מודגש באופן חזק."
+    topic_post_like_heat_low: "לאחר שהיחס בין לייקים למספר הפוסטים גבוה מערך זה, שדה ספירת הפוסטים מודגש קלות."
+    topic_post_like_heat_medium: "לאחר שהיחס בין לייקים למספר הפוסטים גבוה מערך זה, שדה ספירת הפוסטים מודגש באופן בינוני."
+    topic_post_like_heat_high: "לאחר שהיחס בין לייקים למספר הפוסטים גבוה מערך זה, שדה ספירת הפוסטים מודגש באופן חזק."
     faq_url: "אם יש לכם שאלות ותשובות נפוצות שמאורחות במקום אחר ואתם רוצים להשתמש בהן, ספקו את ה URL המלא כאן."
     tos_url: "אם יש לכם מסמך תנאי שימוש מאורח במקום אחר שהייתם רוצים להשתמש בו, ספקו את ה URL המלא כאן."
     privacy_policy_url: "אם יש לכם מסמך הצהרת פרטיות שמאוחסן במקום אחר ובו אתם מעוניינים להשתמש, ספקו URL מלא כאן."
     newuser_spam_host_threshold: "מספר הפעמים שמשתמשים חדשים יכולים לקשר לאותו מחשב במסגרת `newuser_spam_host_threshold` הפרסומים שלהם לפני שייחשבו ספאם."
-    white_listed_spam_host_domains: "רשימה של מתחמים (domain) שיוחרגו מבדיקת הספאם. משתמשים חדשים לעולם לא יוגבלו ביצירת פרסומים חדשים עם קישורים למתחמים אלו."
+    white_listed_spam_host_domains: "רשימה של מתחמים (domains) שיוחרגו מבדיקת הספאם. משתמשים חדשים לעולם לא יוגבלו ביצירת פוסטים חדשים עם קישורים למתחמים אלו."
     staff_like_weight: "כמה משקל עודף יש להעניק ללייקים של הצוות."
     topic_view_duration_hours: "ספרו צפיות חדשות בנושא פעם אחת לכל IP/משתמש לכל N שעות"
     user_profile_view_duration_hours: "ספרו צפיות בפרופיל משתמש פעם אחת לכל IP/משתמש בכל N שעות"
     levenshtein_distance_spammer_emails: "כאשר מתאימים דוא\"ל של ספאמרים, מספר ההבדלים בתווים שעדיין מאפשרים התאמה מטושטשת."
-    max_new_accounts_per_registration_ip: "אם ישנם כבר (n) חשבונות עם רמת אמון 0 מכתובת IP זו (ואף אחד מהם אינו חבר צוות, או בעל/ת רמת אמון 2 ומעלה), הפסיקו קצת הרשמות מכתובת IP זו."
-    min_ban_entries_for_roll_up: "בעת לחיצה על לחצן הגלילה למעלה, ייוצר איסור כניסת משנה (subnet ben entry) חדשה אם יש לפחות (N) ערכים."
+    max_new_accounts_per_registration_ip: "אם ישנם כבר (n) חשבונות עם רמת אמון 0 מכתובת IP זו (ואף אחד מהם אינו חבר צוות, או בעל/ת רמת אמון 2 ומעלה), הפסיקו קבלת הרשמות מכתובת IP זו."
+    min_ban_entries_for_roll_up: "בעת לחיצה על לחצן הגלילה למעלה, ייוצר איסור כניסת משנה (subnet ban entry) חדשה אם יש לפחות (N) ערכים."
     max_age_unmatched_emails: "מחק ערכי דוא\"ל לא תואמים שמוצגים לאחר (N) ימים."
     max_age_unmatched_ips: "מחק ערכי IP לא תואמים שמוצגים לאחר (N) ימים."
     num_flaggers_to_close_topic: "מספר מינימלי של דגלים שונים שנדרש כדי להשהות באופן אוטומטי אפשות להתערב בנושא"
@@ -1061,7 +1068,7 @@ he:
     alternative_reply_by_email_addresses: "רשימה של כמה תבניות לתגובות במייל באמצעות כתובות מייל נכנסות. למשל: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
     incoming_email_prefer_html: "השתמשו ב HTML במקום בטקסט בשביל מייל נכנס. עלול ליצור בעיות עיצוב לא-צפויות!"
     disable_emails: "מנעו מ-Discourse ממשלוח דוא\"ל כלשהו"
-    strip_images_from_short_emails: "הסרת תמונות מדוא\"ל בגודל של פחות מ-2800 בייטים"
+    strip_images_from_short_emails: "הסרת תמונות מדוא\"ל בגודל של פחות מ-2800 בתים"
     short_email_length: "אורכו של דוא\"ל קצר בבתים (Bytes)"
     display_name_on_email_from: "הצגת שמות מלאים בשדה ה״מאת״ במיילים"
     unsubscribe_via_email: "אפשרו למשתמשים לבטל מנוי אימייל באמצעות שליחת מייל עם המילה ״unsubscribe״ בנושא או גוף המייל"
@@ -1088,7 +1095,7 @@ he:
     pop3_polling_port: "החיבור (Port) ממנו יש למשוך נתונים מחשבון POP3."
     pop3_polling_host: "השרת המארח (Host) למשיכת דוא\"ל דרך POP3."
     pop3_polling_username: "שם המשתמש/ת לחשבון ה-POP3 לתשאול דוא\"ל."
-    pop3_polling_password: "הסיסא לחשבון ה-POP3 למשיכת הדוא\"ל."
+    pop3_polling_password: "הסיסמה לחשבון ה-POP3 למשיכת הדוא\"ל."
     log_mail_processing_failures: "רישום של כל בעיות העיבוד ל http://yoursitename.com/logs"
     email_in: "אפשרו למשתמשים לפרסם נושאים חדשים באמצעות דוא\"ל (דורש תשאול באמצעות pop3). הגדירו את הכתובת בלשונית \"הגדרות\" עבור כל קטגוריה."
     email_in_min_trust: "רמת האמון המינימלית הנדרשת למשתמשים כדי שיוכלו להעלות נושאים חדשים באמצעות הדוא\"ל."
@@ -1134,22 +1141,23 @@ he:
     topic_page_title_includes_category: "כותרת דף נושא כוללת את שם הקטגוריה."
     max_prints_per_hour_per_user: "מספר מקסימלי של צפיות בדף /print (הדפסה) (קיבעו ל 0 כדי לנטרל)"
     full_name_required: "שם מלא הוא שדה נדרש לפרופיל משתמש/ת."
-    enable_names: "הצגת השם המלא של המשתמש/ת בעמודי הפרופיל שלהם, בכרטיסי המשתמ ובדוא\"ל שלהם. נטרול הסתרת השם המלא בכל מקום."
-    display_name_on_posts: "הצגת שמם המלא של משתמשים בפרסומיהם, בנוסף ל@שם_המשתמש שלהם."
+    enable_names: "הצגת השם המלא של המשתמש/ת בעמודי הפרופיל שלהם, בכרטיסי המשתמש ובדוא\"ל שלהם. נטרלו להסתרת השם המלא בכל מקום."
+    display_name_on_posts: "הצגת שמם המלא של משתמשים בפוסטים שלהם, בנוסף ל@שם_המשתמש שלהם."
     show_time_gap_days: "אם שני פוסטים נוצרים מספר זה של ימים אחד מהשני, הציגו את מרווח הזמן בנושא."
-    invites_per_page: "ברירת המחדל, הזמנות המוצגות בעמוד המשתמש."
+    invites_per_page: "ברירת מחדל ההזמנות המוצגות בעמוד המשתמש."
     short_progress_text_threshold: "לאחר שמספר הפוסטים בנושא עוברים את המספר הזה, מד ההתקדמות יציג רק את המספר של הפוסט הנוכחי. אם תשנו את רוחב מד ההתקדמות, ייתכן שתצטרכו לשנות ערך זה."
     default_code_lang: "תחביר שפת תכנות שיסופק כברירת מחדל על קטעי קוד מגיטהאב (לאנג-אוטו, רובי, פיתון וכד׳)"
     warn_reviving_old_topic_age: "כאשר מישהם מתחילים להגיב לנושא שבו התגובה האחרונה היא בת יותר מכמה ימים, אזהרה תוצג. נטרלו באמצעות הזנה של 0."
     autohighlight_all_code: "לחייב שימוש בקוד הדגשה לכל קוד מעוצב מראש (preformatted code blocks) אפילו אם הם אינם מציינים את השפה."
     highlighted_languages: "כולל הדגשת כללי תחביר (syntax). (אזהרה: הכללת שפות רבות מידי עשויה להשפיע על הביצועים) ראו: https://highlightjs.org/static/demo/ להדגמה."
-    feed_polling_enabled: "הטמעה בלבד: האם לעמבד פידים של  RSS/ATOM כפרסומים."
+    feed_polling_enabled: "הטמעה בלבד: האם להטמיע פידים של RSS/ATOM כפוסטים."
     feed_polling_url: "הטמעה בלבד: URL של פיד RSS/ATOM להטמעה."
     embed_by_username: "שם המשתמש של המשתמש/ת שיוצר את הנושאים המוטמעים."
     embed_username_key_from_feed: "מפתח למשיכת שם המשתמש ב-discourse מהפיד."
     embed_title_scrubber: "ביטויים רגולריים כדי לנקות כותרות מוטמעות."
-    embed_truncate: "חיתוך הפרסומים המוטמעים."
-    embed_post_limit: "מספר מקסימלי של פרסומים להטמעה."
+    embed_truncate: "חיתוך הפוסטים המוטמעים."
+    allowed_href_schemes: "פרוטוקולים מותרים בלינקים בנוסף ל http ו https."
+    embed_post_limit: "מספר מקסימלי של פוסטים להטמעה."
     embed_username_required: "נדרש שם משתמש ליצירת הנושא."
     embed_whitelist_selector: "בוררי CSS לאלמנטים שיותר להטמיע."
     embed_blacklist_selector: "בוררי CSS לאלמנטים שיוסרו מן ההטמעות."
@@ -1163,7 +1171,7 @@ he:
     slug_generation_method: "בחרו צורת ייצור slug. צורה של 'encoded' תגרום למחרוזות עם קידוד אחוזים. 'none' ינטרל slug לחלוטין."
     enable_emoji: "אפשרו emoji"
     emoji_set: "איך אתם אוהבים את ה-emoji שלכם?"
-    enforce_square_emoji: "חובת מימדי ריבועיים בכל ה-emojis."
+    enforce_square_emoji: "חובת מימדים ריבועיים בכל ה-emojis."
     approve_post_count: "מספר הפוסטים ממשתמשים חדשים או בסיסיים שחייבים לאשר אותם"
     approve_unless_trust_level: "פוסטים של משתמשים מתחת לרמת אמון זו חייבים לעבור אישור"
     approve_new_topics_unless_trust_level: "נושאים חדשים עבור משתמשים מתחת לרמת אמון זו חייבים להיות מאושרים"
@@ -1172,7 +1180,7 @@ he:
     auto_close_topics_post_count: "מספר מקסימלי של פוסטים בנושא לפני שהוא נסגר אוטומטית (0 לניטרול)"
     code_formatting_style: "כפתור קוד בדפדפן יציע אוטומטית סגנון קידוד זה"
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
-    default_include_tl0_in_digests: "כללו פרסומים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
+    default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
     default_email_private_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל."
     default_email_direct: "שלח מייל כשמישהו מצטט/מגיב-ל/מזכיר או מזמין משתמש, בתור ברירת מחדל."
     default_email_mailing_list_mode: "שלח מייל עבור כל פוסט חדש בתור ברירת מחדל. "
@@ -1195,9 +1203,8 @@ he:
     default_categories_muted: "רשימת קטגוריות שמושתקות כברירת מחדל."
     max_user_api_reqs_per_day: "המספר המקסימלי של בקשות API של משתמש ליום"
     max_user_api_reqs_per_minute: "המספר המקסימלי של בקשות API של משתמש לדקה"
-    allow_read_user_api_keys: "אפשרו ייצור של מפתחות API של משתמש לקריאה בלבד"
-    allow_write_user_api_keys: "אפשרו ייצור של מפתחות API של משתמש לכתיבה"
-    allow_push_user_api_keys: "אפשרו ייצור של מפתחות API של משתמש לדחיפה"
+    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: "URL מורשה להפניה מחדש לאימות עבור מפתחות API של משתמש"
@@ -1241,7 +1248,7 @@ he:
       email_polling_disabled: "עליכם לאפשר ידני או תשאול POP3 לפני שתאפשרו מענה באמצעות מייל."
       user_locale_not_enabled: "לפני שתוכלו להפעיל אפשרות זאת, יש לאפשר \"הגדרות מקומיות מותאמות משתמש/ת\""
   search:
-    within_post: "#%{post_number} פרסומים של %{username}"
+    within_post: "#%{post_number} פוסטים של %{username}"
     types:
       category: 'קטגוריות'
       topic: 'תוצאות'
@@ -1292,10 +1299,10 @@ he:
       other: "נושא זה נסגר אוטומטית אחרי שהגיע למספר המקסימלי  של תגובות: %{count} ."
     autoclosed_enabled_days:
       one: "הנושא הזה ננעל אוטומטית לאחר יום אחד. תגובות חדשות לא מתקבלות."
-      other: "נושא זה נסגר באופן אוטומטי לאחר %{count}. לא ניתן להוסיף תגובות חדשות."
+      other: "נושא זה נסגר באופן אוטומטי לאחר %{count} ימים. לא ניתן להוסיף תגובות חדשות."
     autoclosed_enabled_hours:
       one: "נושא זה ננעל לאחר שעה אחת. לא ניתן להוסיף תגובות חדשות."
-      other: "נושא זה נסגר אוטומטית לאחר %{count}. לא ניתן להוסיף תגובות חדשות."
+      other: "נושא זה נסגר אוטומטית לאחר %{count} שעות. לא ניתן להוסיף תגובות חדשות."
     autoclosed_enabled_minutes:
       one: "הנושא הזה ננעל אוטומטית לאחר דקה. תגובות חדשות לא מתקבלות."
       other: "הנושא הזה נסגר אוטומטית לאחר %{count} דקות. תגובות חדשות לא מתקבלות."
@@ -1390,7 +1397,7 @@ he:
 
       > %{site_title} -- %{site_description}
 
-      אם את/ה מעוניינים להצטרף לדיון, הקישו על הקישור הבא:
+      אם אתם מעוניינים להצטרף לדיון, הקישו על הקישור הבא:
 
       %{invite_link}
 
@@ -1419,13 +1426,13 @@ he:
   invite_forum_mailer:
     subject_template: "%{invitee_name} הזמינ/ה אתכם להצטרף ל%{site_domain_name}"
     text_body_template: |
-      %{invitee_name} הזמי/ה אותך להצטרף ל
+      %{invitee_name} הזמין/ה אתכם להצטרף ל
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      אם את/ה מעוניינ/ת, לחצו על הקישור הבא:
+      אם אתם מעוניינים, לחצו על הקישור הבא:
 
       %{invite_link}
 
@@ -1740,7 +1747,7 @@ he:
 
         רישום המערכת:
 
-        Here's the log:
+        הנה היומן:
         ```
 
         %{logs}
@@ -1875,7 +1882,7 @@ he:
       text_body_template: |
         אנחנו מצטערים, אבל משהו לא עבד עם הודעת הדוא"ל שלך, שנשלחה אל %{destination} (titled %{former_title}).
 
-        המייל ששלחת סומן כ"נכתב אוטומטית", מה שאומר שהוא נכתב על ידי מחשב ולא הוקלד על ידי אדם; איננו יכולים לקבל מיילים שכאלה. אם את/ה מאמינים שזוהי תקלה, אנא צרו קשר עם איש/אשת צוות.
+        המייל ששלחת סומן כ"נכתב אוטומטית", מה שאומר שהוא נכתב על ידי מחשב ולא הוקלד על ידי אדם; איננו יכולים לקבל מיילים שכאלה. אם אתם מאמינים שזוהי תקלה, אנא צרו קשר עם איש/אשת צוות.
     email_error_notification:
       subject_template: "[%{site_name}]  בעיית מייל -- בעיית אימות POP"
       text_body_template: |
@@ -2277,6 +2284,7 @@ he:
     message_to_blank: "message.to ריק"
     text_part_body_blank: "text_part.body ריק"
     body_blank: "גוף ריק"
+    no_echo_mailing_list_mode: "התראות רשימת תפוצה ינוטרלו עבור הפוסטים של המשתמש עצמו"
   color_schemes:
     base_theme_name: "בסיס"
   about: "אודות"
@@ -2847,6 +2855,19 @@ he:
     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>"
   wizard:
     title: "הקמת Discourse"
     step:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 16dde290fb..9d657ba886 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -111,6 +111,7 @@ it:
     operation_already_running: "Una operazione è in esecuzione. Non è possibile avviarne una nuova adesso."
     backup_file_should_be_tar_gz: "Il file di backup deve essere un archivio .tar.gz"
     not_enough_space_on_disk: "Non c'è abbastanza spazio su disco per caricare questo backup."
+    invalid_filename: "Il nome del file di backup contiene caratteri non validi. I caratteri validi sono a-z 0-9 . - _."
   not_logged_in: "Devi essere connesso per farlo."
   not_found: "L'URL o la risorsa richiesta non sono stati trovati."
   invalid_access: "Non hai il permesso di vedere la risorsa richiesta."
@@ -298,6 +299,10 @@ it:
         post_reply:
           base:
             different_topic: "Il messaggio e la risposta devono appartenere allo stesso argomento."
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "La URL non è valida. La URL dovrebbe iniziare per http:// o https:// e nessuno spazio non è ammesso. "
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>il campo \"Su di me\" del tuo profilo è vuoto, <a href='/users/%{username_lower}/preferences/about-me'>vuoi compilarlo?</a></div>"
@@ -706,7 +711,6 @@ it:
     s3_backup_config_warning: 'Il server è configurato per caricare i backup su S3, ma almeno una delle seguenti impostazioni non è impostata: s3_access_key_id, s3_secret_access_key, s3_backup_bucket. Vai nelle <a href="/admin/site_settings">Impostazioni Sito</a> e aggiorna le impostazioni. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Leggi anche "How to set up image uploads to S3?" per saperne di più</a>.'
     image_magick_warning: 'Il server è configurato per creare miniature di immagini grandi, ma ImageMagick non è installato. Installa ImageMagick usando il tuo package manager preferito o <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">scarica la versione più recente</a>.'
     failing_emails_warning: 'Ci sono %{num_failed_jobs} job di email falliti. Controlla il file app.yml e assicurati che le impostazioni del mail server siano corrette. <a href="/sidekiq/retries" target="_blank">Vedi i job falliti in Sidekiq</a>.'
-    consumer_email_warning: "Il tuo sito è configurato per usare Gmail (o un altro servizio email consumer) per inviare le email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limita il numero di email che puoi inviare</a>. Considera l'utilizzo di un fornitore di servizi come mandrill.com per assicurare l'invio delle email."
     subfolder_ends_in_slash: "L'impostazione della sottocartella è errata; DISCOURSE_RELATIVE_URL_ROOT finisce con uno slash."
   site_settings:
     censored_words: "Parole che saranno automaticamente sostituite con &#9632;&#9632;&#9632;&#9632;"
@@ -749,7 +753,6 @@ it:
     exclude_rel_nofollow_domains: "Una lista di domini a cui non aggiungere \"nofollow\" ai collegamenti. Inoltre tld.com autorizzerà automaticamente sub.tld.com. Dovresti perlomeno aggiungere il dominio di primo livello di questo sito, per aiutare i motori di ricerca a trovare tutto il contenuto. Se parti del tuo sito si trovano su altri domini, aggiungi anche quelli."
     post_excerpt_maxlength: "Lunghezza massima dell'estratto / riassunto di un messaggio."
     post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox."
-    onebox_domains_whitelist: "Lista di domini per i quali consentire la funzione di onebox; questi domini devono supportare OpenGraph o oEmbed. Testali su http://iframely.com/debug"
     logo_url: "L'immagine nel logo in alto a sinistra del sito, dovrebbe essere larga e di forma rettangolare. Se non impostata, verrà usato il testo del titolo del sito."
     logo_small_url: "Il piccolo logo in alto a sinistra del tuo sito, dovrebbe essere a forma di quadrato. Se non impostato, verrà mostrata l'icona di una casa."
     apple_touch_icon_url: "Icona usata per dispositivi touch Apple. La dimensione consigliata è 144 x 144 pixel."
@@ -802,7 +805,7 @@ it:
     enable_badges: "Attiva il sistema a distintivi"
     allow_index_in_robots_txt: "Specifica nel file robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca."
     email_domains_blacklist: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com/trashmail.net"
-    forgot_password_strict: "Non informare gli utenti dell'esistenza dell'account quando richiamano la finestra per la password dimenticata."
+    forgot_password_strict: "Non informare gli utenti dell'esistenza o meno dell'account quando richiamano la funzione per la password dimenticata."
     log_out_strict: "Quando ci si disconnette, esci da TUTTE le sessioni dell'utente su tutti i dispositivi"
     version_checks: "Verifica su Discourse Hub l'esistenza di aggiornamenti e mostra i messaggi per le nuove versioni nel cruscotto /admin"
     new_version_emails: "Invia un'email all'indirizzo contact_email quando è disponibile una nuova versione di Discourse."
@@ -1170,8 +1173,24 @@ it:
       subject_template: "Backup fallito"
     restore_succeeded:
       subject_template: "Il ripristino è avvenuto con successo."
+      text_body_template: |
+        Il ripristino è avvenuto con successo.
+
+        Ecco il rapporto:
+
+        ```text
+        %{logs}
+        ```
     restore_failed:
       subject_template: "Ripristino fallito"
+      text_body_template: |
+        Il ripristino è fallito.
+
+        Ecco il rapporto:
+
+        ```text
+        %{logs}
+        ```
     bulk_invite_succeeded:
       subject_template: "Invito di massa processato con successo"
       text_body_template: "Il tuo file con l'invito di massa è stato processato, %{sent} inviti spediti."
@@ -1181,8 +1200,24 @@ it:
       subject_template: "Esportazione dati completa"
     csv_export_failed:
       subject_template: "Esportazione dati fallita"
+    email_reject_insufficient_trust_level:
+      subject_template: "[%{site_name}] Problema email -- Livello Esperienza Insufficiente"
+    email_reject_screened_email:
+      subject_template: "[%{site_name}] Problema email -- Email Bloccata"
+      text_body_template: |
+        Spiacenti, il tuo messaggio email a %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        La tua risposta è stata inviata da un indirizzo email bloccato. Prova a spedire da un altro indirizzo email, oppure contatta un membro dello staff.
+    email_reject_inactive_user:
+      subject_template: "[%{site_name}] Problema email -- Utente Inattivo"
+    email_reject_blocked_user:
+      subject_template: "[%{site_name}] Problema email -- Utente Bloccato"
     email_reject_no_account:
       subject_template: "[%{site_name}] Problema relativo all'email -- Account Sconosciuto"
+      text_body_template: |
+        Ci dispiace, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Non esiste un account con quell'indirizzo email. Prova ad inviarla a un altro indirizzo o contatta un membro dello staff.
     email_reject_empty:
       subject_template: "[%{site_name}] Problema relativo all'email -- Nessun Contenuto"
     email_reject_invalid_access:
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 04cca44dab..628d501025 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -567,7 +567,6 @@ ja:
     s3_config_warning: 'サーバが S3 にファイルをアップロードするように設定されていますが、次のうち少なくとも1つが設定されていません: s3_access_key_id, s3_secret_access_key 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">詳しくは "How to set up image uploads to S3?" を参考にしてください</a>。'
     s3_backup_config_warning: 'サーバが S3 にバックアップをアップロードするように設定されていますが、次のうち少なくとも1つが設定されていません: s3_access_key_id, s3_secret_access_key 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">詳しくは "How to set up image uploads to S3?" を参考にしてください</a>'
     image_magick_warning: 'サーバが大きな画像のサムネイルを作成する設定になっていますが、ImageMagick がインストールされていません。お好きなパッケージマネージャを使って ImageMagick をインストールするか、<a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">最新のリリースをダウンロードしてください</a>。'
-    consumer_email_warning: "サイトはメール送信に Gmail (または他のカスタムメールサービス) を利用するように設定されています。<a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail で送信可能なメール数には制限があります</a>。メールを確実に送信するために mandrill.com などのメールサービスプロバイダーの利用を検討してください。"
   site_settings:
     censored_words: "自動的に &#9632;&#9632;&#9632;&#9632; で置換されます"
     delete_old_hidden_posts: "30日以上非表示になっている投稿を自動で削除します"
@@ -607,7 +606,6 @@ ja:
     exclude_rel_nofollow_domains: "nofollowを付与すべきではないドメインのリスト。tld.comは、sub.tld.com も許可します。最低でもクローラーが全てのコンテンツを見つけるために、このサイトのトップレベルドメインを追加する必要があります。このサイトの他の部分が別ドメインに存在している場合、それも追加します"
     post_excerpt_maxlength: "投稿の引用/サマリの最大文字数"
     post_onebox_maxlength: "Discourse OneBox投稿の最大文字数"
-    onebox_domains_whitelist: "OneBoxを許可するドメインのリスト。これらのドメインはOpenGraphかoEmbedをサポートしている必要があります。http://iframely.com/debug でテストできます"
     logo_url: "サイトの左上に表示されるロゴ画像です。横幅の大きい長方形にする必要があります。空欄の場合、サイトタイトルが表示されます"
     logo_small_url: "サイトの左上に表示される小さいロゴ画像です。正方形である必要があります。下にスクロールすると表示されます。空欄の場合、ホームアイコンが表示されます"
     mobile_logo_url: "モバイルサイトの左上に固定で表示されるロゴ画像です。正方形である必要があります。空欄の場合 `logo_url` が利用されます 例: http://example.com/uploads/default/logo.png"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 3fa5e2e8f4..19cad3caae 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -570,7 +570,6 @@ ko:
     s3_config_warning: '파일을 Amazon S3로 업로드 하도록 설정하였습니다. 하지만 아직 Access key id(s3_access_key_id), Secret access key(s3_secret_access_key) 혹은 S3 bucket(s3_upload_bucketat) 중 하나를 설정하지 않았습니다. <a href="/admin/site_settings">사이트 세팅</a>에서 설정해주세요. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">자세히 알아보기("How to set up image uploads to S3?")</a>.'
     s3_backup_config_warning: 's3를 이용한 서버 설정이 완료 되지 않았습니다: s3_access_key_id, s3_secret_access_key, s3_secret_access_key 또는 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">"How to set up image uploads to S3?" 읽어 보세요.</a>'
     image_magick_warning: '큰 이미지의 섬네일 만드는 설정이 있지만, ImageMagick가 설치되지 않았습니다. <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">최신버전 받기</a>.'
-    consumer_email_warning: "이메일 전송을 위해 Gmail(또는 다른 커스텀 이메일 서비스)을 사용하고 있습니다. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail의 이메일 전송 제한</a> 을 읽어보세요. mandrill.com을 이메일 서비스로 설정하는 것을 고려해보세요."
   site_settings:
     censored_words: "단어는 자동적으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체 됩니다."
     delete_old_hidden_posts: "30일이 지난 숨겨진 글은 자동으로 삭제됩니다."
@@ -610,7 +609,6 @@ ko:
     exclude_rel_nofollow_domains: "nofollow 도메인 리스트에 넣으면 링크에 추가가 안됩니다. tld.com은 자동으로 sub.tld.com도 포함합니다. 최소한, 이 사이트의 top-level 도메인은 허가해서 웹크롤러가 모든 자료를 검색할 수 있게 해야합니다. 다른 도메인으로도 이 사이트가 들어가진다면 그것도 추가해야 합니다."
     post_excerpt_maxlength: "글 인용에 허용되는 최대 글자수"
     post_onebox_maxlength: "onebox가 적용된 Discourse 글에 허용되는 최대 글자수"
-    onebox_domains_whitelist: "onebox 사용을 허가할 도메일 리스트; 이 도메인은 OpenGraph나 oEmbed를 지원하여야합니다. 테스트: http://iframely.com/debug"
     logo_url: "좌측 상단의 로고이미지는 직사각형 모양이어야 합니다. 설정하지 않을 경우 사이트 이름이 출력됩니다."
     apple_touch_icon_url: "애플 디바이스는 144px의 아이콘을 사용함. 144px X 144px 사이즈를 추천함"
     notification_email: "The from: 이 이메일 주소는 모든 기본 시스템 메일을 보내는데 사용됩니다. 여기에 명시된 도메인은 SPF, DKIM가 적용되어 있어야하며, reverse PTR 레코드가 제대로 설정되어 있어야 메일이 도착 할 수 있습니다."
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 89490fd159..c97670c01d 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -18,6 +18,9 @@ nb_NO:
   log_in: "Logg inn"
   disable_remote_images_download_reason: "Nedlasting av bilder ble deaktivert grunnet mangel på tilgjengelig diskplass."
   anonymous: "Anonym"
+  emails:
+    incoming:
+      default_subject: "Innkommende epost fra %{email}"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -66,6 +69,7 @@ nb_NO:
       load_from_remote: "Det oppstod et problem med innlastingen av innlegget."
     site_settings:
       min_username_length_range: "Du kan ikke sette minimum høyere enn maksimum."
+      default_categories_already_selected: "Du kan ikke velge en annen kategori brukt i en annen liste."
   bulk_invite:
     file_should_be_csv: "Den opplastede filen må være i .csv eller .txt format."
   backup:
@@ -93,6 +97,14 @@ nb_NO:
     replies:
       one: "1 svar"
       other: "%{count} svar"
+  no_images_allowed: "Beklager, nye brukere kan ikke legge til bilder i et innlegg."
+  too_many_images:
+    one: "Beklager, nye brukere kan bare legge til ett bilde i et innlegg."
+    other: "Beklager, nye brukere kan bare legge til %{count} bilder i et innlegg."
+  no_attachments_allowed: "Beklager, nye brukere kan ikke laste opp vedlegg til et innlegg."
+  too_many_attachments:
+    one: "Beklager, nye brukere kan bare laste opp ett vedlegg til et innlegg."
+    other: "Beklager, nye brukere kan bare laste opp %{count} vedlegg til et innlegg."
   spamming_host: "Beklager, du kan ikke lenke til det domenet."
   user_is_suspended: "Utviste brukere kan ikke skrive innlegg."
   topic_not_found: "Noe gikk galt. Kanskje emnet har blitt lukket eller slettet samtidig som du har sett på det?"
@@ -114,6 +126,7 @@ nb_NO:
   rss_description:
     latest: "Siste emner"
     hot: "Populære emner"
+    top: "Mest Populære Emner"
     posts: "Nyeste innnlegg"
   too_late_to_edit: "Det innlegget ble laget for lenge siden. Det kan ikke lenger bli redigert eller slettet."
   excerpt_image: "bilde"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index af31c081c2..64b42ef6b4 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -697,7 +697,6 @@ nl:
     s3_backup_config_warning: 'De server is geconfigureerd om backups naar s3 toe te staan, maar op zijn minst een van de volgende instellingen is niet ingesteld: s3_access_key_id, s3_secret_access_key of s3_backup_bucket. Ga naar <a href="/admin/site_settings">de Site Instellingen</a> en stel deze in. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Bekijk "How to set up image uploads to S3?" voor meer informatie</a>.'
     image_magick_warning: 'De server is geconfigureerd om thumbnails te maken van grote afbeeldingen, maar ImageMagick is niet geïnstalleerd. Installeer ImageMagick met je favoriete package manager of <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download de laatste release</a>.'
     failing_emails_warning: 'Er zijn %{num_failed_jobs} e-mail jobs mislukt. Controleer in app.yml of de e-mailserver instelling correct zijn. <a href="/sidekiq/retries" target="_blank">Toon de mislukte jobs in Sidekiq</a>.'
-    consumer_email_warning: "Je site is ingesteld om Gmail te gebruiken voor het versturen van mails. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail heeft limieten voor het aantal mails dat je kan versturen</a>. Overweeg om een andere e-mailprovider te gebruiken om er zeker van te zijn dat mails aankomen."
     subfolder_ends_in_slash: "Je submap setup is onjuist; de DISCOURSE_RELATIVE_URL_ROOT eindigt in een schuine streep."
   site_settings:
     censored_words: "Woorden welke automatisch vervangen zullen worden met &#9632;&#9632;&#9632;&#9632;"
@@ -739,7 +738,6 @@ nl:
     exclude_rel_nofollow_domains: "Een lijst van domeinen waar ´nofollow´ niet aan de links moet worden toegevoegd. (voorbeelddomein.com staat automatisch sub.voorbeelddomein toe). Voeg minimaal het 'top-level' domein van deze site toe om web crawlers alle content te laten vinden. Als delen van deze site zich op andere domeinen bevinden, voeg deze eveneens toe."
     post_excerpt_maxlength: "Maximale lengte van een uittreksel / samenvatting van een bericht."
     post_onebox_maxlength: "Maximale lengte van een 'oneboxed Discourse' bericht in tekens."
-    onebox_domains_whitelist: "Een lijst met domeinen waarvoor oneboxing is toegestaan; deze domeinen moeten OpenGraph of oEmbed ondersteunen. Dit kun je testen op http://iframely.com/debug"
     logo_url: "De logo afbeelding links bovenaan je site moet de vorm hebben van een brede rechthoek. Indien leeg wordt de site titeltekst getoond."
     logo_small_url: "De kleine logo afbeelding links boven aan je site moet de vorm van een vierkant hebben en wordt getoond als naar beneden wordt gescrold. Indien leeg wordt een homepage symbool getoond."
     favicon_url: "Een favicon voor je site, zie http://nl.wikipedia.org/wiki/Favicon. Voor een correcte werking via CDN moet het een png zijn."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index f3312d3144..545635ae09 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -699,7 +699,6 @@ pl_PL:
     s3_config_warning: 'Serwer jest skonfigurowany by przesyłać pliki na s3, ale przynajmniej jedno z następujących ustawień nie jest ustawione: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Przejdź do <a href="/admin/site_settings">ustawień serwisu</a> i zmień ustawienia. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Zobacz ten poradnik by dowiedzieć się więcej</a>.'
     s3_backup_config_warning: 'Serwer jest skonfigurowany tak, aby wysyłać kopie zapasowe do s3, ale jedno z ustawień nie jest ustawione prawidłowo: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Idź do <a href="/admin/site_settings"> ustawień strony </a> i zaktualizuj ustawienia. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank"> Zobacz Jak ustawić wysyłanie zdjęć do S3 </a>.'
     image_magick_warning: 'Serwer jest skonfigurowany by tworzyć miniaturki dużych obrazów, ale ImageMagick nie jest zainstalowany. Zainstaluj ImageMagick za pomocą ulubionego menedżera pakietów lub <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">pobierz najnowszą wersję</a>.'
-    consumer_email_warning: "Twój serwis jest skonfigurowany by używać Gmaila (lub innego konsumenckiego serwisu poczty) do wysyłania emaili. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail ogranicza jak dużo wiadomości możesz wysłać</a>. Rozważ wykorzystanie dostawcy serwisu pocztowego jak mandrill.com by zagwarantować dostarczanie poczty."
   site_settings:
     censored_words: "Wskazane słowa będą automatycznie zamieniane na  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatycznie kasuj wpisy ukryte dłużej niż 30 dni."
@@ -738,7 +737,6 @@ pl_PL:
     fixed_category_positions_on_create: "Jeżeli jest sprawdzone to porządkowanie kategorii będzie zależało od stworzonego tematu (requires fixed_category_positions). "
     post_excerpt_maxlength: "Maksymalna długość podsumowania / streszczenia wpisu."
     post_onebox_maxlength: "Maksymalna długość (ilość znaków) treści wpisu osadzonego via Onebox"
-    onebox_domains_whitelist: "Lista domen dla których włączony jest oneboxing; te domeny powinny wspierać OpenGraph lub oEmbed. Można to sprawdzić na  http://iframely.com/debug"
     logo_url: "Zdjęcie logo w lewym górnym rogu twojej strony powinno mieć kształt szerokiego prostokąta. Jeśli zostawisz miejsce puste, wyświetlany będzie tytuł strony."
     apple_touch_icon_url: "Ikona używana przez urządzenia Apple. Rekomendowany wymiar to 144px na 144px."
     notification_email: "Adres z którego wysyłane będą wszystkie istotne emaile systemowe.\nKonieczna jest poprawna konfiguracja rekordów SPF, DKIM oraz zwrotnego PTR użytej domeny."
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 4c5b340fb8..ecbe743145 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -7,8 +7,8 @@
 
 pt:
   dates:
-    short_date_no_year: "DD MMM"
-    short_date: "DD MMM, YYYY"
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
     long_date: "DD de MMMM de YYYY hh:mm"
   datetime_formats: &datetime_formats
     formats:
@@ -36,21 +36,22 @@ pt:
     incoming:
       default_subject: "Email recebido de %{email}"
       show_trimmed_content: "Mostrar conteúdo aparado"
+      maximum_staged_user_per_email_reached: "Foi atingido o número máximo de utilizadores temporários por email."
       errors:
-        empty_email_error: "Acontece quando, a informação não processada, do email recebido veio em branco."
+        empty_email_error: "Acontece quando a informação não processada do email recebido veio em branco."
         no_message_id_error: "Acontece quando o email recebido não tem 'Message-Id' no cabeçalho da mensagem."
         auto_generated_email_error: "Acontece quando o cabeçalho 'precedence' é definida como: 'list', 'junk' ou 'auto_reply', ou quando algum cabeçalho contém: 'auto-submitted', 'auto-replied' ou 'auto-generated'."
-        no_body_detected_error: "Acontece quando não se consegue obter um corpo de mensagem e não existem anexos."
+        no_body_detected_error: "Acontece quando conseguimos obter um corpo de mensagem e não existem anexos."
         inactive_user_error: "Acontece quando o remetente não está activo."
         blocked_user_error: "Acontece quando o remetente está bloqueado."
         bad_destination_address: "Acontece quando nenhum dos endereços de email nos campos para/cc/bcc coincide com um endereço de email configurado."
-        strangers_not_allowed_error: "Acontece quando um utilizador tenta criar um tópico numa categoria em que não é membro."
+        strangers_not_allowed_error: "Acontece quando um utilizador tenta criar um tópico numa categoria da qual não é membro."
         insufficient_trust_level_error: "Acontece quando um utilizador tentar criar um tópico numa categoria para a qual não tem o nível de confiança necessário."
         reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de email diferente do destinatário da notificação."
         topic_not_found_error: "Acontece quando a resposta veio de um tópico relacionado mas o tópico relacionado foi apagado."
         topic_closed_error: "Acontece quando uma resposta chegou mas o tópico relacionado foi fechado."
         bounced_email_error: "O email é um relatório devolvido."
-        screened_email_error: "Acontece quando a morada de email da pessoa que enviou já foi confirmada."
+        screened_email_error: "Acontece quando a morada de email da pessoa que o enviou já foi confirmada."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -178,17 +179,17 @@ pt:
     private_posts: "Últimas mensagens privadas"
     group_posts: "Últimas mensagens em %{group_name}"
     group_mentions: "Últimas menções em %{group_name}"
-    user_posts: "Mensagens mais recentes criados por @%{username}"
+    user_posts: "Mensagens mais recentes criadas por @%{username}"
     user_topics: "Tópicos mais recentes criados por @%{username}"
     tag: "Tópicos etiquetados"
   too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada."
-  revert_version_same: "A versão atual é o mesma versão para a qual você está tentando reverter."
+  revert_version_same: "A versão actual é o mesma versão para a qual está tentando reverter."
   excerpt_image: "imagem"
   queue:
     delete_reason: "Eliminado através da fila de moderação de mensagens"
   groups:
     errors:
-      can_not_modify_automatic: "Não pode modificar um grupo automatico"
+      can_not_modify_automatic: "Não pode modificar um grupo automático"
       member_already_exist: "'%{username}' já é membro deste grupo."
       invalid_domain: "'%{domain}' não é um domínio válido."
       invalid_incoming_email: "'%{email}' não é um endereço de email válido."
@@ -369,13 +370,13 @@ pt:
       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 mensagens demasiado rápido. Por favor espere %{time_left} antes de tentar novamente."
+      delete_post: "Está a apagar mensagens 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."
       edit_post: "Atingiu o número máximo de edições de hoje. Por favor espere %{time_left} antes de tentar novamente."
-      live_post_counts: "Está a pedir por contagens de mensagens em tempo real demasiadamente depressa. Por favor espere %{time_left} antes de tentar outra vez."
+      live_post_counts: "Está a pedir por contagens de mensagens 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:
@@ -473,10 +474,10 @@ pt:
     please_continue: "Continuar para %{site_name}"
     error: "Ocorreu um erro ao alterar o seu endereço de email. Talvez o endereço já esteja a ser utilizado?"
     error_staged: "Ocorreu um erro ao alterar o seu endereço de email. O endereço de email já está a ser utilizado por um utilizador temporário."
-    already_done: "Pedimos desculpa, esta hiperligação de confirmação já não é valida. Talvez o seu email já foi alterado?"
+    already_done: "Pedimos desculpa, mas esta hiperligação de confirmação já não é valida. Talvez o seu email já tenha sido alterado?"
     authorizing_old:
-      title: "Obrigado por confirmar o seu endereço de email atual."
-      description: "Estamos a enviar um email, para o seu novo endereço de email, para confirmação."
+      title: "Obrigado por confirmar o seu endereço de email actual."
+      description: "Estamos a enviar um email para o seu novo endereço de email, para confirmação."
   activation:
     action: "Clique aqui para ativar a sua conta"
     already_done: "Pedimos desculpa, esta hiperligação de confirmação já não está válida. Talvez a sua conta já esteja ativa?"
@@ -484,7 +485,7 @@ pt:
     continue_button: "Continuar para %{site_name}"
     welcome_to: "Bem-vindo a %{site_name}!"
     approval_required: "Um moderador tem que aprovar a sua conta antes de poder aceder a este fórum. Irá receber um email quando a sua conta for aprovada!"
-    missing_session: "Não conseguimos detectar se a sua conta foi criada, pelo que pedimos que confirme que tem os cookies possibilitados."
+    missing_session: "Não conseguimos detectar se a sua conta foi criada, pelo que pedimos que confirme que tem os cookies permitidos."
   post_action_types:
     off_topic:
       title: 'Fora de Contexto'
@@ -556,7 +557,7 @@ pt:
   unsubscribe:
     title: "Cancelar subscrição"
     mute_topic: "Silenciar todas as notificações para este tópico, %{link}"
-    unwatch_category: "Parar de seguir todos os tópicos em %{category}"
+    unwatch_category: "Deixar de seguir todos os tópicos em %{category}"
     mailing_list_mode: "Desligar modo de lista de distribuição"
     disable_digest_emails: "Parar envio de emails de resumo"
     log_out: "Sair"
@@ -715,13 +716,12 @@ pt:
     s3_backup_config_warning: 'O servidor está configurado para carregar cópias de segurança para s3, mas pelo menos uma das seguintes configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_backup_bucket. Vá <a href="/admin/site_settings">às Configurações do Sítio</a> e atualize as definições. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank"> Veja "How to set up image uploads to S3?" para saber mais</a>.'
     image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick usando o seu gestor de pacotes preferido ou aceda a <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">para descarregar a última versão</a>.'
     failing_emails_warning: 'Há %{num_failed_jobs} tarefas de email que falharam. Verifique o seu app.yml e assegure-se que as configurações do servidor de email estão corretas. <a href="/sidekiq/retries" target="_blank"> Veja as tarefas que falharam no Sidekiq</a>.'
-    consumer_email_warning: "O seu sítio está configurado para usar Gmail (ou outro serviço de email)<a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>O Gmail limita a quantidade de emails que pode enviar</a>. Considere usar um serviço de envio de emails como mandrill.com para assegurar a entregabilidade dos emails enviados."
     subfolder_ends_in_slash: "A configuração da sua sub-página está incorreta; o DISCOURSE_RELATIVE_URL_ROOT termina com um traço."
     email_polling_errored_recently:
       one: "A consulta automática de emails gerou um erro nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes."
       other: "A consulta automática de emails gerou %{count} erros nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes."
-    bad_favicon_url: "Não estamos a conseguir carregar o favicon. Pot favor, confirme a sua configuração favicon_url nas  <a href='/admin/site_settings'>Configurações do sítio</a>."
-    poll_pop3_timeout: "A tentativa de ligação ao servidor POP3 está a ultrapassar o tempo máximo. Email de caixa de entrada não pôde ser obtido. Por favor verifique a sua <a href='/admin/site_settings/category/email'>configuração de POP3</a> e fornecedor de serviço internet."
+    bad_favicon_url: "Não estamos a conseguir carregar o favicon. Por favor, confirme a sua configuração favicon_url nas  <a href='/admin/site_settings'>Configurações do sítio</a>."
+    poll_pop3_timeout: "A tentativa de ligação ao servidor POP3 está a ultrapassar o tempo máximo. O email da caixa de entrada não pôde ser obtido. Por favor verifique a sua <a href='/admin/site_settings/category/email'>configuração de POP3</a> e fornecedor de serviço internet."
     poll_pop3_auth_error: "A tentativa de ligação ao servidor POP3 está a falhar por motivos de erro de autenticação. Por favor verifique a sua <a href='/admin/site_settings/category/email'>configuração de POP3</a>."
   site_settings:
     censored_words: "Palavras que serão automaticamente substituídas por &#9632;&#9632;&#9632;&#9632;"
@@ -765,7 +765,6 @@ pt:
     exclude_rel_nofollow_domains: "Uma lista de domínios em que nofollow não deve ser adicionado a linkls.tld.com irá permitir automaticamente sub.tld.com. Como mínimo, deve adicionar o domínio de alto nível deste sítio para ajudar os rastreadores da internet a encontrarem todo o conteúdo. Se outras partes do seu sítio estão em outros domínicios, adicione-os também."
     post_excerpt_maxlength: "Tamanho máximo do excerto/sumário de uma mensagem."
     post_onebox_maxlength: "Tamanho máximo de uma mensagem Discourse de caixa única, em caracteres."
-    onebox_domains_whitelist: "Lista de domínios que permitem colocar em caixa única; estes domínios devem suportar OpenGraph ou oEmbed. Teste-os em http://iframely.com/debug"
     logo_url: "A imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma retangular. Quando deixada em branco, o texto do título do sítio será exibido."
     logo_small_url: "A pequena imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma quadrada, visível quando arrastado para baixo. Quando deixado em branco, um glifo de início será exibido."
     favicon_url: "Um favicon para o seu sítio, veja http://en.wikipedia.org/wiki/Favicon, para trabalhar corretamente sobre um CDN deve ser um png"
@@ -862,7 +861,7 @@ pt:
     enable_twitter_logins: "Ativar autenticação pelo Twitter, requer twitter_consumer_key e twitter_consumer_secret"
     twitter_consumer_key: "Chave de consumidor para autenticação pelo Twitter, registada em http://dev.twitter.com"
     twitter_consumer_secret: "Chave do Consumidor para a autenticação pelo Twitter, registada em http://dev.twitter.com"
-    enable_instagram_logins: "Ativar autenticação pelo Instagram, requer instagram_consumer_key e instagram_consumer_secret"
+    enable_instagram_logins: "Activar autenticação pelo Instagram, requer instagram_consumer_key e instagram_consumer_secret"
     instagram_consumer_key: "Chave de cliente para a autenticação via Instagram"
     instagram_consumer_secret: "Segredo de cliente para a autenticação via Instagram"
     enable_facebook_logins: "Ativar autenticação pelo Facebook, requer facebook_app_id e facebook_app_secret"
@@ -877,7 +876,7 @@ pt:
     backup_frequency: "Com que frequência criamos cópias de segurança do sítio, em dias."
     enable_s3_backups: "Carregar cópias de segurança para S3 quando completo. IMPORTANTE: requer credenciais S3 válidas inseridas nas configurações dos ficheiros."
     s3_backup_bucket: "Balde remoto para guardar cópias de segurança. AVISO: Certifique-se que este é um balde privado."
-    s3_disable_cleanup: "Desative a remoção das cópias de segurança do S3 quando removidas localmente."
+    s3_disable_cleanup: "Desactive a remoção das cópias de segurança do S3 quando removidas localmente."
     backup_time_of_day: "Altura do dia UTC em que a cópia de segurança deve ocorrer."
     backup_with_uploads: "Incluir carregamentos em cópias de segurança agendadas. Desativar isto irá salvaguardar apenas a base de dados."
     active_user_rate_limit_secs: "Qual a frequência de atualização do campo 'última vez visto em', em segundos."
@@ -898,8 +897,8 @@ pt:
     max_private_messages_per_day: "Número máximo de mensagens que os utilizadores podem criar por dia."
     max_invites_per_day: "Número máximo de convites que um utilizador pode enviar por dia."
     max_topic_invitations_per_day: "Número máximo de convites para tópicos que um utilizador pode enviar por dia."
-    alert_admins_if_errors_per_minute: "O número de erros por minuto necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício."
-    alert_admins_if_errors_per_hour: "O número de erros por hora necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício."
+    alert_admins_if_errors_per_minute: "Número de erros por minuto necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício."
+    alert_admins_if_errors_per_hour: "Número de erros por hora necessários para disparar um alerta de administração. Um valor maior que 0 desativa esta funcionalidade. NOTA: requer reinício."
     suggested_topics: "Número de tópicos sugeridos mostrados no final de um tópico."
     limit_suggested_to_category: "Apenas mostrar tópicos da categoria atual nos tópicos sugeridos."
     clean_up_uploads: "Remover carregamentos orfãos não referenciados para prevenir alojamento ilegal. AVISO: poderá querer criar uma cópia de segurança da diretoria /uploads antes de ativar esta configuração."
@@ -1012,7 +1011,7 @@ pt:
     unsubscribe_via_email: "Permitir aos utilizadores cancelar a subscrição de emails enviando um email com \"unsubscribe\" no assunto ou no corpo do email"
     delete_email_logs_after_days: "Apagar registos de email após (N) dias. 0 para os manter indefinidamente"
     max_emails_per_day_per_user: "Número máximo de emails para enviar aos utilizadores. 0 para desligar o limite"
-    block_auto_generated_emails: "Bloquear emails recebidos que sejam identificados como gerados automáticamente."
+    block_auto_generated_emails: "Bloquear emails recebidos que sejam identificados como tendo sido gerados automaticamente."
     ignore_by_title: "Ignorar emails recebidos com base no seu título."
     manual_polling_enabled: "Enviar emails utilizando a API de resposta por email."
     pop3_polling_enabled: "Solicitação através de POP3 para respostas de emails"
@@ -1096,32 +1095,32 @@ pt:
     default_email_private_messages: "Por defeito, enviar um email quando alguém envia mensagens ao utilizador."
     default_email_direct: "Por defeito, enviar um email quando alguém cita/responde a/menciona ou convida o utilizador."
     default_email_mailing_list_mode: "Por defeito, enviar um email por cada nova mensagem."
-    default_email_mailing_list_mode_frequency: "Utilizadores que activem o mode de mailing list receberão mails com esta frequência, por defeito."
+    default_email_mailing_list_mode_frequency: "Utilizadores que activem o mode de mailing list receberão, por omissão, emails com esta frequência."
     disable_mailing_list_mode: "Não permitir aos utilizadores habilitar o modo de lista de distribuição."
     default_email_always: "Por defeito, enviar notificações por email mesmo quando o utilizador está ativo."
-    default_email_previous_replies: "Incluir respostas previas nos emails por defeito."
-    default_email_in_reply_to: "Por defeito Incluir excerto de mensagem de resposta nos email."
+    default_email_previous_replies: "Incluir, por omissão, respostas prévias nos emails."
+    default_email_in_reply_to: "Incluir, por omissão, um excerto da mensagem de resposta nos emails."
     default_other_new_topic_duration_minutes: "Condição global por defeito para o qual um tópico é considerado novo."
     default_other_auto_track_topics_after_msecs: "Tempo global por defeito antes de um tópico ser automaticamente acompanhado."
     default_other_external_links_in_new_tab: "Por defeito, abrir hiperligações externas num novo separador."
     default_other_enable_quoting: "Por defeito, ativar resposta por citação para texto destacado."
     default_other_dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do browser."
     default_other_disable_jump_reply: "Por defeito, não saltar para a mensagem do utilizador após ter respondido."
-    default_other_like_notification_frequency: "Notificar por defeito os utilizadores quando alguém gostar"
+    default_other_like_notification_frequency: "Notificar, por omissão, os utilizadores quando alguém gostar"
     default_topics_automatic_unpin: "Desafixar automaticamente tópicos quando um utilizador chega ao final, por defeito."
     default_categories_watching: "Lista de categorias que por defeito são vigiadas."
     default_categories_tracking: "Lista de categorias que por defeito são acompanhadas."
     default_categories_muted: "Lista de categorias que por defeito são mudas."
-    tagging_enabled: "Permitir tags em tópicos?"
-    min_trust_to_create_tag: "O nível de confiança mínimo necessário para criar uma tag."
-    max_tags_per_topic: "O numero máximo de tags que podem ser aplicadas a um tópico."
-    max_tag_length: "O número máximo de caracteres que pode ser usado numa tag."
-    show_filter_by_tag: "Mostrar filtro de tags para a lista de tópicos."
-    max_tags_in_filter_list: "Número máximo de tags a mostrar no filtro de tags. As tags mais utilizadas serão mostradas."
-    tags_sort_alphabetically: "Mostrar tags por ordem alfabética. Por defeito, ordenar por popularidade."
-    tag_style: "Estilo visual dos distintivos de tags."
-    staff_tags: "Lista de tags que só pode ser aplicadas por membros do staff."
-    min_trust_level_to_tag_topics: "Nível de confiança mínimo necessário para atribuir tags a tópicos."
+    tagging_enabled: "Permitir etiquetas em tópicos?"
+    min_trust_to_create_tag: "O nível de confiança mínimo necessário para criar uma etiqueta."
+    max_tags_per_topic: "O número máximo de etiquetas que podem ser aplicadas a um tópico."
+    max_tag_length: "O número máximo de caracteres que pode ser usado numa etiqueta."
+    show_filter_by_tag: "Mostrar filtro de etiquetas para a lista de tópicos."
+    max_tags_in_filter_list: "Número máximo de etiquetas a mostrar no filtro de etiquetas. Serão mostradas as etiquetas mais utilizadas."
+    tags_sort_alphabetically: "Mostrar etiquetas por ordem alfabética. São, por omissão, ordenadas por popularidade."
+    tag_style: "Estilo visual dos distintivos das etiquetas."
+    staff_tags: "Lista de etiquetas que só podem ser aplicadas por membros do pessoal."
+    min_trust_level_to_tag_topics: "Nível de confiança mínimo necessário para atribuir etiquetas a tópicos."
     errors:
       invalid_email: "Endereço de email inválido."
       invalid_username: "Não existe nenhum utilizador com esse nome de utilizador."
@@ -1140,9 +1139,9 @@ pt:
       pop3_polling_username_is_empty: "Deve configurar um 'nome de utilizador de polling pop3' antes de ativar o polling POP3."
       pop3_polling_password_is_empty: "Deve configurar uma 'palavra-passe de polling pop3' antes de ativar o polling POP3."
       pop3_polling_authentication_failed: "Autenticação POP3 falhada. Por favor verifique as suas credenciais pop3."
-      reply_by_email_address_is_empty: "Tem que definir um 'respostas por endereço de email' antes de habilitar a reposta por email."
-      email_polling_disabled: "Tem de habilitar a consulta manual ou automática de emails via POP antes de habilitar a reposta por email."
-      user_locale_not_enabled: "Tem de habilitar 'permitir definições regionais do utilizador' antes de habilitar esta configuração."
+      reply_by_email_address_is_empty: "É necessário definir uma 'resposta por endereço de email' antes de ligar a reposta por email."
+      email_polling_disabled: "Tem de ligar a consulta manual ou automática de emails via POP3 antes de ligar a reposta por email."
+      user_locale_not_enabled: "Tem de ligar 'permitir definições regionais do utilizador' antes de ligar esta configuração."
   search:
     within_post: "#%{post_number} por %{username}"
     types:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 8a7ede2af9..4ebc5366fb 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -715,7 +715,6 @@ pt_BR:
     s3_config_warning: 'O servidor está configurado para fazer upload de arquivos para o s3, mas pelo menos uma destas configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_upload_bucket. Vá até as <a href="/admin/site_settings">Configurações do Site</a> e atualize estas definições. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Veja "How to set up image uploads to S3?" para saber mais</a>.'
     s3_backup_config_warning: 'O servidor está configurado para fazer upload de arquivos para o s3, mas pelo menos uma destas configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_backup_bucket. Vá até as <a href="/admin/site_settings">Configurações</a> e atualize estas definições. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Veja "How to set up image uploads to S3?" para saber mais</a>.'
     image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick usando seu gerenciador de pacotes preferido ou acesse <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">para fazer download da última versão</a>.'
-    consumer_email_warning: "Seu site está configurado para usar Gmail (ou outro serviço de email para pessoas). <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limita a quantidade de emails que você pode enviar</a>. Considere o uso de um serviço de envio de emails como mandrill.com para assegurar a entregabilidade dos emails enviados."
   site_settings:
     censored_words: "Palavras que serão substituídos automaticamente por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-apagar todas as mensagens ocultas que ficar oculta por mais de 30 dias."
@@ -756,7 +755,6 @@ pt_BR:
     exclude_rel_nofollow_domains: "Uma lista de domínios aonde nofollow não deve ser adicionado nos links. tld.com automaticamente permite sub.tld.com. No mínimo, você deve adiocionar o domínio principal deste site para ajudar os motores de busca encontrarem todo conteúdo. Se outras partes de seu site estão em outros domínios, adicione estes também."
     post_excerpt_maxlength: "Limite de caracteres para o resumo de um post."
     post_onebox_maxlength: "Tamanho máximo para um Post em caracteres"
-    onebox_domains_whitelist: "Uma lista de domínios para os quais permitir oneboxing; estes domínios devem suportar OpenGraph ou oEmbed. Teste-os em http://iframely.com/debug"
     logo_url: "O logotipo ao lado superior esquerdo de seu site deve ser um retângulo largo. Se for deixado em branco, o que aparecerá será o nome do site. "
     apple_touch_icon_url: "Ícone usado para dispositivos Apple. Tamanho recomendado é 144px por 144px."
     notification_email: "O endereço de email utilizado quando enviado emails do sistema. O domínio especificado deve ter registros SPF, DKIM e PTR, devidamente configurados para que os email funcionem corretamente."
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index ff2a52d778..65c6bc3cab 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -616,9 +616,16 @@ ro:
     authorize: "Autorizează"
     read: "citire"
     read_write: "citire/scriere"
-    description: "Dorești să îi acorzi aplicației \"%{application_name}\" %{access} acces la contul tău?"
+    description: "„%{application_name}” cere accesul la contul tău de:"
     no_trust_level: "Ne pare rău, nu ai nivelul de încredere necesar pentru a accesa API utilizator"
     generic_error: "Ne pare rău, nu putem să emitem chei API utilizator: această funcționalitate este probabil dezactivată din administrarea site-ului"
+    scopes:
+      message_bus: "Actualizări directe (live)"
+      notifications: "Citește și șterge notificările"
+      push: "Trimite notificările către servicii externe"
+      session_info: "Citește informațiile despre sesiunea utilizatorului"
+      read: "Citește tot"
+      write: "Scrie tot"
   reports:
     visits:
       title: "Vizite ale utilizatorilor"
@@ -774,7 +781,6 @@ ro:
     s3_backup_config_warning: 'Serverul este configurat să încarce backup-urile pe opțiunea s3, dar cel puțin una dintre setările următoare nu este completată: s3_access_key_id, s3_secret_access_key sau s3_backup_bucket. Mergi la <a href="/admin/site_settings">Setările site-ului</a> și actualizează setările. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Pentru mai multe informații, vizualizează "Cum să setezi încărcările de imagini pe opțiunea S3"</a>.'
     image_magick_warning: 'Serverul este configurat să creeze thumbnail-uri din imagini mari, dar ImageMagick nu e instalat. Instalează ImageMagick <a href="http://www.imagemagick.org/script/binary-releases.php" ținta="_blank">descarcă ultima versiune</a>.'
     failing_emails_warning: 'Există %{num_failed_jobs} (de) sarcini email care au eșuat. Verifică app.yml și asigură-te că setările serverului de mail sunt corecte. <a href="/sidekiq/retries" target="_blank">Vizualizează sarcini eșuate în Sidekiq</a>.'
-    consumer_email_warning: "Site-ul tău e configurat să folosească Gmail (sau alt serviciu de email) pentru a trimite emailuri. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' tinta='_blank'>Gmail limitează numărul de email-uri trimise</a>. Folosește un provider de mailuri ca mandrill.com pentru a asigura trimiterea mail-urilor."
     subfolder_ends_in_slash: "Setările subfolderului sunt incorecte; DISCOURSE_RELATIVE_URL_ROOT se termină cu slash."
     email_polling_errored_recently:
       one: "Email polling a generat o eroare în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii."
@@ -831,7 +837,8 @@ ro:
     show_pinned_excerpt_mobile: "Arată fragmente din subiectele fixate în vizualizarea de mobil."
     show_pinned_excerpt_desktop: "Arată fragmente din subiectele fixate în vizualizarea de desktop."
     post_onebox_maxlength: "Lungimea maximă a unei postări afișate în Onebox (în caractere)"
-    onebox_domains_whitelist: "O listă de domenii permise pentru oneboxing; aceste domenii ar trebui să suporte OpenGraph sau oEmbed. Testează-le la http://iframely.com/debug"
+    onebox_domains_blacklist: "O listă cu domenii care nu vor putea fi utilizate cu onebox."
+    max_oneboxes_per_post: "Numărul maxim de utilizări onebox per post."
     logo_url: "Imaginea logo din partea din dreapta sus a site-ului tău trebuie să aibă o formă dreptunghiulară. Dacă este lăsată goală, va fi afișat în locul ei un titlu al site-ului în formă text."
     digest_logo_url: "Imaginea logo alternativă folosită în partea de sus a emailurilor-rezumat de pe site-ul tău. Trebuie să aibă o forma de dreptunghi lat. Nu trebuie să  fie o imagine SVG. Dacă e lăsată goală, va fi folosit în locul ei - `logo_url` ."
     logo_small_url: "Imaginea logo mică din partea de sus-stânga a site-ului tău va trebui să aibă o formă dreptunghiulară, vizibilă când se derulează pagina. Dacă e lăsată goală, va fi afișat un pictograf."
@@ -1192,6 +1199,7 @@ ro:
     embed_username_key_from_feed: "Cheie pentru extragerea numelui utilizator din flux."
     embed_title_scrubber: "Expresie regulată pentru curățarea titlurile integrabile."
     embed_truncate: "Retează postările încorporate."
+    allowed_href_schemes: "Alte tipuri de linkuri permise, în afară de http și https."
     embed_post_limit: "Numărul maxim de postări care să fie încorporate."
     embed_username_required: "Numele utilizator pentru acest subiect este obligatoriu."
     embed_whitelist_selector: "Selector CSS pentru elementele ce sunt permise în încorporări."
@@ -1238,9 +1246,8 @@ ro:
     default_categories_muted: "Implicit, listează categoriile care sunt setate pe silențios."
     max_user_api_reqs_per_day: "Numărul maxim de interogări API utilizator pe cheie, pe zi. "
     max_user_api_reqs_per_minute: "Numărul maxim de interogări API utilizator pe cheie, pe minut. "
-    allow_read_user_api_keys: "Permite generarea de chei API utilizator în mod exclusiv-citire."
-    allow_write_user_api_keys: "Permite generarea de chei API utilizator în mod scriere."
-    allow_push_user_api_keys: "Permite generarea de chei API utilizator pentru utilizarea serviciului push."
+    allow_user_api_keys: "Permite generarea de chei API pentru utilizator"
+    allow_user_api_key_scopes: "Lista domeniilor pentru care se permit chei API pentru utilizatori"
     max_api_keys_per_user: "Numărul maxim de chei API utilizator pe utilizator"
     min_trust_level_for_user_api_key: "Nivelul de încredere necesar pentru generarea de chei API utilizator"
     allowed_user_api_auth_redirects: "URL permis pentru redirecționarea autentificării pentru cheile API utilizator "
@@ -2340,6 +2347,7 @@ ro:
     message_to_blank: "message.to este gol"
     text_part_body_blank: "text_part.body e gol"
     body_blank: "conținutul este gol"
+    no_echo_mailing_list_mode: "Notificările pe mail dezactivate pentru postările proprii ale utilizatorului"
   color_schemes:
     base_theme_name: "Bază"
   about: "Despre"
@@ -2453,6 +2461,141 @@ ro:
       Da, legea este plictisitoare, însă trebuie să ne protejăm &ndash; și prin extensie, și pe tine și datele tale &ndash; împotriva băieților răi. Avem niște [Condiții generale de utilizare a site-ului](/tos) ce descriu comportamentul tău (și al nostru) și drepturile legate de conținut, confidențialitate și legi. Pentru a utiliza acest serviciu trebuie să ne accepți [CGU](/tos).
   tos_topic:
     title: "Condiții generale de utilizare"
+    body: |
+      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
+
+      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
+
+      <a name="1"></a>
+
+      ## [1. Your %{company_domain} Account](#1)
+
+      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
+
+      <a name="2"></a>
+
+      ## [2. Responsibility of Contributors](#2)
+
+      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
+
+      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
+      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
+      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
+      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
+      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
+      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
+      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
+      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
+      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
+
+      <a name="3"></a>
+
+      ## [3. User Content License](#3)
+
+      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
+
+
+      <a name="4"></a>
+
+      ## [4. Payment and Renewal](#4)
+
+      ### General Terms
+
+      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
+
+      ### Automatic Renewal
+
+      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
+
+      <a name="5"></a>
+
+      ## [5. Services](#5)
+
+      ### Hosting, Support Services
+
+      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
+
+      <a name="6"></a>
+
+      ## [6. Responsibility of Website Visitors](#6)
+
+      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
+
+      <a name="7"></a>
+
+      ## [7. Content Posted on Other Websites](#7)
+
+      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
+
+      <a name="8"></a>
+
+      ## [8. Copyright Infringement and DMCA Policy](#8)
+
+      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
+
+      <a name="9"></a>
+
+      ## [9. Intellectual Property](#9)
+
+      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
+
+      <a name="10"></a>
+
+      ## [10. Advertisements](#10)
+
+      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
+
+      <a name="11"></a>
+
+      ## [11. Attribution](#11)
+
+      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
+
+      <a name="12"></a>
+
+      ## [12. Changes](#12)
+
+      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
+
+      <a name="13"></a>
+
+      ## [13. Termination](#13)
+
+      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
+
+      <a name="14"></a>
+
+      ## [14. Disclaimer of Warranties](#14)
+
+      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
+
+      <a name="15"></a>
+
+      ## [15. Limitation of Liability](#15)
+
+      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
+
+      <a name="16"></a>
+
+      ## [16. General Representation and Warranty](#16)
+
+      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
+
+      <a name="17"></a>
+
+      ## [17. Indemnification](#17)
+
+      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
+
+      <a name="18"></a>
+
+      ## [18. Miscellaneous](#18)
+
+      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
+
+      This document is CC-BY-SA. It was last updated May 31, 2013.
+
+      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politica de confidențialitate"
     body: |
@@ -2767,6 +2910,19 @@ ro:
     staff_tag_disallowed: "Eticheta \"%{tag}\" poate fi pusă doar de un membru al echipei."
     staff_tag_remove_disallowed: "Eticheta \"%{tag}\" poate fi ștearsă doar de un membru al echipei."
   rss_by_tag: "Subiecte etichetate %{tag}"
+  finish_installation:
+    congratulations: "Felicitări, ai instalat Discourse!"
+    register:
+      button: "Înregistrare"
+      title: "Înregistrare cont administrator"
+      help: "înregistrează un cont nou ca să începi"
+      no_emails: "Din păcate, niciun email de administrator nu a fost setat pe parcursul instalării, așa că finalizarea configurării <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>poate fi dificilă</a>."
+    confirm_email:
+      title: "Confirmare email"
+      message: "<p>Am trimis un email de activare la <b>%{email}</b>. Urmează instrucțiunile din email ca să-ți activezi contul.</p><p>Dacă nu primești email, verifică dacă l-ai introdus corect și verifică și dosarul de spam.</p>"
+    resend_email:
+      title: "Retrimite email de activare"
+      message: "<p>Am trimis un email de activare la <b>%{email}</b>"
   wizard:
     title: "Configurare Discourse"
     step:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index c429654a5f..43a7fed042 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -764,7 +764,6 @@ ru:
     s3_config_warning: 'Сервер сконфигурирован на загрузку файлов в хранилище S3, однако не указаны некоторые значения из списка: s3_access_key_id, s3_secret_access_key или 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">How to set up image uploads to S3?</a>.'
     s3_backup_config_warning: 'Сервер сконфигурирован на загрузку резервных копий в хранилище S3, однако не заданы все необходимые настройки : s3_access_key_id, s3_secret_access_key, 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">How to set up image uploads to S3?</a>.'
     image_magick_warning: 'Сервер сконфигурирован на создание превью больших изображений, однако на сервере не установлен ImageMagick. Установите ImageMagick используя системный менеджер пакетов, или пройдите по ссылке <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">для загрузки последней версии</a>.'
-    consumer_email_warning: "Сайт настроен на использование Gmail (или другого почтового сервиса) для отправки сообщений. Gmail <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>имеет ограничения</a> на количество отправляемых сообщений. Вы можете рассмотреть возможность использования альтернативного поставщика услуг (например, mandrill.com) для обеспечения бесперебойности доставки почтовых сообщений."
   site_settings:
     censored_words: "Слова, которые будут автоматически заменены на &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Автоматически удалять сообщения, скрытые дольше чем 30 дней."
@@ -801,7 +800,6 @@ ru:
     add_rel_nofollow_to_user_content: "Добавить \"rel nofollow\" для всех ссылок за исключением внутренних (включая родительский домен). Изменение данной настройки потребует обновления всех сообщений с помощью команды \"rake posts:rebake\""
     post_excerpt_maxlength: "Максимальная длина краткого изложения сообщения."
     post_onebox_maxlength: "Максимальная длина сообщения с форума Discourse в режиме умной вставки."
-    onebox_domains_whitelist: "Список доменов, разрешенных для умной вставки. Эти домены должны поддерживать OpenGraph или oEmbed. Проверьте их по ссылке http://iframely.com/debug"
     apple_touch_icon_url: "Иконка используемая для тач-устройств Apple. Рекомендуемый размер 144 x 144 px."
     notification_email: "Отправитель: E-mail использующийся при отправке всех системных писем. Домен, указанный здесь должен иметь правильно сконфигурированные SPF, DKIM и  reverse PTR записи, для успешной отправки."
     email_custom_headers: "Разделенный чертой список дополнительных заголовков в почтовых сообщениях"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 868420eed7..562687b5aa 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -588,7 +588,6 @@ sk:
     authorize: "Autorizovať"
     read: "čítať"
     read_write: "čítať/zapisovať"
-    description: "Chcete udelit aplikácii \"%{application_name}\" právo %{access} Váš účtet?"
     no_trust_level: "Ľutujeme, nemáte dostatočný stupeň dôvery na prístup k používateľskému API"
     generic_error: "Ľutujeme, nie je možné vystaviť používateľský API kľúč, táto možnosť môže byť vypnutá administrátorom."
   reports:
@@ -738,7 +737,6 @@ sk:
     s3_backup_config_warning: 'Server má nakonfigurované nahrávanie záloh na S3, ale minimálne jedna z nasledujúcich hodnôt nie je nastavená: s3_access_key_id, s3_secret_access_key, alebo  s3_backup_bucket. Navštívte  <a href="/admin/site_settings">Nastavenia stránky</a> a aktualizujte nastavenia. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Chcete vedieť viac? Pozrite si návod ako nastaviť nahrávanie súborov na S3</a>.'
     image_magick_warning: 'Server je nakonfigurovaný na vytváranie náhľadov z veľkých obrázkov, ale ImageMagick  nie je nainštalovaný. Nainštalujte ImageMagick pomocou Vášho správcu balíčkov, alebo <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">Stiahnite najnovšiu verziu</a>.'
     failing_emails_warning: 'Existuje %{num_failed_jobs} neuspešných emailých pokusov. Skontrolujte Váš app.yml a uistite sa, že nastavenia email serveru máte správne. <a href="/sidekiq/retries" target="_blank">Pozrieť neúspešné pokusy v Sidekiq</a>.'
-    consumer_email_warning: "Vaše stránky sú nastavené tak aby na posielanie emailov používali Gmail (alebo iné služby pre spotrebiteľov). <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail obmedzuje počet odoslaných emailov</a>. Na zaistenie doručiteľonosti emailov zvážte použitie emailového poskytovateľa ako napríklad mandrill.com."
     subfolder_ends_in_slash: "Vaše nastavenie podadresára je chybné, DISCOURSE_RELATIVE_URL_ROOT je ukončené lomítkom."
   site_settings:
     censored_words: "Slová, ktoré budu automatický nahradené znakmi &#9632;&#9632;&#9632;&#9632;"
@@ -781,7 +779,6 @@ sk:
     exclude_rel_nofollow_domains: "Zoznam domén, na ktorých odkazy nebude pridávaný nofollow . tld.com automaticky umožní sub.tld.com. Aby ste umožnili internetovým vyhľadávačom nájsť kompletný obsah mali by ste pridať minimálne doménu najvyššej úrovne týchto stránok. Ak je nejaká časť stránok na iných doménach, pridajte ich tiež."
     post_excerpt_maxlength: "Maximálna dĺžka príspevku okrem zhrnutia."
     post_onebox_maxlength: "Maximálna dĺžka vloženého Discourse príspevku v znakoch."
-    onebox_domains_whitelist: "Zoznam domén, pre ktoré je umožnené vkladanie. Tieto domény by mali podporovať OpenGraph alebo oEmbed. Overte ich pomocou http://iframely.com/debug"
     logo_url: "Obrázok loga na ľavej hornej časti stránky, mal by byť tvaru širokého obdĺžnika. Ak nebude uvedený, zobrazí sa nadpis stránok."
     logo_small_url: "Malý obrázok loga na ľavej hornej strane stránok, mal by mať tvar štvorca a bude zobrazený pri skrolovaní nadol. Ak nebude uvedený, zobrazí sa piktogram domu."
     favicon_url: "Favicon pre Vaše stránky, pozrite http://en.wikipedia.org/wiki/Favicon. Aby fungoval správne s CDN, musí byť vo formáte png"
@@ -824,7 +821,7 @@ sk:
     post_menu_hidden_items: "Položky vo východzích nastaveniach menu schované pri príspevkovom menu, dokiaľ neni kliknuté na rozbaľovaciu elipsu."
     share_links: "Uveďte, ktoré položky sa maju zobraziť v zdieľacom dialógu a v akom poradí."
     track_external_right_clicks: "Sledovať externé odkazy na ktoré sa klkne pravým tlačidlom (napr. otvorenie na novej karte) Vypnuté vo východzích nastaveniach, pretože to prepisuje URL adresy"
-    site_contact_username: "Platné uťívateľské meno obsluhy, ktorá bude posielať automatizované správy. Pokiaľ je vynechané, použije sa východzí systémový účet. "
+    site_contact_username: "Platné používateľské meno obsluhy, ktorá bude posielať automatizované správy. Pokiaľ je vynechané, použije sa východzí systémový účet. "
     send_welcome_message: "Poslať všetkým novým používateľom uvítaciu správu s návodom ako začať. "
     suppress_reply_directly_below: "Nezobrazovať rozbaľovacie tlačidlo s počtom odpovedí ak je k príspevku len jedna odpoveď priamo pod ním."
     suppress_reply_directly_above: "Nezobrazovať rozbaľovacie tlačidlo v-odpovedi-na ak je len jedna odpoveď priamo nad príspevkom."
@@ -1044,7 +1041,7 @@ sk:
     allow_profile_backgrounds: "Povoliť používateľov nahranie pozadia do profilu."
     sequential_replies_threshold: "Po koľkých po sebe idúcich príspevkov v rade za sebou sa má používateľovi zobraziť varovanie o nadmernom množstve odpovedí?"
     enable_mobile_theme: "Mobilné zariadenia používajú tému pre mobilné zariadenia s možnosťou prepnutia na plnú verziu stránok. Vypnite, ak chcete použiť vlastný štýl, ktorý podporuje mobilné zariadenia."
-    dominating_topic_minimum_percent: "Koľko percent príspevkou musí pouťívateľ pridať do témy než sa mu zobrazí pripomienka o dominovaní témy."
+    dominating_topic_minimum_percent: "Koľko percent príspevkov musí používateľ pridať do témy než sa mu zobrazí pripomienka o dominovaní témy."
     disable_avatar_education_message: "Vypnúť informatívnu hlášku na zmenu avatara."
     suppress_uncategorized_badge: "V zozname tém nezobrazuj odznak za nekategorizované príspevky."
     global_notice: "Pre všetkých návštevníkov zobraz URGENTNÉ, KRÍZOVÉ globálné záhlavie, zmeň na čierne a schovaj (HTML povolené)."
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index d8dd1409a6..8cf1006970 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -569,7 +569,6 @@ sq:
     s3_config_warning: 'The server is configured to upload files to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     s3_backup_config_warning: 'The server is configured to upload backups to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download the latest release</a>.'
-    consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limits how many emails you can send</a>. Consider using an email service provider like mandrill.com to ensure email deliverability."
   site_settings:
     censored_words: "Fjalët do të zhvendosen automatikisht me &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days."
@@ -609,7 +608,6 @@ sq:
     exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. tld.com will automatically allow sub.tld.com as well. As a minimum, you should add the top-level domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
     post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
-    onebox_domains_whitelist: "A list of domains to allow oneboxing for; these domains should support OpenGraph or oEmbed. Test them at http://iframely.com/debug"
     logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown."
     logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown."
     mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. Should be a square shape. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png"
@@ -1782,7 +1780,7 @@ sq:
       name: Anëtar
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">U dha</a> mundësia për ftesa, mesazhe në grup, më shumë pëlqime
       long_description: |
-        Kjo stemë jepet kur ju arrini nivelin e bisimit 2. Faleminderit që jeni pjese prej më shumë se disa javësh e komunitetit tonë. Ju tashmë mund të dërgoni ftesa nga faqja juaj e përdoruesit ose nga tema të veçanta, të krijoni mesazhe në grup, dhe të keni ca pëlqime më shumë në ditë.
+        Kjo stemë jepet kur ju arrini nivelin e besimit 2. Faleminderit që jeni pjesë prej më shumë se disa javësh e komunitetit tonë. Ju tashmë mund të dërgoni ftesa nga faqja juaj e përdoruesit ose nga tema të veçanta, të krijoni mesazhe në grup, dhe të keni ca pëlqime më shumë në ditë.
     regular:
       name: I zakonshëm
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">U dha</a> mundësia për ri-kategorizim, ri-emërtim, lidhje ndjekëse, wiki, dhe më shumë pëlqime
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index a05ce22dcb..18b3edafb1 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -725,7 +725,6 @@ sv:
     s3_backup_config_warning: 'Servern är konfigurerad till att ladda upp säkerhetskopior till s3, men minst en av följande inställningar är inte satta: s3_access_key_id, s3_secret_access_key eller s3_backup_bucket. Gå till <a href="/admin/site_settings">Webbplatsinställningarna</a> och uppdatera inställningarna. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Se "How to set up image uploads to S3?" för att lära dig mer</a>.'
     image_magick_warning: 'Servern är konfigurerad att skapa ikoner av stora bilder, men ImageMagick är inte installerad. Installera ImageMagick med din föredragna pakethanterare eller <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">ladda hem den senaste utgåvan</a>.'
     failing_emails_warning: 'Det finns %{num_failed_jobs} e-postutskick som har misslyckats. Kontrollera din app.yml-fil för att säkerställa att serverinställningarna för e-post är korrekta. <a href="/sidekiq/retries" target="_blank">Se alla misslyckade utskick i Sidekiq</a>.'
-    consumer_email_warning: "Din sida är konfigurerad till att använda Gmail (eller någon annan konsumenttjänst) för att skicka e-post. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail begränsar antalet e-post du kan skicka</a>. Överväg att använda en tjänsteleverantör som exempelvis mandrill.com för att säkerställa att all e-post levereras."
     subfolder_ends_in_slash: "Inställningarna för dina undermappar är inte korrekt; DISCOURSE_RELATIV_URL_ROOT slutar med ett snedstreck."
     email_polling_errored_recently:
       one: "E-postpolling har genererat ett fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer."
@@ -779,7 +778,6 @@ sv:
     show_pinned_excerpt_mobile: "Visa inte utdrag för klistrade ämnen i mobilen."
     show_pinned_excerpt_desktop: "Visa inte utdrag för klistrade ämnen på datorn."
     post_onebox_maxlength: "Maxlängd på ett onebox:at Discourse-inlägg i antal tecken."
-    onebox_domains_whitelist: "En lista över alla domäner som tillåter onebox; dessa domäner bör stödja OpenGraph eller oEmbed. Testa dem på http://iframely.com/debug"
     logo_url: "Logotypen i övre vänstra sidan av din webbplats bör ha en bred rektangulär form. Om den lämnas blank kommer webbplatsens titel att visas. "
     digest_logo_url: "Den alternativa logotypen används överst i din webbplats e-postsammanfattning. Den bör ha en bred rektangulär form. Den borde inte vara en SVG-bild. Om den lämnas blank kommer `logo_url` att användas."
     logo_small_url: "Den lilla logotypen som visas i övre vänstra hörnet av hemsidan när man bläddrar ned i ämnen. Om den lämnas blank kommer hemloggan visas."
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index fca58b2cce..eea175dc7a 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -674,7 +674,6 @@ tr_TR:
     s3_backup_config_warning: 'Sunucu s3''e yedekleme yüklenebilmesi için yapılandırılmış, fakat şunlardan en az biri henüz ayarlanmamış: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. <a href="/admin/site_settings">Site Ayarları</a> sayfasına gidin ve ayarları güncelleyin. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Daha fazla bilgi için "How to set up image uploads to S3?" konulu gönderiye bakın</a>.'
     image_magick_warning: 'Sunucu büyük resimlerin küçük boylarının oluşturulması için yapılandırılmış, fakat ImageMagick henüz kurulmamış. Favori paket yöneticinizi kullanarak ImageMagick kurun veya <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">son sürümünü indirin</a>.'
     failing_emails_warning: 'Başarısızlıkla sonuçlanmış %{num_failed_jobs} e-posta işlemi bulunuyor. app.yml dosyanızı kontrol edin ve e-posta sunucu ayarlarınızın doğru olduğundan emin olun. <a href="/sidekiq/retries" target="_blank">Sidekiq''deki başarısız işlemlere göz atın</a>.'
-    consumer_email_warning: "Sitenizde e-posta gönderimleri için Gmail (ya da başka bir e-posta hizmeti) kurulumu yapılmış. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail ile gönderebileceğiniz e-posta sayısı limitlidir</a>. Onun yerine, e-postalarınızın ulaştırılabildiğinden emin olmak için mandrill.com benzeri bir hizmet sağlayıcısını kullanın."
     subfolder_ends_in_slash: "Alt dizin kurulumunuz hatalı, DISCOURSE_RELATIVE_URL_ROOT sonunda yan çizgi bulunmalı."
     bad_favicon_url: "Minik simge yüklemesi başarısız oldu. <a href='/admin/site_settings'>Site Ayarları</a>ndan favicon_url alanını kontrol edin."
   site_settings:
@@ -724,7 +723,7 @@ tr_TR:
     show_pinned_excerpt_mobile: "Mobil görünümünde başa tutturulmuş konuların özetini göster."
     show_pinned_excerpt_desktop: "Masaüstü görünümünde başa tutturulmuş konuların özetini göster."
     post_onebox_maxlength: "Kutulanmış bir Discourse gönderisinin en fazla karakter uzunluğu"
-    onebox_domains_whitelist: "Kutulamaya izin verilen alan adları listesi; bu alan adları OpenGraph ya da oEmbed desteklemeliler. http://iframely.com/debug adresinden test edebilirsiniz."
+    max_oneboxes_per_post: "Gönderide olabilecek en fazla kutulama sayısı"
     logo_url: "Sitenin üst solundaki görsel, geniş dikdörtgen şeklinde olmalıdır. Boş bırakılırsa site başlığı gösterilecektir."
     logo_small_url: "Sitenin üst solundaki küçük görsel, kare şeklinde olmalıdır, aşağıya doğru kaydırılırken görünür. Boş bırakılırsa bir ev oyması gösterilecektir."
     favicon_url: "Site simgesi, bilgi için http://en.wikipedia.org/wiki/Favicon adresine bakınız, bir CDN ile doğru şekilde çalışmak için png olmalıdır."
@@ -977,6 +976,7 @@ tr_TR:
     unsubscribe_via_email: "Kullanıcıların konu veya içerik alanında 'unsubscribe' olan bir e-posta göndererek e-postalara abonelikten çıkmasına izin ver"
     delete_email_logs_after_days: "(n) günden sonra e-posta kayıtlarını sil. sürekli tutmak için 0"
     max_emails_per_day_per_user: "Kullanıcılara bir günde gönderilebilecek en fazla e-posta sayısı. Limiti kaldırmak için 0"
+    bounce_score_threshold: "Kullanıcıya e-posta gönderimi durdurmak için gereken en fazla geri seken posta sayısı"
     pop3_polling_enabled: "E-posta cevapları için POP3 üzerinden sorgula"
     pop3_polling_ssl: "POP3 sunucusuna bağlanırken SSL kullanın. (Tavsiye edilir)"
     pop3_polling_period_mins: "Periyodik olarak POP3 hesabının e-posta için kontrol edilmesinin dakika bazında sıklığı. NOT: yeniden başlatma gerektirir"
@@ -1029,9 +1029,9 @@ tr_TR:
     show_time_gap_days: "İki gönderinin tarihleri arasında bu kadar gün farkı varsa, konuda zaman aralığına yer ver."
     invites_per_page: "Öntanımlı olarak kullanıcı sayfasında gösterilen davetler."
     short_progress_text_threshold: "Bir konudaki gönderi sayısı bu sayının üzerine çıktığında, ilerleme çubuğunda sadece şu anki gönderi sayısını göster. İlerleme çubuğunun kalınlığını değiştirirseniz, bu değeri de değiştirmeniz gerekebilir."
-    default_code_lang: "GitHub kod bloklarına (lang-auto, ruby, python vs.) uygulanacak, öntanımlı programlama dili söz dizimi vurgulaması."
+    default_code_lang: "GitHub kod parçalarına (lang-auto, ruby, python vs.) uygulanacak olan öntanımlı programlama dili söz dizimi vurgulaması."
     warn_reviving_old_topic_age: "Herhangi bir kullanıcı, son cevabın burada belirtilen gün sayısından daha önce yazıldığı bir konuya cevap yazmaya başladığında, bir uyarı iletisi çıkacak. Bu özelliği devre dışı bırakmak için 0 girin. "
-    autohighlight_all_code: "Tüm önceden biçimlendirilen kod bloklarına, açıkça dil seçimi yapılmamış olsa da, zorla kod vurgulaması uygula."
+    autohighlight_all_code: "Tüm önceden biçimlendirilen kod parçalarına, açıkça dil seçimi yapılmamış olsa da, zorla kod vurgulaması uygula."
     highlighted_languages: "Dahil edilen kod renklendirme kuralları. (Uyarı: çok fazla dil eklemek performansı etkileyebilir) demo için bakınız: https://highlightjs.org/static/demo/"
     feed_polling_enabled: "SADECE YERLEŞTİRME İÇİN: RSS/ATOM beslemesinin gönderi olarak yerleştirilip yerleştirilemeyeceği."
     feed_polling_url: "SADECE YERLEŞTİRME İÇİN: Yerleştirilecek RSS/ATOM beslemesinin URL'i."
@@ -1073,8 +1073,6 @@ tr_TR:
     default_categories_muted: "Öntanımlı olarak, sesi kısılan kategorilerin listesi."
     max_user_api_reqs_per_day: "Gün başına yapılabilecek en fazla kullanıcı API isteği"
     max_user_api_reqs_per_minute: "Dakika başına yapılabilecek en fazla kullanıcı API isteği"
-    allow_read_user_api_keys: "Yalnızca okuma için kullanıcı API'leri oluşturulmasına izin ver"
-    allow_write_user_api_keys: "Yazma yetkili kullanıcı API'leri oluşturulmasına izin ver"
     max_api_keys_per_user: "Kullanıcı başına kullanılabilecek kullanıcı API anahtarı sayısı"
     min_trust_level_for_user_api_key: "Kullanıcı API'si oluşturmak için gereken güven seviyesi"
     tagging_enabled: "Konularda etiketleri etkinleştirin?"
@@ -1651,7 +1649,7 @@ tr_TR:
   unsubscribe_link_and_mail: |
     Bu e-postaları almayı durdurmak için [buraya tıklayın](%{unsubscribe_url}).
   unsubscribe_mailing_list: |
-    Duyuru listesi ayarını açtığınız için bunu alıyorsunuz.
+    Duyuru listesi modunu açtığınız için bunu alıyorsunuz.
 
     Bu e-postaları almayı durdurmak için [buraya tıklayın](%{unsubscribe_url}).
   subject_re: "Cvp:"
@@ -1813,6 +1811,7 @@ tr_TR:
       new_activity: "Konu ve gönderilerinizdeki yeni etkinlikler:"
       top_topics: "Gözde gönderiler"
       other_new_topics: "Gözde konular"
+      unsubscribe: "Bir süredir görünmediğiniz için bu e-posta size %{site_link} topluluğundan gönderildi. Bu e-postaları almak istemiyorsanız %{unsubscribe_link}."
       click_here: "buraya tıklayın"
       from: "%{site_name} özeti"
       read_more: "Devamını Oku"
@@ -1820,6 +1819,7 @@ tr_TR:
       more_topics_category: "Daha fazla yeni konu:"
     mailing_list:
       subject_template: "[%{site_name}] %{date} Özeti "
+      unsubscribe: "Bu günlük e-posta size %{site_link} topluluğundan duyuru listesi modunu etkin yaptığınız için gönderildi. Bu e-postaları almak istemiyorsanız %{unsubscribe_link}."
       from: "%{site_name} özeti"
       new_topics: "Yeni konular"
       topic_updates: "Konu güncellemeleri"
@@ -2200,6 +2200,15 @@ tr_TR:
     staff_tag_disallowed: " \"%{tag}\" etiketi yalnızca görevliler tarafından eklenebilir gözüküyor."
     staff_tag_remove_disallowed: " \"%{tag}\" etiketi yalnızca görevliler tarafından silinebilir gözüküyor."
   rss_by_tag: "%{tag} etiketli konular"
+  finish_installation:
+    register:
+      button: "Kayıt Ol"
+      help: "başlamak için yeni bir hesap oluşturun"
+    confirm_email:
+      title: "E-posta adresinizi doğrulayın"
+    resend_email:
+      title: "Etkinleştirme E-postasını Tekrar Gönder"
+      message: "<p> <b>%{email}</b> adresine etkinleştirme e-postasını tekrar gönderdik"
   wizard:
     title: "Discourse Kurulumu"
     step:
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index ba1ff14816..6ba88864d4 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -243,7 +243,6 @@ uk:
     github_config_warning: 'The server is configured to allow signup and log in with GitHub (enable_github_logins), but the client id and secret values are not set. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide" target="_blank">See this guide to learn more</a>.'
     s3_config_warning: 'The server is configured to upload files to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download the latest release</a>.'
-    consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limits how many emails you can send</a>. Consider using an email service provider like mandrill.com to ensure email deliverability."
   site_settings:
     default_locale: "Мова за замовчуванням для цього екземпляра Discourse (Код ISO 639-1)"
     allow_user_locale: "Allow users to choose their own language interface preference"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 13af8b8b17..b2e105cb0e 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -655,7 +655,6 @@ vi:
     s3_backup_config_warning: 'Máy chủ được cấu hình để upload các bản sao lưu dữ liệu lên s3, tuy nhiên ít nhất một trong các tùy chỉnh sau đây không được thiết lập: s3_access_key_id, s3_secret_access_key hoặc s3_backup_bucket. Truy cập <a href="/admin/site_settings">Thiết lập Site</a> và  bổ sung các thiết lập đó. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Xem bài viết "How to set up image uploads to S3?" để biết thêm chi tiết</a>.'
     image_magick_warning: 'Máy chủ đã cấu hình để tạo hình đại diện nhỏ từ những hình lới, nhưng ImageMagick chưa được cài đặt. Cài ImageMagick sử dụng trình quản lý package yêu thích của bạn hoặc <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">tải về phiên bản mới nhất</a>.'
     failing_emails_warning: 'Có %{num_failed_jobs} email jobs thấ bại. Kiểm tra app.yml và chắc chắn rằng cấu hình máy chủ email đúng. <a href="/sidekiq/retries" target="_blank">Xem jobs thất bại ở Sidekiq</a>.'
-    consumer_email_warning: "Trang web của bạn được cài đặt sử dụng Gmail (hoặc một dịch vụ email khác) để gửi email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail có giới hạn số lượng email bạn có thể gửi</a>. Hãy xem xét sử dụng một dịch vụ email khác như mandrill.com để đảm bảo khả năng vận chuyển tất cả các email."
     subfolder_ends_in_slash: "Thư mục con của bạn được thiết lập không đúng, DISCOURSE_RELATIVE_URL_ROOT phải được kết thúc bằng dấu gạch chéo."
     email_polling_errored_recently:
       other: "Email đã tạo %{count} lỗi trong 24 giờ qua, xem <a href='/logs' target='_blank'>nhật ký</a> để biết thêm chi tiết."
@@ -704,7 +703,6 @@ vi:
     exclude_rel_nofollow_domains: "Một danh sách tên miền mà rel='nofollow' không được thêm vào các liên kết, các tên miền con sẽ được tự động áp dụng như với tên miền chính. Tối thiểu, bạn nên thêm tên miền cấp cao nhất của website này để giúp search engine tìm kiếm tất cả các nội dung. Nếu các phần khác của website thuộc tên miền khác, cũng nên thêm vào."
     post_excerpt_maxlength: "Chiều dài tối đa của đoạn trích / tóm tắt chủ đề."
     post_onebox_maxlength: "Số ký tự tối đa của một bài onebox Discourse."
-    onebox_domains_whitelist: "Danh sách các tên miền cho phép onebox, các tên miền này phải hỗ trợ OpenGraph hoặc oEmbed. Kiểm tra tại http://iframely.com/debug"
     logo_url: "Logo ở vị trí trên cùng của website nên là hình chữ nhật, nếu để trống thì tên website sẽ hiển thị."
     logo_small_url: "Logo nhỏ ở vị trí trên cùng của website hiển thị khi cuộn xuống nên là hình vuông, nếu để trống thì icon trang chủ sẽ hiển thị."
     favicon_url: "Favicon cho trang của bạn, xem tại http://en.wikipedia.org/wiki/Favicon, để chạy được với CDN ảnh phải là png"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index be49a06f61..e80a6ecdee 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -685,7 +685,6 @@ zh_CN:
     s3_backup_config_warning: '服务器被配置为上传备份到 s3，但是至少有一个值未被设定： s3_access_key_id, s3_secret_access_key 或 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>。'
     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 文件是否正确配置了邮件服务器。<a href="/sidekiq/retries" target="_blank">查看 Sidekiq 中失败的任务</a>。'
-    consumer_email_warning: "你的站点被设置为使用 Gmail 或者其他客户邮箱服务发送邮件。<a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail 限制每日邮件发送数量</a>。请考虑使用其他邮件服务商来保证邮件的成功发送，例如 mandrill.com。"
     subfolder_ends_in_slash: "你的子目录设置不正确；DISCOURSE_RELATIVE_URL_ROOT以斜杠结尾。"
     email_polling_errored_recently:
       other: "邮件轮询在过去的 24 小时内出现了 %{count} 个错误。看一看<a href='/logs' target='_blank'>日志</a>寻找详情。"
@@ -738,7 +737,6 @@ zh_CN:
     show_pinned_excerpt_mobile: "移动版显示置顶主题剪辑。"
     show_pinned_excerpt_desktop: "移动版显示置顶主题剪辑。"
     post_onebox_maxlength: "Onebox 处理后的 Discourse 帖子的最大字符长度"
-    onebox_domains_whitelist: "对这些站点启用 Onebox 的域名列表；这些域名应该支持 OpenGraph 或 oEmbed。在此测试他们：http://iframely.com/debug"
     logo_url: "在你站点左上角出现的小号标志图片，应为一个长方形。如果留空，将显示站点标题文字。"
     digest_logo_url: "邮件摘要中使用的标志图像。应为长方形。不能使用 SVG 图片。如果留空，将使用 `logo_url`。"
     logo_small_url: "在你站点左上角的小号标志图片，应为正方形，当滚动时才可见。如果留空，将显示主页图标。"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index fdd64c5116..f3ef1ac9e8 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -479,7 +479,6 @@ zh_TW:
     s3_config_warning: '伺服器被設定為上傳文件到 s3，但是至少有一個值未被設定： s3_access_key_id, s3_secret_access_key 或 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_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>。'
     image_magick_warning: '伺服器被設置為給大圖片創建縮略圖，但是 ImageMagick 沒有被安裝。使用你喜愛的包裝管理器安裝 ImageMagick 或<a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">下載最新版</a>。'
-    consumer_email_warning: "您的網站正以Gmail或其他服務供應商郵件服務發送郵件。<a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail限制每日郵件發送數量</a>. 請考慮使用其他電郵服務商來保證郵件能成功發送，例如 mandrill.com。"
   site_settings:
     censored_words: "將被自動替換為 &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "自動刪除被隱藏超過 30 天的帖子。"
@@ -516,7 +515,6 @@ zh_TW:
     add_rel_nofollow_to_user_content: "添加 rel nofollow 屬性到所有的用戶內容，除了內部鏈接（包括父域名）。如果你更改了這個，你必須重新調制所有帖子，而該命令為：“rake posts:rebake”"
     post_excerpt_maxlength: "文章摘要的最大文字長度"
     post_onebox_maxlength: "Onebox 處理後的 Discourse 帖子的最大字符長度"
-    onebox_domains_whitelist: "對這些站點啟用 Onebox 的域名列表；這些域名應該支持 OpenGraph 或 oEmbed。在此測試它們：http://iframely.com/debug"
     apple_touch_icon_url: "Apple 觸碰設備使用的圖示，建議 144 X 144px 大小"
     notification_email: "這個表格：被用於發送所有重要系統郵件的郵箱地址。指定的域名必須正確設置 SPF、DKIM 和反向 PTR 記錄以發送郵件。"
     email_custom_headers: "自定義的電子郵件標題的管道分隔列表"
diff --git a/config/routes.rb b/config/routes.rb
index 5c51163ef5..61f05947a3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,6 +41,7 @@ Discourse::Application.routes.draw do
   get "finish-installation/register" => "finish_installation#register"
   post "finish-installation/register" => "finish_installation#register"
   get "finish-installation/confirm-email" => "finish_installation#confirm_email"
+  put "finish-installation/resend-email" => "finish_installation#resend_email"
 
   resources :directory_items
 
@@ -56,7 +57,6 @@ Discourse::Application.routes.draw do
 
   get "site_customizations/:key" => "site_customizations#show"
 
-  resources :forums
   get "srv/status" => "forums#status"
 
   get "wizard" => "wizard#index"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 233600505e..f93bc56709 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -567,6 +567,10 @@ posting:
      - code-fences
   embed_truncate:
     default: true
+  allowed_href_schemes:
+    client: true
+    default: ''
+    type: list
 
 email:
   email_time_window_mins:
@@ -851,9 +855,12 @@ security:
 onebox:
   enable_flash_video_onebox: false
   post_onebox_maxlength: 500
-  onebox_domains_whitelist:
+  onebox_domains_blacklist:
     default: ''
     type: list
+  max_oneboxes_per_post:
+    default: 50
+    client: true
 
 spam:
   add_rel_nofollow_to_user_content: true
diff --git a/db/fixtures/001_categories.rb b/db/fixtures/001_categories.rb
index c6880b5338..5e47dbcf2c 100644
--- a/db/fixtures/001_categories.rb
+++ b/db/fixtures/001_categories.rb
@@ -1,5 +1,5 @@
 # fix any bust caches post initial migration
-ActiveRecord::Base.send(:subclasses).each{|m| m.reset_column_information}
+ActiveRecord::Base.send(:subclasses).each { |m| m.reset_column_information }
 
 SiteSetting.refresh!
 uncat_id = SiteSetting.uncategorized_category_id
@@ -10,9 +10,7 @@ if uncat_id == -1 || !Category.exists?(uncat_id)
 
   result = Category.exec_sql "SELECT 1 FROM categories WHERE lower(name) = 'uncategorized'"
   name = 'Uncategorized'
-  if result.count > 0
-    name << SecureRandom.hex
-  end
+  name << SecureRandom.hex if result.count > 0
 
   result = Category.exec_sql "INSERT INTO categories
           (name,color,slug,description,text_color, user_id, created_at, updated_at, position, name_lower)
diff --git a/db/fixtures/002_groups.rb b/db/fixtures/002_groups.rb
index 154c76bba9..94757078a7 100644
--- a/db/fixtures/002_groups.rb
+++ b/db/fixtures/002_groups.rb
@@ -2,3 +2,4 @@ Group.ensure_automatic_groups!
 if g = Group.find_by(name: 'trust_level_5', id: 15)
   g.destroy!
 end
+Group.where(name: 'everyone').update_all(visible: false)
diff --git a/db/migrate/20161014171034_add_directory_items_indexes.rb b/db/migrate/20161014171034_add_directory_items_indexes.rb
new file mode 100644
index 0000000000..f6b795cd1c
--- /dev/null
+++ b/db/migrate/20161014171034_add_directory_items_indexes.rb
@@ -0,0 +1,13 @@
+class AddDirectoryItemsIndexes < ActiveRecord::Migration
+  disable_ddl_transaction!
+
+  def change
+    add_index :directory_items, :likes_received, algorithm: :concurrently
+    add_index :directory_items, :likes_given, algorithm: :concurrently
+    add_index :directory_items, :topics_entered, algorithm: :concurrently
+    add_index :directory_items, :topic_count, algorithm: :concurrently
+    add_index :directory_items, :post_count, algorithm: :concurrently
+    add_index :directory_items, :posts_read, algorithm: :concurrently
+    add_index :directory_items, :days_visited, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb b/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb
new file mode 100644
index 0000000000..1f0f5b1a98
--- /dev/null
+++ b/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb
@@ -0,0 +1,14 @@
+class FixCategoryLogoAndBackgroundUrls < ActiveRecord::Migration
+  def up
+    return true if Discourse.asset_host.blank?
+
+    Category.exec_sql <<-SQL
+      UPDATE categories
+         SET logo_url = replace(logo_url, '#{Discourse.asset_host}', '')
+           , background_url = replace(background_url, '#{Discourse.asset_host}', '')
+    SQL
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20161029181306_add_image_url_to_posts.rb b/db/migrate/20161029181306_add_image_url_to_posts.rb
new file mode 100644
index 0000000000..ed9e1ab859
--- /dev/null
+++ b/db/migrate/20161029181306_add_image_url_to_posts.rb
@@ -0,0 +1,5 @@
+class AddImageUrlToPosts < ActiveRecord::Migration
+  def change
+    add_column :posts, :image_url, :string
+  end
+end
diff --git a/db/migrate/20161031183811_add_sort_fields_to_categories.rb b/db/migrate/20161031183811_add_sort_fields_to_categories.rb
new file mode 100644
index 0000000000..991b5484be
--- /dev/null
+++ b/db/migrate/20161031183811_add_sort_fields_to_categories.rb
@@ -0,0 +1,6 @@
+class AddSortFieldsToCategories < ActiveRecord::Migration
+  def change
+    add_column :categories, :sort_order, :string
+    add_column :categories, :sort_ascending, :boolean
+  end
+end
diff --git a/db/migrate/20161102024700_add_post_uploads_indexes.rb b/db/migrate/20161102024700_add_post_uploads_indexes.rb
new file mode 100644
index 0000000000..c8f8ced714
--- /dev/null
+++ b/db/migrate/20161102024700_add_post_uploads_indexes.rb
@@ -0,0 +1,6 @@
+class AddPostUploadsIndexes < ActiveRecord::Migration
+  def change
+    add_index :post_uploads, :post_id
+    add_index :post_uploads, :upload_id
+  end
+end
diff --git a/db/migrate/20161102024818_add_uploaded_avatar_id_index_to_users.rb b/db/migrate/20161102024818_add_uploaded_avatar_id_index_to_users.rb
new file mode 100644
index 0000000000..2e5c6e66e1
--- /dev/null
+++ b/db/migrate/20161102024818_add_uploaded_avatar_id_index_to_users.rb
@@ -0,0 +1,5 @@
+class AddUploadedAvatarIdIndexToUsers < ActiveRecord::Migration
+  def change
+    add_index :users, :uploaded_avatar_id
+  end
+end
diff --git a/db/migrate/20161102024838_add_user_avatars_indexes.rb b/db/migrate/20161102024838_add_user_avatars_indexes.rb
new file mode 100644
index 0000000000..ea1b26f7f7
--- /dev/null
+++ b/db/migrate/20161102024838_add_user_avatars_indexes.rb
@@ -0,0 +1,6 @@
+class AddUserAvatarsIndexes < ActiveRecord::Migration
+  def change
+    add_index :user_avatars, :custom_upload_id
+    add_index :user_avatars, :gravatar_upload_id
+  end
+end
diff --git a/db/migrate/20161102024900_add_user_profiles_indexes.rb b/db/migrate/20161102024900_add_user_profiles_indexes.rb
new file mode 100644
index 0000000000..7a5ce85f26
--- /dev/null
+++ b/db/migrate/20161102024900_add_user_profiles_indexes.rb
@@ -0,0 +1,6 @@
+class AddUserProfilesIndexes < ActiveRecord::Migration
+  def change
+    add_index :user_profiles, :profile_background
+    add_index :user_profiles, :card_background
+  end
+end
diff --git a/db/migrate/20161102024920_add_categories_indexes.rb b/db/migrate/20161102024920_add_categories_indexes.rb
new file mode 100644
index 0000000000..d5ad88f10d
--- /dev/null
+++ b/db/migrate/20161102024920_add_categories_indexes.rb
@@ -0,0 +1,6 @@
+class AddCategoriesIndexes < ActiveRecord::Migration
+  def change
+    add_index :categories, :logo_url
+    add_index :categories, :background_url
+  end
+end
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index a39876babd..c3ff8b9677 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -14,6 +14,7 @@ If you don't already have a Ruby environment that's tuned to your liking, you ca
 2. Clone the Discourse repo and cd into it.
 3. Run `script/osx_dev`.
 4. Review `log/osx_dev.log` to make sure everything finished successfully.
+5. Jump To [Setting up your Discourse](#setting-up-your-discourse)
 
 Of course, it is good to understand what the script is doing and why. The rest of this guide goes through what's happening.
 
@@ -132,7 +133,7 @@ If you get this error when starting `psql` from the command line:
     psql: could not connect to server: No such file or directory
     Is the server running locally and accepting
     connections on Unix domain socket "/tmp/.s.PGSQL.5432"?
-    
+
 it is because it is still looking in the `/tmp` directory and not in `/var/pgsql_socket`.
 
 If running `psql -h /var/pgsql_socket` works then you need to configure the host in your `.bash_profile`:
@@ -152,7 +153,7 @@ However, the seed data currently has some dependencies on their being a 'postgre
 
 In theory, you're not setting up with vagrant, either, and shouldn't need a vagrant user; however, again, all the seed data assumes 'vagrant'. To avoid headaches, it's probably best to go with this flow, so again, we create a 'vagrant' user.
 
-    brew install postgresql # Installs 9.2
+    brew install postgresql
     ln -sfv /usr/local/opt/postgresql/*.plist ~/Library/LaunchAgents
 
     export PATH=/usr/local/opt/postgresql/bin:$PATH # You may want to put this in your default path!
@@ -161,7 +162,7 @@ In theory, you're not setting up with vagrant, either, and shouldn't need a vagr
     launchctl load ~/Library/LaunchAgents/homebrew.mxcl.postgresql.plist
 
 ### Seed data relies on both 'postgres' and 'vagrant'
-    
+
     createuser --createdb --superuser postgres
     createuser --createdb --superuser vagrant
 
@@ -204,7 +205,7 @@ mkdir ~/.magick
 cd ~/.magick
 curl http://www.imagemagick.org/Usage/scripts/imagick_type_gen > type_gen
 find /System/Library/Fonts /Library/Fonts ~/Library/Fonts -name "*.[to]tf" | perl type_gen -f - > type.xml
-cd /usr/local/Cellar/imagemagick/<version>/etc/ImageMagick-6   
+cd /usr/local/Cellar/imagemagick/<version>/etc/ImageMagick-6
 ```
 
 Edit system config file called "type.xml" and add line near end to tell IM to
@@ -230,25 +231,12 @@ outbound email and you can verify what is being sent.
 
 ## Additional Setup Tasks
 
-You may have issues installing therubyracer when running `bundle install`
-because of a dependency on libv8. This is how to fix it:
-
-```sh
-brew tap homebrew/versions
-brew uninstall v8
-brew install v8-315
-gem uninstall -a libv8
-gem uninstall -a therubyracer
-gem install libv8 -v '3.16.14.13' -- --with-system-v8
-gem install therubyracer -v '0.12.2' -- --with-v8-dir=$(brew --prefix v8-315)
-```
-
 In addition to ImageMagick we also need to install some other image related
 software:
 
 ```sh
 brew install gifsicle jpegoptim optipng
-npm install -g svgo 
+npm install -g svgo
 ```
 
 Install jhead
@@ -263,28 +251,31 @@ make install
 ## Setting up your Discourse
 
 ###  Check out the repository
-
-    git@github.com:discourse/discourse.git ~/discourse
-    cd ~/discourse # Navigate into the repository, and stay there for the rest of this how-to
-
+```sh
+git clone git@github.com:discourse/discourse.git
+cd discourse # Navigate into the repository, and stay there for the rest of this how-to
+```
 ### What about the config files?
 
 If you've stuck to all the defaults above, the default `discourse.conf` and `redis.conf` should work out of the box.
 
 ### Install the needed gems
-
-    bundle install # Yes, this DOES take a while. No, it's not really cloning all of rubygems :-)
+```sh
+bundle install
+```
 
 ### Prepare your database
-
-    rake db:migrate
-    rake db:test:prepare
-    rake db:seed_fu
+```sh
+rake db:create
+rake db:migrate
+rake db:test:prepare
+rake db:seed_fu
+```
 
 ## Now, test it out!
-
-    bundle exec rspec
-
+```sh
+bundle exec rspec
+```
 All specs should pass
 
 ### Deal with any problems which arise.
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index ff0a3c2057..5e01cb0e10 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -10,7 +10,7 @@
 
 - The default of **1 GB** RAM works fine for small Discourse communities. We recommend 2 GB RAM for larger communities.
 
-- The default of **Ubuntu 14.04 LTS x64** works fine. At minimum, a 64-bit Linux OS with a kernel version of 3.10+ is required.
+- The default of **Ubuntu 16.04 LTS x64** works fine. At minimum, a 64-bit Linux OS with a kernel version of 3.10+ is required.
 
 - The default of **New York** is a good choice for most US and European audiences. Or select a region that is geographically closer to your audience.
 
@@ -22,7 +22,7 @@ Connect to your server via its IP address using SSH, or [Putty][put] on Windows:
 
     ssh root@192.168.1.1
 
-Enter the root password from the email DigitalOcean sent you when the server was set up. You may be prompted to change the root password, too.
+Enter the root password from the email DigitalOcean sent you when the server was set up. You will be prompted to change the root password.
 
 <img src="https://www.discourse.org/images/install/15/ssh-login-terminal.png" width="600px">
 
@@ -43,6 +43,16 @@ Create a `/var/discourse` folder, clone the [Official Discourse Docker Image][dd
 
 You will need to be root through the rest of the setup and bootstrap process.
 
+### Email
+
+> ⚠️ **Email is CRITICAL for account creation and notifications in Discourse.** If you do not properly configure email before bootstrapping YOU WILL HAVE A BROKEN SITE!
+
+- Already have a mail server? Great. Use your existing mail server credentials.
+
+- No existing mail server? Check out our [**Recommended Email Providers for Discourse**][mailconfig].
+
+- For proper email deliverability, you must add valid SPF and DKIM TXT records in your DNS. See your email provider instructions for specifics.
+
 ### Edit Discourse Configuration
 
 Launch the setup tool at
@@ -58,37 +68,31 @@ Answer the following questions when prompted:
     SMTP port [587]:
     SMTP password? []: 
 
-This will generate an `app.yml` configuration file on your behalf, and then kicks off bootstrap. Bootstrapping takes between **2-8 minutes** to set up your Discourse.
-
-### Email Is Important
-
-**Email is CRITICAL for account creation and notifications in Discourse. If you do not properly configure email before bootstrapping YOU WILL HAVE A BROKEN SITE!**
-
-- Already have a mail server? Great. Use your existing mail server credentials.
-
-- No existing mail server? Check out our [**Recommended Email Providers for Discourse**][mailconfig].
-
-- For proper email deliverability, add valid SPF and DKIM records in your DNS. See your email provider instructions for specifics.
-
-If you need to change or fix your email settings after bootstrapping, edit your `app.yml` file and `./launcher rebuild app`, otherwise your changes will not take effect.
+This will generate an `app.yml` configuration file on your behalf, and then kicks off bootstrap. Bootstrapping takes between **2-8 minutes** to set up your Discourse. If you need to change or fix these settings after bootstrapping, edit your `/containers/app.yml` file and `./launcher rebuild app`, otherwise your changes will not take effect.
 
 ### Start Discourse
 
  Once bootstrapping is complete, your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`.
 
-<img src="https://www.discourse.org/images/install/15/browser-discourse-installed.png">
+<img src="https://www.discourse.org/images/install/17/discourse-congrats.png" width="650">
 
 ### Register New Account and Become Admin
 
 Register a new admin account using one of the email addresses you entered before bootstrapping.
 
-If you are unable to register your admin account, check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326).
+<img src="https://www.discourse.org/images/install/17/discourse-register.png" width="650">
 
-<img src="https://www.discourse.org/images/install/14/browser-logged-in-first-admin.png?v=1">
+<img src="https://www.discourse.org/images/install/17/discourse-activate.png" width="650">
 
-You should see Staff topics and **READ ME FIRST: Admin Quick Start Guide**. This guide contains the next steps for further configuring and customizing your Discourse install as an administrator. Read it closely!
+(If you are unable to register your admin account, check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326).)
 
-(If you are still unable to register a new admin account via email, see [Create Admin Account from Console](https://meta.discourse.org/t/create-admin-account-from-console/17274), but note that *you will have a broken site* unless you get email working.)
+After registering your admin account, the setup wizard will launch and guide you through basic configuration of your Discourse.
+
+<img src="https://www.discourse.org/images/install/17/discourse-wizard-step-1.png" width="650">
+
+After completing the setup wizard, you should see Staff topics and **READ ME FIRST: Admin Quick Start Guide**. This guide contains advice for further configuring and customizing your Discourse install.
+
+<img src="https://www.discourse.org/images/install/17/discourse-homepage.png">
 
 ### Post-Install Maintenance
 
diff --git a/docs/TROUBLESHOOTING-prod.md b/docs/TROUBLESHOOTING-prod.md
deleted file mode 100644
index 106cfd047d..0000000000
--- a/docs/TROUBLESHOOTING-prod.md
+++ /dev/null
@@ -1,86 +0,0 @@
-## Troubleshooting issues with Discourse environments
-
-Are you having trouble setting up Discourse? Here are some basic things to
-check before reaching out to the community for help:
-
-1. Are you running Ruby 2.0 or later?
-
-   Discourse is designed for Ruby 2.0 or later. You can check your version by
-typing `ruby -v` (as the discourse user) and checking the response for
-something like:
-
-    `ruby 2.0.0p195 (2013-05-14 revision 40734) [x86_64-linux]`
-
-
-1. Are you on Postgres 9.3 or later with HSTORE enabled?
-
-   You can check your postgres version by typing `psql --version`. To see if
-hstore is installed, open a session to postgres and type `\dx` and see if
-hstore is listed.
-
-
-1. Have you run `bundle install`?
-
-   We frequently update our dependencies to newer versions. It is a good idea
-to run `bundle install` every time you check out Discourse, especially if it's
-been a while.
-
-1. Did you run `bundle update`?
-
-   Don't. Running `bundle update` will download gem versions that we haven't
-tested with.  The Gemfile.lock has the gem versions that Discourse currently
-uses, so `bundle install` will work.  If you ran update, then you should
-uninstall the gems, run `git checkout -- Gemfile.lock` and then run `bundle
-install`.
-
-1. Have you migrated your database?
-
-   Our schema changes fairly frequently. After checking out the source code,
-you should run `rake db:migrate`.
-
-1. Do the tests pass?
-
-   If you are having other problems, it's useful to know if the test suite
-passes. You can run it by first using `rake db:test:prepare` and then `rake
-spec`. If you experience any failures, that's a bad sign! Our master branch
-should *always* pass every test.
-
-1. Have you updated host_names in your database.yml?
-
-   If links in emails have localhost in them, then you are still using the
-default `host_names` value in database.yml.  Update it to use your site's host
-name(s).
-
-1. Are you having problems bundling:
-
-```
-ArgumentError: invalid byte sequence in US-ASCII
-An error occurred while installing active_model_serializers (0.7.0), and Bundler cannot continue.
-Make sure that `gem install active_model_serializers -v '0.7.0'` succeeds before bundling.
-```
-
-   Try this in console:
-
-```
-$ export LANG="en_US.UTF-8"
-$ export LC_ALL="en_US.UTF-8"
-```
-
-   And/or this in top of `Gemfile`:
-
-```
-if RUBY_VERSION =~ /1.9/
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-end
-```
-
----
-
-Check your ~/discourse/log/production.log file if you are getting HTTP 500
-errors.
-
-Some common situations:
-
-**Problem:** `ActiveRecord::StatementInvalid (PG::Error: ERROR:  column X does not exist`
-**Solution**: run `db:migrate` task to apply migrations to the database
diff --git a/lib/auth/facebook_authenticator.rb b/lib/auth/facebook_authenticator.rb
index e117450b9f..f7f90cb26b 100644
--- a/lib/auth/facebook_authenticator.rb
+++ b/lib/auth/facebook_authenticator.rb
@@ -7,7 +7,6 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
   end
 
   def after_authenticate(auth_token)
-
     result = Auth::Result.new
 
     session_info = parse_auth_token(auth_token)
@@ -20,37 +19,16 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
     result.extra_data = facebook_hash
 
     user_info = FacebookUserInfo.find_by(facebook_user_id: facebook_hash[:facebook_user_id])
+
     result.user = user_info.try(:user)
-
     if !result.user && !email.blank? && result.user = User.find_by_email(email)
-      FacebookUserInfo.create({user_id: result.user.id}.merge(facebook_hash))
+      FacebookUserInfo.create({ user_id: result.user.id }.merge(facebook_hash))
     end
 
-    if user_info
-      user_info.update_columns(facebook_hash)
-    end
+    user_info.update_columns(facebook_hash) if user_info
 
-    user = result.user
-    if user && (!user.user_avatar || user.user_avatar.custom_upload_id.nil?)
-      if (avatar_url = facebook_hash[:avatar_url]).present?
-        avatar_url_with_parameters = add_avatar_parameters(avatar_url)
-        UserAvatar.import_url_for_user(avatar_url_with_parameters, user, override_gravatar: false)
-      end
-    end
-
-
-    bio = facebook_hash[:about_me] || facebook_hash[:about]
-    location = facebook_hash[:location]
-    website = facebook_hash[:website]
-
-    if user && (bio || location || website)
-      profile = user.user_profile
-
-      profile.bio_raw = bio unless profile.bio_raw.present?
-      profile.location = location unless profile.location.present?
-      profile.website = website unless profile.website.present?
-      profile.save
-    end
+    retrieve_avatar(result.user, result.extra_data)
+    retrieve_profile(result.user, result.extra_data)
 
     if email.blank?
       UserHistory.create(
@@ -63,32 +41,16 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
   end
 
   def after_create_account(user, auth)
-    data = auth[:extra_data]
-    FacebookUserInfo.create({user_id: user.id}.merge(data))
+    extra_data = auth[:extra_data]
+    FacebookUserInfo.create({ user_id: user.id }.merge(extra_data))
 
-
-    if (avatar_url = data[:avatar_url]).present?
-      avatar_url_with_parameters = add_avatar_parameters(avatar_url)
-      UserAvatar.import_url_for_user(avatar_url_with_parameters, user)
-      user.save
-    end
-
-    bio = data[:about_me]
-    location = data[:location]
-    website = data[:website]
-
-    if bio || location || website
-      user.user_profile.bio_raw = bio
-      user.user_profile.location = location
-      user.user_profile.website = website
-      user.user_profile.save
-    end
+    retrieve_avatar(user, extra_data)
+    retrieve_profile(user, extra_data)
 
     true
   end
 
   def register_middleware(omniauth)
-
     omniauth.provider :facebook,
            :setup => lambda { |env|
               strategy = env["omniauth.strategy"]
@@ -104,38 +66,58 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
 
   protected
 
-  def parse_auth_token(auth_token)
+    def parse_auth_token(auth_token)
+      raw_info = auth_token["extra"]["raw_info"]
+      info = auth_token["info"]
 
-    raw_info = auth_token["extra"]["raw_info"]
-    info = auth_token["info"]
+      email = auth_token["info"][:email]
 
-    email = auth_token["info"][:email]
+      website = (info["urls"] && info["urls"]["Website"]) || nil
 
-    website = (info["urls"] && info["urls"]["Website"]) || nil
-
-    {
-      facebook: {
-        facebook_user_id: auth_token["uid"],
-        link: raw_info["link"],
-        username: raw_info["username"],
-        first_name: raw_info["first_name"],
-        last_name: raw_info["last_name"],
+      {
+        facebook: {
+          facebook_user_id: auth_token["uid"],
+          link: raw_info["link"],
+          username: raw_info["username"],
+          first_name: raw_info["first_name"],
+          last_name: raw_info["last_name"],
+          email: email,
+          gender: raw_info["gender"],
+          name: raw_info["name"],
+          avatar_url: info["image"],
+          location: info["location"],
+          website: website,
+          about_me: info["description"]
+        },
         email: email,
-        gender: raw_info["gender"],
-        name: raw_info["name"],
-        avatar_url: info["image"],
-        location: info["location"],
-        website: website,
-        about_me: info["description"]
-      },
-      email: email,
-      email_valid: true
-    }
+        email_valid: true
+      }
+    end
 
-  end
+    def retrieve_avatar(user, data)
+      return unless user
+      return if user.user_avatar.try(:custom_upload_id).present?
 
-  def add_avatar_parameters(avatar_url)
-    "#{avatar_url}?height=#{AVATAR_SIZE}&width=#{AVATAR_SIZE}"
-  end
+      if (avatar_url = data[:avatar_url]).present?
+        url = "#{avatar_url}?height=#{AVATAR_SIZE}&width=#{AVATAR_SIZE}"
+        Jobs.enqueue(:download_avatar_from_url, url: url, user_id: user.id, override_gravatar: false)
+      end
+    end
+
+    def retrieve_profile(user, data)
+      return unless user
+
+      bio = data[:about_me] || data[:about]
+      location = data[:location]
+      website = data[:website]
+
+      if bio || location || website
+        profile = user.user_profile
+        profile.bio_raw  = bio      unless profile.bio_raw.present?
+        profile.location = location unless profile.location.present?
+        profile.website  = website  unless profile.website.present?
+        profile.save
+      end
+    end
 
 end
diff --git a/lib/auth/twitter_authenticator.rb b/lib/auth/twitter_authenticator.rb
index fae7083606..c5f91c0477 100644
--- a/lib/auth/twitter_authenticator.rb
+++ b/lib/auth/twitter_authenticator.rb
@@ -51,6 +51,8 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
 
     retrieve_avatar(user, extra_data)
     retrieve_profile(user, extra_data)
+
+    true
   end
 
   def register_middleware(omniauth)
@@ -62,27 +64,30 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
            }
   end
 
-  def retrieve_avatar(user, data)
-    return unless user
-    return if user.user_avatar.try(:custom_upload_id).present?
+  protected
 
-    if (avatar_url = data[:twitter_image]).present?
-      UserAvatar.import_url_for_user(avatar_url.sub("_normal", ""), user, override_gravatar: false)
+    def retrieve_avatar(user, data)
+      return unless user
+      return if user.user_avatar.try(:custom_upload_id).present?
+
+      if (avatar_url = data[:twitter_image]).present?
+        url = avatar_url.sub("_normal", "")
+        Jobs.enqueue(:download_avatar_from_url, url: url, user_id: user.id, override_gravatar: false)
+      end
     end
-  end
 
-  def retrieve_profile(user, data)
-    return unless user
+    def retrieve_profile(user, data)
+      return unless user
 
-    bio = data[:twitter_description]
-    location = data[:twitter_location]
+      bio = data[:twitter_description]
+      location = data[:twitter_location]
 
-    if user && (bio || location)
-      profile = user.user_profile
-      profile.bio_raw  = bio      unless profile.bio_raw.present?
-      profile.location = location unless profile.location.present?
-      profile.save
+      if bio || location
+        profile = user.user_profile
+        profile.bio_raw  = bio      unless profile.bio_raw.present?
+        profile.location = location unless profile.location.present?
+        profile.save
+      end
     end
-  end
 
 end
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 5b1fa3a474..5f06261c1b 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -84,7 +84,7 @@ class CookedPostProcessor
       convert_to_link!(img)
     end
 
-    update_topic_image
+    update_post_image
   end
 
   def extract_images
@@ -100,7 +100,7 @@ class CookedPostProcessor
     @doc.css(".quote img")
   end
 
-  def extract_images_for_topic
+  def extract_images_for_post
     # all image with a src attribute
     @doc.css("img[src]") -
     # minus, emojis
@@ -285,10 +285,11 @@ class CookedPostProcessor
     span
   end
 
-  def update_topic_image
-    if @post.is_first_post?
-      img = extract_images_for_topic.first
-      @post.topic.update_column(:image_url, img["src"][0...255]) if img["src"].present?
+  def update_post_image
+    img = extract_images_for_post.first
+    if img["src"].present?
+      @post.update_column(:image_url, img["src"][0...255]) # post
+      @post.topic.update_column(:image_url, img["src"][0...255]) if @post.is_first_post? # topic
     end
   end
 
diff --git a/lib/discourse.rb b/lib/discourse.rb
index c0be4dea17..666c9292f7 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -328,6 +328,9 @@ module Discourse
 
     # in case v8 was initialized we want to make sure it is nil
     PrettyText.reset_context
+
+    Tilt::ES6ModuleTranspilerTemplate.reset_context if defined? Tilt::ES6ModuleTranspilerTemplate
+    JsLocaleHelper.reset_context if defined? JsLocaleHelper
     nil
   end
 
diff --git a/lib/discourse_cookie_store.rb b/lib/discourse_cookie_store.rb
new file mode 100644
index 0000000000..23745a7913
--- /dev/null
+++ b/lib/discourse_cookie_store.rb
@@ -0,0 +1,16 @@
+class ActionDispatch::Session::DiscourseCookieStore < ActionDispatch::Session::CookieStore
+  def initialize(app, options={})
+    super(app,options)
+  end
+
+  private
+
+  def set_cookie(request, session_id, cookie)
+    if Hash === cookie
+      if SiteSetting.force_https
+        cookie[:secure] = true
+      end
+    end
+    cookie_jar(request)[@key] = cookie
+  end
+end
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index d377464182..6e58a70434 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -133,12 +133,14 @@ module Email
       @message.header['X-Discourse-Post-Id']   = nil if post_id.present?
       @message.header['X-Discourse-Reply-Key'] = nil if reply_key.present?
 
-      # pass the original message_id when using mailjet/mandrill
+      # pass the original message_id when using mailjet/mandrill/sparkpost
       case ActionMailer::Base.smtp_settings[:address]
       when /\.mailjet\.com/
         @message.header['X-MJ-CustomID'] = @message.message_id
       when "smtp.mandrillapp.com"
-        @message.header['X-MC-Metadata'] = { message_id: @message.message_id }.to_json
+        merge_json_x_header('X-MC-Metadata', { message_id: @message.message_id })
+      when "smtp.sparkpostmail.com"
+        merge_json_x_header('X-MSYS-API', { metadata: { message_id: @message.message_id } })
       end
 
       # Suppress images from short emails
@@ -200,5 +202,13 @@ module Email
       )
     end
 
+    def merge_json_x_header(name, value)
+      mc_metadata   = JSON.parse(@message.header[name].to_s) rescue nil
+      mc_metadata ||= {}
+      mc_metadata.merge!(value)
+      @message.header[name] = nil
+      @message.header[name] = mc_metadata.to_json
+    end
+
   end
 end
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 9186bb3f13..cb20f3dca1 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -129,13 +129,18 @@ module Email
       # iframes can't go in emails, so replace them with clickable links
       @fragment.css('iframe').each do |i|
         begin
-          src_uri = URI(i['src'])
+          # sometimes, iframes are blacklisted...
+          if i["src"].blank?
+            i.remove
+            next
+          end
 
+          src_uri = URI(i['src'])
           # If an iframe is protocol relative, use SSL when displaying it
           display_src = "#{src_uri.scheme || 'https'}://#{src_uri.host}#{src_uri.path}#{src_uri.query.nil? ? '' : '?' + src_uri.query}#{src_uri.fragment.nil? ? '' : '#' + src_uri.fragment}"
           i.replace "<p><a href='#{src_uri.to_s}'>#{CGI.escapeHTML(display_src)}</a><p>"
         rescue URI::InvalidURIError
-          # If the URL is weird, remove it
+          # If the URL is weird, remove the iframe
           i.remove
         end
       end
diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
index cc3c785cb0..d18afbf3c9 100644
--- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
+++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
@@ -33,6 +33,10 @@ JS
       ctx
     end
 
+    def self.reset_context
+      @ctx = nil
+    end
+
     def self.v8
       return @ctx if @ctx
 
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index ea643aa782..888e99e413 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -54,6 +54,18 @@ end
 class Ember::Handlebars::Template
   include Discourse::Ember::Handlebars::Helper
 
+  def precompile_handlebars(string, input=nil)
+    "require('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
+  end
+
+  def compile_handlebars(string, input=nil)
+    "require('discourse-common/lib/raw-handlebars').compile(#{indent(string).inspect});"
+  end
+
+  def global_template_target(namespace, module_name, config)
+    "#{namespace}[#{template_path(module_name, config).inspect}]"
+  end
+
   # FIXME: Previously, ember-handlebars-templates uses the logical path which incorrectly
   # returned paths with the `.raw` extension and our code is depending on the `.raw`
   # to find the right template to use.
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 708bdc9064..e8550b1b88 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -165,6 +165,10 @@ module JsLocaleHelper
     result
   end
 
+  def self.reset_context
+    @ctx = nil
+  end
+
   @mutex = Mutex.new
   def self.with_context
     @mutex.synchronize do
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 4a1bcb0803..90b36890d0 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -78,6 +78,9 @@ class Middleware::RequestTracker
     host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
+      if result && (headers=result[1])
+        headers["X-Discourse-TrackView"] = "1" if data[:track_view]
+      end
       log_later(data,host)
     end
 
diff --git a/lib/onebox/engine/whitelisted_generic_onebox.rb b/lib/onebox/engine/whitelisted_generic_onebox.rb
new file mode 100644
index 0000000000..1ea9a90892
--- /dev/null
+++ b/lib/onebox/engine/whitelisted_generic_onebox.rb
@@ -0,0 +1,17 @@
+module Onebox
+  module Engine
+    class WhitelistedGenericOnebox
+
+      # overwrite the whitelist
+      def self.===(other)
+        true
+      end
+
+      # ensure we're the last engine to be used
+      def self.priority
+        Float::INFINITY
+      end
+
+    end
+  end
+end
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 8430d9ff98..db6f184901 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -1,11 +1,6 @@
-
-Dir["#{Rails.root}/lib/onebox/engine/*_onebox.rb"].each {|f|
-  require_dependency(f.split('/')[-3..-1].join('/'))
-}
+Dir["#{Rails.root}/lib/onebox/engine/*_onebox.rb"].sort.each { |f| require f }
 
 module Oneboxer
-
-
   # keep reloaders happy
   unless defined? Oneboxer::Result
     Result = Struct.new(:doc, :changed) do
@@ -120,38 +115,29 @@ module Oneboxer
   end
 
   private
-  def self.onebox_cache_key(url)
-    "onebox__#{url}"
-  end
 
-  def self.add_discourse_whitelists
-    # Add custom domain whitelists
-    if SiteSetting.onebox_domains_whitelist.present?
-      domains = SiteSetting.onebox_domains_whitelist.split('|')
-      whitelist = Onebox::Engine::WhitelistedGenericOnebox.whitelist
-      whitelist.concat(domains)
-      whitelist.uniq!
+    def self.blank_onebox
+      { preview: "", onebox: "" }
     end
-  end
 
-  def self.onebox_raw(url)
-    Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day){
-      # This might be able to move to whenever the SiteSetting changes?
-      Oneboxer.add_discourse_whitelists
+    def self.onebox_cache_key(url)
+      "onebox__#{url}"
+    end
 
-      r = Onebox.preview(url, cache: {}, max_width: 695)
-      {
-        onebox: r.to_s,
-        preview: r.try(:placeholder_html).to_s
-      }
-    }
-  rescue => e
-    # no point warning here, just cause we have an issue oneboxing a url
-    # we can later hunt for failed oneboxes by searching logs if needed
-    Rails.logger.info("Failed to onebox #{url} #{e} #{e.backtrace}")
+    def self.onebox_raw(url)
+      Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
+        uri = URI(url) rescue nil
+        return blank_onebox if uri.blank? || SiteSetting.onebox_domains_blacklist.include?(uri.hostname)
 
-    # return a blank hash, so rest of the code works
-    {preview: "", onebox: ""}
-  end
+        r = Onebox.preview(url, cache: {}, max_width: 695)
+        { onebox: r.to_s, preview: r.try(:placeholder_html).to_s }
+      end
+    rescue => e
+      # no point warning here, just cause we have an issue oneboxing a url
+      # we can later hunt for failed oneboxes by searching logs if needed
+      Rails.logger.info("Failed to onebox #{url} #{e} #{e.backtrace}")
+      # return a blank hash, so rest of the code works
+      blank_onebox
+    end
 
 end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index a9de8e4698..c1f9660c37 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -203,6 +203,11 @@ class Plugin::Instance
     end
   end
 
+  def register_seedfu_fixtures(paths)
+    paths = [paths] if !paths.kind_of?(Array)
+    SeedFu.fixture_paths.concat(paths)
+  end
+
   def listen_for(event_name)
     return unless self.respond_to?(event_name)
     DiscourseEvent.on(event_name, &self.method(event_name))
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 65ee570e8d..3fb3b01550 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -348,12 +348,9 @@ module SiteSettingExtension
   end
 
   def filter_value(name, value)
-    # filter domain name
-    if %w[disabled_image_download_domains onebox_domains_whitelist exclude_rel_nofollow_domains email_domains_blacklist email_domains_whitelist white_listed_spam_host_domains].include? name
+    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.push(get_hostname(url))
-      }
+      value.split('|').each { |url| domain_array << get_hostname(url) }
       value = domain_array.join("|")
     end
     value
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index baf93ce58f..f13cbbd8bc 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -450,6 +450,15 @@ class TopicQuery
           result = result.where('categories.id = :category_id OR (categories.parent_category_id = :category_id AND categories.topic_id <> topics.id)', category_id: category_id)
         end
         result = result.references(:categories)
+
+        if !@options[:order]
+          # category default sort order
+          sort_order, sort_ascending = Category.where(id: category_id).pluck(:sort_order, :sort_ascending).first
+          if sort_order
+            options[:order] = sort_order
+            options[:ascending] = !!sort_ascending ? 'true' : 'false'
+          end
+        end
       end
 
       # ALL TAGS: something like this?
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 7c93adb869..122e2bace6 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -180,8 +180,12 @@ class TopicView
 
   def image_url
     if @post_number.present? && @post_number.to_i != 1 && @desired_post.present?
-      # show poster avatar
-      @desired_post.user.avatar_template_url.gsub("{size}", "100") if @desired_post.user
+      if @desired_post.image_url.present?
+        @desired_post.image_url
+      elsif @desired_post.user
+        # show poster avatar
+        @desired_post.user.avatar_template_url.gsub("{size}", "100")
+      end
     else
       @topic.image_url
     end
diff --git a/lib/version.rb b/lib/version.rb
index 5dcf4ea1f9..49b840dea1 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 7
       TINY  = 0
-      PRE   = 'beta6'
+      PRE   = 'beta7'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/lib/wizard.rb b/lib/wizard.rb
index 2e1689c5b6..ab6c5c33c0 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -82,11 +82,15 @@ class Wizard
                       .where.not(auth_token_updated_at: nil)
                       .order(:auth_token_updated_at)
 
-    @user.present? && first_admin.first == @user && !completed? && (Topic.count < 15)
+    if @user.present? && first_admin.first == @user && (Topic.count < 15)
+      !Wizard::Builder.new(@user).build.completed?
+    else
+      false
+    end
   end
 
   def self.user_requires_completion?(user)
-    Wizard::Builder.new(user).build.requires_completion?
+    self.new(user).requires_completion?
   end
 
 end
diff --git a/plugins/discourse-details/config/locales/client.it.yml b/plugins/discourse-details/config/locales/client.it.yml
new file mode 100644
index 0000000000..d5027e4686
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.it.yml
@@ -0,0 +1,7 @@
+it:
+  js:
+    details:
+      title: Nascondi Dettagli
+    composer:
+      details_title: Summary
+      details_text: "Questo testo verrà nascosto"
diff --git a/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6 b/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
index 34950f184d..b05cf20539 100644
--- a/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
+++ b/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
@@ -1,18 +1,35 @@
 import { withPluginApi } from 'discourse/lib/plugin-api';
 
+const returnFalse = () => false;
+
 export default {
   name: "apply-lazyYT",
   initialize() {
     withPluginApi('0.1', api => {
-      api.decorateCooked($elem => $('.lazyYT', $elem).lazyYT({
-        onPlay(e, $el) {
-          // don't cloak posts that have playing videos in them
-          const postId = parseInt($el.closest('article').data('post-id'));
-          if (postId) {
-            api.preventCloak(postId);
+      api.decorateCooked($elem => {
+
+        const iframes = $('.lazyYT', $elem);
+        if (iframes.length === 0) { return; }
+
+        // We use this because watching videos fullscreen in Chrome was super buggy
+        // otherwise. Thanks to arrendek from q23 for the technique.
+        $elem.iframeTracker({ blurCallback: () => {
+          $(document).on("scroll.discourse-youtube", returnFalse);
+          window.setTimeout(() => $(document).off('scroll.discourse-youtube', returnFalse), 1500);
+          $(document).scroll();
+        }});
+
+        $('.lazyYT', $elem).lazyYT({
+          onPlay(e, $el) {
+            // don't cloak posts that have playing videos in them
+            const postId = parseInt($el.closest('article').data('post-id'));
+            if (postId) {
+              api.preventCloak(postId);
+            }
           }
-        }
-      }));
+        });
+
+      });
     });
   }
 };
diff --git a/plugins/lazyYT/assets/javascripts/jquery.iframetracker.js b/plugins/lazyYT/assets/javascripts/jquery.iframetracker.js
new file mode 100644
index 0000000000..595633ea81
--- /dev/null
+++ b/plugins/lazyYT/assets/javascripts/jquery.iframetracker.js
@@ -0,0 +1,165 @@
+/**
+ * jQuery iframe click tracking plugin
+ *
+ * @author Vincent Paré (www.finalclap.com)
+ * @copyright © 2013-2015 Vincent Paré
+ * @license http://opensource.org/licenses/Apache-2.0
+ * @version 1.1.0
+ */
+(function($){
+	// Tracking handler manager
+	$.fn.iframeTracker = function(handler){
+		var target = this.get();
+		if (handler === null || handler === false) {
+			$.iframeTracker.untrack(target);
+		} else if (typeof handler == "object") {
+			$.iframeTracker.track(target, handler);
+		} else {
+			throw new Error("Wrong handler type (must be an object, or null|false to untrack)");
+		}
+	};
+	
+	// Iframe tracker common object
+	$.iframeTracker = {
+		// State
+		focusRetriever: null,  // Element used for restoring focus on window (element)
+		focusRetrieved: false, // Says if the focus was retrived on the current page (bool)
+		handlersList: [],      // Store a list of every trakers (created by calling $(selector).iframeTracker...)
+		isIE8AndOlder: false,  // true for Internet Explorer 8 and older
+		
+		// Init (called once on document ready)
+		init: function(){
+			// Determine browser version (IE8-) ($.browser.msie is deprecated since jQuery 1.9)
+			try {
+				if ($.browser.msie == true && $.browser.version < 9) {
+					this.isIE8AndOlder = true;
+				}
+			} catch(ex) {
+				try {
+					var matches = navigator.userAgent.match(/(msie) ([\w.]+)/i);
+					if (matches[2] < 9) {
+						this.isIE8AndOlder = true;
+					}
+				} catch(ex2) {}
+			}
+			
+			// Listening window blur
+			$(window).focus();
+			$(window).blur(function(e){
+				$.iframeTracker.windowLoseFocus(e);
+			});
+			
+			// Focus retriever (get the focus back to the page, on mouse move)
+			$('body').append('<div style="position:fixed; top:0; left:0; overflow:hidden;"><input style="position:absolute; left:-300px;" type="text" value="" id="focus_retriever" readonly="true" /></div>');
+			this.focusRetriever = $('#focus_retriever');
+			this.focusRetrieved = false;
+			$(document).mousemove(function(e){
+				if (document.activeElement && document.activeElement.tagName == 'IFRAME') {
+					$.iframeTracker.focusRetriever.focus();
+					$.iframeTracker.focusRetrieved = true;
+				}
+			});
+			
+			// Special processing to make it work with my old friend IE8 (and older) ;)
+			if (this.isIE8AndOlder) {
+				// Blur doesn't works correctly on IE8-, so we need to trigger it manually
+				this.focusRetriever.blur(function(e){
+					e.stopPropagation();
+					e.preventDefault();
+					$.iframeTracker.windowLoseFocus(e);
+				});
+				
+				// Keep focus on window (fix bug IE8-, focusable elements)
+				$('body').click(function(e){ $(window).focus(); });
+				$('form').click(function(e){ e.stopPropagation(); });
+				
+				// Same thing for "post-DOMready" created forms (issue #6)
+				try {
+					$('body').on('click', 'form', function(e){ e.stopPropagation(); });
+				} catch(ex) {
+					console.log("[iframeTracker] Please update jQuery to 1.7 or newer. (exception: " + ex.message + ")");
+				}
+			}
+		},
+		
+		
+		// Add tracker to target using handler (bind boundary listener + register handler)
+		// target: Array of target elements (native DOM elements)
+		// handler: User handler object
+		track: function(target, handler){
+			// Adding target elements references into handler
+			handler.target = target;
+			
+			// Storing the new handler into handler list
+			$.iframeTracker.handlersList.push(handler);
+			
+			// Binding boundary listener
+			$(target)
+				.bind('mouseover', {handler: handler}, $.iframeTracker.mouseoverListener)
+				.bind('mouseout',  {handler: handler}, $.iframeTracker.mouseoutListener);
+		},
+		
+		// Remove tracking on target elements
+		// target: Array of target elements (native DOM elements)
+		untrack: function(target){
+			if (typeof Array.prototype.filter != "function") {
+				console.log("Your browser doesn't support Array filter, untrack disabled");
+				return;
+			}
+			
+			// Unbinding boundary listener
+			$(target).each(function(index){
+				$(this)
+					.unbind('mouseover', $.iframeTracker.mouseoverListener)
+					.unbind('mouseout', $.iframeTracker.mouseoutListener);
+			});
+			
+			// Handler garbage collector
+			var nullFilter = function(value){
+				return value === null ? false : true;
+			};
+			for (var i in this.handlersList) {
+				// Prune target
+				for (var j in this.handlersList[i].target) {
+					if ($.inArray(this.handlersList[i].target[j], target) !== -1) {
+						this.handlersList[i].target[j] = null;
+					}
+				}
+				this.handlersList[i].target = this.handlersList[i].target.filter(nullFilter);
+				
+				// Delete handler if unused
+				if (this.handlersList[i].target.length == 0) {
+					this.handlersList[i] = null;
+				}
+			}
+			this.handlersList = this.handlersList.filter(nullFilter);
+		},
+		
+		// Target mouseover event listener
+		mouseoverListener: function(e){
+			e.data.handler.over = true;
+			try {e.data.handler.overCallback(this);} catch(ex) {}
+		},
+		
+		// Target mouseout event listener
+		mouseoutListener: function(e){
+			e.data.handler.over = false;
+			$.iframeTracker.focusRetriever.focus();
+			try {e.data.handler.outCallback(this);} catch(ex) {}
+		},
+		
+		// Calls blurCallback for every handler with over=true on window blur
+		windowLoseFocus: function(event){
+			for (var i in this.handlersList) {
+				if (this.handlersList[i].over == true) {
+					try {this.handlersList[i].blurCallback();} catch(ex) {}
+				}
+			}
+		}
+	};
+	
+	// Init the iframeTracker on document ready
+	$(document).ready(function(){
+		$.iframeTracker.init();
+	});
+})(jQuery);
\ No newline at end of file
diff --git a/plugins/lazyYT/plugin.rb b/plugins/lazyYT/plugin.rb
index 70475b73af..dc1e7da256 100644
--- a/plugins/lazyYT/plugin.rb
+++ b/plugins/lazyYT/plugin.rb
@@ -6,6 +6,7 @@
 
 # javascript
 register_asset "javascripts/lazyYT.js"
+register_asset "javascripts/jquery.iframetracker.js"
 
 # stylesheet
 register_asset "stylesheets/lazyYT.css"
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index a57195303e..391a5d76ac 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -2,7 +2,6 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor
 import InputValidation from 'discourse/models/input-validation';
 
 export default Ember.Controller.extend({
-  needs: ['modal'],
   numberPollType: 'number',
   multiplePollType: 'multiple',
 
diff --git a/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6
index 6ce0bf5820..5214483436 100644
--- a/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6
@@ -1,8 +1,6 @@
 import ModalBodyView from "discourse/views/modal-body";
 
 export default ModalBodyView.extend({
-  needs: ['modal'],
-
   templateName: 'modals/poll-ui-builder',
   title: I18n.t("poll.ui_builder.title")
 });
diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml
index 2caceb3c6e..f987ea6693 100644
--- a/plugins/poll/config/locales/client.nb_NO.yml
+++ b/plugins/poll/config/locales/client.nb_NO.yml
@@ -32,3 +32,17 @@ nb_NO:
         title: "Lukk avstemming"
         label: "Lukk"
         confirm: "Er du sikker på at du vil lukke avstemmingen?"
+      error_while_casting_votes: "Beklager, det oppstod en feil når du ga din stemme."
+      ui_builder:
+        insert: 'Sett inn avstemming '
+        help:
+          options_count: Må inneholde minst 2 alternativer
+        poll_type:
+          regular: Enkelt valg
+          multiple: Flere valg
+          number: Nummer vurdering
+        poll_config:
+          max: Maks
+          step: skritt
+        poll_public:
+          label: Se hvem som har stemt
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index 9153574ea8..fd11a05cd2 100644
--- a/plugins/poll/config/locales/client.pt.yml
+++ b/plugins/poll/config/locales/client.pt.yml
@@ -16,7 +16,7 @@ pt:
         other: "total de votos"
       average_rating: "Classificação média: <strong>%{average}</strong>."
       public:
-        title: "Votos são públicos"
+        title: "Votos são públicos."
       multiple:
         help:
           at_least_min_options:
@@ -33,25 +33,25 @@ pt:
         title: "Votar"
         label: "Vote agora!"
       show-results:
-        title: "Exibir resultados da votação"
+        title: "Exibir resultados da sondagem"
         label: "Mostrar resultados"
       hide-results:
         title: "Voltar aos meus votos"
         label: "Ocultar resultados"
       open:
-        title: "Abrir a votação"
+        title: "Abrir a sondagem"
         label: "Abrir"
-        confirm: "Tem a certeza que quer abrir esta votação?"
+        confirm: "Tem a certeza que quer abrir esta sondagem?"
       close:
-        title: "Fechar a votação"
+        title: "Fechar a sondagem"
         label: "Fechar"
-        confirm: "Tem a certeza que quer fechar esta votação?"
-      error_while_toggling_status: "Pedimos desculpa, ocorreu um erro ao mudar o estado deste inquérito."
+        confirm: "Tem a certeza que quer fechar esta sondagem?"
+      error_while_toggling_status: "Pedimos desculpa, ocorreu um erro ao mudar o estado desta sondagem."
       error_while_casting_votes: "Pedimos desculpa, ocorreu um erro ao submeter os seus votos."
       error_while_fetching_voters: "Pedimos desculpa, ocorreu um erro ao apresentar os eleitores."
       ui_builder:
-        title: Criar Votação
-        insert: Inserir votação
+        title: Criar Sondagem
+        insert: Inserir sondagem
         help:
           options_count: Indique pelo menos 2 opções
         poll_type:
@@ -64,6 +64,6 @@ pt:
           min: Mínimo
           step: Passo
         poll_public:
-          label: Mostre quem votou
+          label: Mostrar quem votou
         poll_options:
-          label: Escreva uma opção de votação por linha
+          label: Escreva uma opção de sondagem por linha
diff --git a/plugins/poll/config/locales/server.nb_NO.yml b/plugins/poll/config/locales/server.nb_NO.yml
index 875eaea4f1..d5aee2590c 100644
--- a/plugins/poll/config/locales/server.nb_NO.yml
+++ b/plugins/poll/config/locales/server.nb_NO.yml
@@ -26,3 +26,5 @@ nb_NO:
     poll_must_be_open_to_vote: "Spørreundersøkelsen må være åpen for å kunne avigi stemme."
     topic_must_be_open_to_toggle_status: "Emnet må være åpent for å redigere status."
     only_staff_or_op_can_toggle_status: "Kun forumpersonalet eller den forfatteren av emnet kan redigere status på spørreundersøkelsen."
+    email:
+      link_to_poll: "Klikk for å se avstemningen"
diff --git a/plugins/poll/config/locales/server.pt.yml b/plugins/poll/config/locales/server.pt.yml
index 3a939a7b4e..8e8708e653 100644
--- a/plugins/poll/config/locales/server.pt.yml
+++ b/plugins/poll/config/locales/server.pt.yml
@@ -7,30 +7,37 @@
 
 pt:
   site_settings:
-    poll_enabled: "Permitir que os utilizadores criem votações?"
-    poll_maximum_options: "Número máximo de opções permitidas numa votação."
+    poll_enabled: "Permitir que os utilizadores criem sondagens?"
+    poll_maximum_options: "Número máximo de opções permitidas numa sondagem."
+    poll_edit_window_mins: "Número de minutos após criação de publicação durante os quais sondagens podem ser editadas."
   poll:
-    multiple_polls_without_name: "Há múltiplas votações sem nome. Utilize o atributo '<code>nome</code>' para identificar as suas votações de maneira única."
-    multiple_polls_with_same_name: "Há múltiplas votações com o mesmo nome: <strong>%{name}</strong>. Utilize o atributo '<code>nome</code>' para identificar as suas votações de maneira única."
-    default_poll_must_have_at_least_2_options: "Votação deve ter pelo menos 2 opções."
-    named_poll_must_have_at_least_2_options: "Votação com o nome <strong>%{name}</strong> deve ter pelo menos 2 opções."
+    multiple_polls_without_name: "Há múltiplas sondagens sem nome. Utilize o atributo '<code>nome</code>' para identificar as suas sondagens de maneira única."
+    multiple_polls_with_same_name: "Há múltiplas sondagens com o mesmo nome: <strong>%{name}</strong>. Utilize o atributo '<code>nome</code>' para identificar as suas sondagens de maneira única."
+    default_poll_must_have_at_least_2_options: "A sondagem deve ter pelo menos 2 opções."
+    named_poll_must_have_at_least_2_options: "A sondagem com o nome <strong>%{name}</strong> deve ter pelo menos 2 opções."
     default_poll_must_have_less_options:
-      one: "Votação deve ter menos que 1 opção."
-      other: "Votação deve ter menos que %{count} opções."
+      one: "A sondagem deve ter menos que 1 opção."
+      other: "A sondagem deve ter menos que %{count} opções."
     named_poll_must_have_less_options:
-      one: "Votação com o nome <strong>%{name}</strong> deve ter menos que 1 opção."
-      other: "Votação com o nome <strong>%{name}</strong> deve ter menos que %{count} opções."
-    default_poll_must_have_different_options: "Votação deve ter opções diferentes."
-    named_poll_must_have_different_options: "Votação com o nome <strong>%{name}</strong> deve ter opções diferentes."
-    default_poll_with_multiple_choices_has_invalid_parameters: "Votação com escolha múltipla tem parâmetros inválidos."
-    named_poll_with_multiple_choices_has_invalid_parameters: "Votação com o nome <strong>%{name}</strong> com escolha múltipla tem parâmetros inválidos."
+      one: "A sondagem com o nome <strong>%{name}</strong> deve ter menos que 1 opção."
+      other: "A sondagem com o nome <strong>%{name}</strong> deve ter menos que %{count} opções."
+    default_poll_must_have_different_options: "A sondagem deve ter opções diferentes."
+    named_poll_must_have_different_options: "A sondagem com o nome <strong>%{name}</strong> deve ter opções diferentes."
+    default_poll_with_multiple_choices_has_invalid_parameters: "Sondagem com escolha múltipla tem parâmetros inválidos."
+    named_poll_with_multiple_choices_has_invalid_parameters: "Sondagem com o nome <strong>%{name}</strong> com escolha múltipla tem parâmetros inválidos."
     requires_at_least_1_valid_option: "Deve selecionar pelo menos 1 opção válida."
-    no_polls_associated_with_this_post: "Nenhuma votação está associada a esta mensagem."
-    no_poll_with_this_name: "Nenhuma votação com o nome <strong>%{name}</strong> está associada a esta mensagem."
-    post_is_deleted: "Não é possível realizar ações em mensagens eliminadas."
+    default_cannot_be_made_public: "Sondagem com votos não pode ser tornada pública."
+    named_cannot_be_made_public: "A sondagem com votos de nome <strong>%{name}</strong> não pode ser tornada pública."
+    edit_window_expired:
+      cannot_change_polls: "Não pode adicionar, remover ou renomear sondagens após os primeiros %{minutes} minutos."
+      op_cannot_edit_options: "Não pode adicionar ou remover opções da sondagem após os primeiros %{minutes} minutos. Por favor contacte um moderador se necessitar de editar opções da sondagem."
+      staff_cannot_add_or_remove_options: "Não pode adicionar ou remover opções da sondagem após os primeiros %{minutes} minutos. Como alternativa, pode fechar este tópico e criar um novo."
+    no_polls_associated_with_this_post: "Nenhuma sondagem está associada a esta publicação."
+    no_poll_with_this_name: "Nenhuma sondagem com o nome <strong>%{name}</strong> está associada a esta publicação."
+    post_is_deleted: "Não é possível realizar ações em publicações eliminadas."
     topic_must_be_open_to_vote: "O tópico tem que estar aberto para votar."
-    poll_must_be_open_to_vote: "Votação tem que estar aberta para votar."
+    poll_must_be_open_to_vote: "Sondagem tem que estar aberta para votar."
     topic_must_be_open_to_toggle_status: "O tópico tem que estar aberto para alternar o estado."
-    only_staff_or_op_can_toggle_status: "Apenas um membro do pessoal ou o autor original pode alternar o estado da votação."
+    only_staff_or_op_can_toggle_status: "Apenas um membro da equipa de apoio ou o autor original pode alternar o estado da sondagem."
     email:
-      link_to_poll: "Clique para ver a votação."
+      link_to_poll: "Clique para ver a sondagem."
diff --git a/script/check_forking.rb b/script/check_forking.rb
new file mode 100644
index 0000000000..c0eb398502
--- /dev/null
+++ b/script/check_forking.rb
@@ -0,0 +1,31 @@
+require File.expand_path("../../config/environment", __FILE__)
+
+def pretty
+  puts "<before>"
+  puts PrettyText.cook("My pid is #{Process.pid}")
+  GC.start
+  sleep 1
+  puts "done gc"
+end
+
+Discourse.after_fork
+pretty
+
+child = fork do
+  Discourse.after_fork
+  pretty
+  grand_child = fork do
+    Discourse.after_fork
+    pretty
+    puts "try to exit"
+    Process.kill "KILL", Process.pid
+  end
+  puts "before wait 2"
+  Process.wait grand_child
+  puts "after wait 2"
+  Process.kill "KILL", Process.pid
+end
+
+puts "before wait 1"
+Process.wait child
+puts "after wait 1"
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 0704ae7cfb..ede4a7654d 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -146,6 +146,10 @@ class ImportScripts::Base
     admin
   end
 
+  def created_group(group)
+    # override if needed
+  end
+
   # Iterate through a list of groups to be imported.
   # Takes a collection and yields to the block for each element.
   # Block should return a hash with the attributes for each element.
@@ -165,6 +169,7 @@ class ImportScripts::Base
         skipped += 1
       else
         new_group = create_group(g, g[:id])
+        created_group(new_group)
 
         if new_group.valid?
           @lookup.add_group(g[:id].to_s, new_group)
@@ -218,6 +223,10 @@ class ImportScripts::Base
     conn.exec('DROP TABLE import_ids')
   end
 
+  def created_user(user)
+    # override if needed
+  end
+
   # Iterate through a list of user records to be imported.
   # Takes a collection, and yields to the block for each element.
   # Block should return a hash with the attributes for the User model.
@@ -243,6 +252,7 @@ class ImportScripts::Base
           skipped += 1
         elsif u[:email].present?
           new_user = create_user(u, import_id)
+          created_user(new_user)
 
           if new_user && new_user.valid? && new_user.user_profile && new_user.user_profile.valid?
             @lookup.add_user(import_id.to_s, new_user)
@@ -347,6 +357,10 @@ class ImportScripts::Base
     u # If there was an error creating the user, u.errors has the messages
   end
 
+  def created_category(category)
+    # override if needed
+  end
+
   # Iterates through a collection to create categories.
   # The block should return a hash with attributes for the new category.
   # Required fields are :id and :name, where :id is the id of the
@@ -377,7 +391,8 @@ class ImportScripts::Base
           params[:parent_category_id] = top.id if top
         end
 
-        create_category(params, params[:id])
+        new_category = create_category(params, params[:id])
+        created_category(new_category)
 
         created += 1
       end
diff --git a/script/import_scripts/mylittleforum.rb b/script/import_scripts/mylittleforum.rb
new file mode 100644
index 0000000000..795148c7d4
--- /dev/null
+++ b/script/import_scripts/mylittleforum.rb
@@ -0,0 +1,453 @@
+require "mysql2"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+require 'htmlentities'
+
+
+# Before running this script, paste these lines into your shell,
+# then use arrow keys to edit the values
+=begin
+export DB_HOST="localhost"
+export DB_NAME="mylittleforum"
+export DB_PW=""
+export DB_USER="root"
+export TABLE_PREFIX="forum_"
+export IMPORT_AFTER="1970-01-01"
+export IMAGE_BASE="http://www.example.com/forum"
+export BASE="forum"
+=end
+
+
+class ImportScripts::MylittleforumSQL < ImportScripts::Base
+
+  DB_HOST ||= ENV['DB_HOST'] || "localhost"
+  DB_NAME ||= ENV['DB_NAME'] || "mylittleforum"
+  DB_PW ||= ENV['DB_PW'] || ""
+  DB_USER ||= ENV['DB_USER'] || "root"
+  TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "forum_"
+  IMPORT_AFTER ||= ENV['IMPORT_AFTER'] || "1970-01-01"
+  IMAGE_BASE ||= ENV['IMAGE_BASE'] || ""
+  BASE ||= ENV['BASE'] || "forum/"
+  BATCH_SIZE = 1000
+  CONVERT_HTML = true
+  QUIET = nil || ENV['VERBOSE'] == "TRUE"
+  FORCE_HOSTNAME = nil || ENV['FORCE_HOSTNAME']
+
+  QUIET = true
+
+  # Site settings
+  SiteSetting.disable_emails = true
+  if FORCE_HOSTNAME
+    SiteSetting.force_hostname=FORCE_HOSTNAME
+  end
+
+
+  def initialize
+
+    if IMPORT_AFTER > "1970-01-01"
+      print_warning("Importing data after #{IMPORT_AFTER}")
+    end
+
+    super
+    @htmlentities = HTMLEntities.new
+    begin
+      @client = Mysql2::Client.new(
+        host: DB_HOST,
+        username: DB_USER,
+        password: DB_PW,
+        database: DB_NAME
+      )
+    rescue Exception => e
+      puts '='*50
+      puts e.message
+      puts <<EOM
+Cannot log in to database.
+
+Hostname: #{DB_HOST}
+Username: #{DB_USER}
+Password: #{DB_PW}
+database: #{DB_NAME}
+
+You should set these variables:
+
+export DB_HOST="localhost"
+export DB_NAME="mylittleforum"
+export DB_PW=""
+export DB_USER="root"
+export TABLE_PREFIX="forum_"
+export IMPORT_AFTER="1970-01-01"
+export IMAGE_BASE="http://www.example.com/forum"
+export BASE="forum"
+
+Exiting.
+EOM
+      exit
+    end
+  end
+
+  def execute
+    import_users
+    import_categories
+    import_topics
+    import_posts
+
+    update_tl0
+
+    create_permalinks
+  end
+
+  def import_users
+    puts '', "creating users"
+
+    username = nil
+
+    total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}userdata WHERE last_login > '#{IMPORT_AFTER}';").first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      results = mysql_query("
+             SELECT user_id as UserID, user_name as username,
+                user_real_name as Name,
+                user_email as Email,
+                user_hp as website,
+                user_place as Location,
+                profile as bio_raw,
+                last_login as DateLastActive,
+                user_ip as InsertIPAddress,
+                user_pw as password,
+                logins as days_visited, # user_stats
+                registered as DateInserted,
+                user_pw as password,
+                user_type
+             FROM #{TABLE_PREFIX}userdata
+		 WHERE last_login > '#{IMPORT_AFTER}'
+                 order by UserID ASC
+                 LIMIT #{BATCH_SIZE}
+                 OFFSET #{offset};")
+
+      break if results.size < 1
+
+      next if all_records_exist? :users, results.map {|u| u['UserID'].to_i}
+
+      create_users(results, total: total_count, offset: offset) do |user|
+        next if user['Email'].blank?
+        next if @lookup.user_id_from_imported_user_id(user['UserID'])
+
+        # username = fix_username(user['username'])
+
+        { id: user['UserID'],
+          email: user['Email'],
+          username: user['username'],
+          name: user['Name'],
+          created_at: user['DateInserted'] == nil ? 0 : Time.zone.at(user['DateInserted']),
+          bio_raw: user['bio_raw'],
+          registration_ip_address: user['InsertIPAddress'],
+          website: user['user_hp'],
+          password: user['password'],
+          last_seen_at: user['DateLastActive'] == nil ? 0 : Time.zone.at(user['DateLastActive']),
+          location: user['Location'],
+          admin: user['user_type'] == "admin",
+          moderator: user['user_type'] == "mod",
+        }
+      end
+    end
+  end
+
+  def fix_username(username)
+    olduser = username.dup
+    username.gsub!(/Dr\. /,"Dr") # no &
+    username.gsub!(/[ +!\/,*()?]/,"_") # can't have these
+    username.gsub!(/&/,"_and_") # no &
+    username.gsub!(/@/,"_at_") # no @
+    username.gsub!(/#/,"_hash_") # no &
+    username.gsub!(/\'/,"") # seriously?
+    username.gsub!(/[._]+/,"_") # can't have 2 special in a row
+    username.gsub!(/_+/,"_") # could result in dupes, but wtf?
+    username.gsub!(/_$/,"") # could result in dupes, but wtf?
+    if olduser != username
+      print_warning ("#{olduser} --> #{username}")
+    end
+    username
+  end
+
+  def import_categories
+    puts "", "importing categories..."
+
+    categories = mysql_query("
+                              SELECT id as CategoryID,
+                              category as Name,
+                              description as Description
+                              FROM #{TABLE_PREFIX}categories
+                              ORDER BY CategoryID ASC
+                            ").to_a
+
+    create_categories(categories) do |category|
+      {
+        id: category['CategoryID'],
+        name: CGI.unescapeHTML(category['Name']),
+        description: CGI.unescapeHTML(category['Description'])
+      }
+    end
+  end
+
+  def import_topics
+    puts "", "importing topics..."
+
+    total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}entries
+                               WHERE time > '#{IMPORT_AFTER}'
+                               AND pid = 0;").first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      discussions = mysql_query(
+        "SELECT id as DiscussionID,
+                category as CategoryID,
+                subject as Name,
+                text as Body,
+                time as DateInserted,
+                youtube_link as youtube,
+                user_id as InsertUserID
+         FROM #{TABLE_PREFIX}entries
+         WHERE pid = 0
+	 AND time > '#{IMPORT_AFTER}'
+         ORDER BY time ASC
+         LIMIT #{BATCH_SIZE}
+         OFFSET #{offset};")
+
+      break if discussions.size < 1
+      next if all_records_exist? :posts, discussions.map {|t| "discussion#" + t['DiscussionID'].to_s}
+
+      create_posts(discussions, total: total_count, offset: offset) do |discussion|
+
+        raw = clean_up(discussion['Body'])
+
+        youtube = nil
+        unless discussion['youtube'].blank?
+          youtube = clean_youtube(discussion['youtube'])
+          raw += "\n#{youtube}\n"
+          print_warning(raw)
+        end
+
+        {
+          id: "discussion#" + discussion['DiscussionID'].to_s,
+          user_id: user_id_from_imported_user_id(discussion['InsertUserID']) || Discourse::SYSTEM_USER_ID,
+          title: discussion['Name'].gsub('\\"','"'),
+          category: category_id_from_imported_category_id(discussion['CategoryID']),
+          raw: raw,
+          created_at: Time.zone.at(discussion['DateInserted']),
+        }
+      end
+    end
+  end
+
+  def import_posts
+    puts "", "importing posts..."
+
+    total_count = mysql_query(
+      "SELECT count(*) count
+       FROM #{TABLE_PREFIX}entries
+       WHERE pid > 0
+       AND time > '#{IMPORT_AFTER}';").first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      comments = mysql_query(
+        "SELECT id as CommentID,
+                tid as DiscussionID,
+                text as Body,
+                time as DateInserted,
+                youtube_link as youtube,
+                user_id as InsertUserID
+         FROM #{TABLE_PREFIX}entries
+         WHERE pid > 0
+	 AND time > '#{IMPORT_AFTER}'
+         ORDER BY time ASC
+         LIMIT #{BATCH_SIZE}
+         OFFSET #{offset};")
+
+      break if comments.size < 1
+      next if all_records_exist? :posts, comments.map {|comment| "comment#" + comment['CommentID'].to_s}
+
+      create_posts(comments, total: total_count, offset: offset) do |comment|
+        next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['DiscussionID'].to_s)
+        next if comment['Body'].blank?
+        raw = clean_up(comment['Body'])
+        youtube = nil
+        unless comment['youtube'].blank?
+          youtube = clean_youtube(comment['youtube'])
+          raw += "\n#{youtube}\n"
+        end
+        {
+          id: "comment#" + comment['CommentID'].to_s,
+          user_id: user_id_from_imported_user_id(comment['InsertUserID']) || Discourse::SYSTEM_USER_ID,
+          topic_id: t[:topic_id],
+          raw: clean_up(raw),
+          created_at: Time.zone.at(comment['DateInserted'])
+        }
+      end
+    end
+  end
+
+  def clean_youtube(youtube_raw)
+    youtube_cooked = clean_up(youtube_raw.dup.to_s)
+    # get just src from <iframe> and put on a line by itself
+    re = /<iframe.+?src="(\S+?)".+?<\/iframe>/mix
+    youtube_cooked.gsub!(re) {"\n#{$1}\n"}
+    re = /<object.+?src="(\S+?)".+?<\/object>/mix
+    youtube_cooked.gsub!(re) {"\n#{$1}\n"}
+    youtube_cooked.gsub!(/^\/\//, "https://") # make sure it has a protocol
+    unless /http/.match(youtube_cooked) # handle case of only youtube object number
+      if youtube_cooked.length < 8 || /[<>=]/.match(youtube_cooked)
+        # probably not a youtube id
+        youtube_cooked = ""
+      else
+        youtube_cooked = 'https://www.youtube.com/watch?v=' + youtube_cooked
+      end
+    end
+    print_warning("#{'-'*40}\nBefore: #{youtube_raw}\nAfter: #{youtube_cooked}") unless QUIET
+
+    youtube_cooked
+  end
+
+  def clean_up(raw)
+    return "" if raw.blank?
+
+    # decode HTML entities
+    raw = @htmlentities.decode(raw)
+
+    # don't \ quotes
+    raw = raw.gsub('\\"','"')
+    raw = raw.gsub("\\'","'")
+
+    raw = raw.gsub(/\[b\]/i, "<strong>")
+    raw = raw.gsub(/\[\/b\]/i, "</strong>")
+
+    raw = raw.gsub(/\[i\]/i, "<em>")
+    raw = raw.gsub(/\[\/i\]/i, "</em>")
+
+    raw = raw.gsub(/\[u\]/i, "<em>")
+    raw = raw.gsub(/\[\/u\]/i, "</em>")
+
+    raw = raw.gsub(/\[url\](\S+)\[\/url\]/im) { "#{$1}"}
+    raw = raw.gsub(/\[link\](\S+)\[\/link\]/im) { "#{$1}"}
+
+    # URL & LINK with text
+    raw = raw.gsub(/\[url=(\S+?)\](.*?)\[\/url\]/im) { "<a href=\"#{$1}\">#{$2}</a>"}
+    raw = raw.gsub(/\[link=(\S+?)\](.*?)\[\/link\]/im) { "<a href=\"#{$1}\">#{$2}</a>"}
+
+    # remote images
+    raw = raw.gsub(/\[img\](https?:.+?)\[\/img\]/im) { "<img src=\"#{$1}\">" }
+    raw = raw.gsub(/\[img=(https?.+?)\](.+?)\[\/img\]/im) { "<img src=\"#{$1}\" alt=\"#{$2}\">" }
+    # local images
+    raw = raw.gsub(/\[img\](.+?)\[\/img\]/i) { "<img src=\"#{IMAGE_BASE}/#{$1}\">" }
+    raw = raw.gsub(/\[img=(.+?)\](https?.+?)\[\/img\]/im) { "<img src=\"#{IMAGE_BASE}/#{$1}\" alt=\"#{$2}\">" }
+
+    # Convert image bbcode
+    raw.gsub!(/\[img=(\d+),(\d+)\]([^\]]*)\[\/img\]/im, '<img width="\1" height="\2" src="\3">')
+
+    # [div]s are really [quote]s
+    raw.gsub!(/\[div\]/mix, "[quote]")
+    raw.gsub!(/\[\/div\]/mix, "[/quote]")
+
+    # [postedby] -> link to @user
+    raw.gsub(/\[postedby\](.+?)\[b\](.+?)\[\/b\]\[\/postedby\]/i) { "#{$1}@#{$2}" }
+
+    # CODE (not tested)
+    raw = raw.gsub(/\[code\](\S+)\[\/code\]/im) { "```\n#{$1}\n```"}
+    raw = raw.gsub(/\[pre\](\S+)\[\/pre\]/im) { "```\n#{$1}\n```"}
+
+    raw = raw.gsub(/(https:\/\/youtu\S+)/i) { "\n#{$1}\n" } #youtube links on line by themselves
+
+    # no center
+    raw = raw.gsub(/\[\/?center\]/i,"")
+
+    # no size
+    raw = raw.gsub(/\[\/?size.*?\]/i,"")
+
+    ### FROM VANILLA:
+
+    # fix whitespaces
+    raw = raw.gsub(/(\\r)?\\n/, "\n")
+             .gsub("\\t", "\t")
+
+    unless CONVERT_HTML
+      # replace all chevrons with HTML entities
+      # NOTE: must be done
+      #  - AFTER all the "code" processing
+      #  - BEFORE the "quote" processing
+      raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
+               .gsub("<", "&lt;")
+               .gsub("\u2603", "<")
+
+      raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
+               .gsub(">", "&gt;")
+               .gsub("\u2603", ">")
+    end
+
+    # Remove the color tag
+    raw.gsub!(/\[color=[#a-z0-9]+\]/i, "")
+    raw.gsub!(/\[\/color\]/i, "")
+    ### END VANILLA:
+
+    raw
+  end
+
+  def staff_guardian
+    @_staff_guardian ||= Guardian.new(Discourse.system_user)
+  end
+
+  def mysql_query(sql)
+    @client.query(sql)
+    # @client.query(sql, cache_rows: false) #segfault: cache_rows: false causes segmentation fault
+  end
+
+  def create_permalinks
+    puts '', 'Creating redirects...', ''
+
+    puts '', 'Users...', ''
+    User.find_each do |u|
+      ucf = u.custom_fields
+      if ucf && ucf["import_id"] && ucf["import_username"]
+        Permalink.create( url: "#{BASE}/user-id-#{ucf['import_id']}.html", external_url: "/users/#{u.username}" ) rescue nil
+        print '.'
+      end
+    end
+
+    puts '', 'Posts...', ''
+    Post.find_each do |post|
+      pcf = post.custom_fields
+      if pcf && pcf["import_id"]
+        topic = post.topic
+        id = pcf["import_id"].split('#').last
+        if post.post_number == 1
+          Permalink.create( url: "#{BASE}/forum_entry-id-#{id}.html", topic_id: topic.id ) rescue nil
+          unless QUIET
+            print_warning("forum_entry-id-#{id}.html --> http://localhost:3000/t/#{topic.id}")
+          end
+        else
+          Permalink.create( url: "#{BASE}/forum_entry-id-#{id}.html", post_id: post.id ) rescue nil
+          unless QUIET
+            print_warning("forum_entry-id-#{id}.html --> http://localhost:3000/t/#{topic.id}/#{post.id}")
+          end
+        end
+        print '.'
+      end
+    end
+
+    puts '', 'Categories...', ''
+    Category.find_each do |cat|
+      ccf = cat.custom_fields
+      next unless id = ccf["import_id"]
+      unless QUIET
+        print_warning("forum-category-#{id}.html --> /t/#{cat.id}")
+      end
+      Permalink.create( url: "#{BASE}/forum-category-#{id}.html", category_id: cat.id ) rescue nil
+      print '.'
+    end
+  end
+
+  def print_warning(message)
+    $stderr.puts "#{message}"
+  end
+
+
+
+end
+
+ImportScripts::MylittleforumSQL.new.perform
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index cd7eddf1b7..86810e5e59 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -242,19 +242,30 @@ describe CookedPostProcessor do
     end
 
     context "topic image" do
-
       let(:topic) { build(:topic, id: 1) }
       let(:post) { Fabricate(:post_with_uploaded_image, topic: topic) }
       let(:cpp) { CookedPostProcessor.new(post) }
 
-      it "adds a topic image if there's one in the post" do
+      it "adds a topic image if there's one in the first post" do
         FastImage.stubs(:size)
         expect(post.topic.image_url).to eq(nil)
         cpp.post_process_images
         post.topic.reload
         expect(post.topic.image_url).to be_present
       end
+    end
 
+    context "post image" do
+      let(:reply) { Fabricate(:post_with_uploaded_image, post_number: 2) }
+      let(:cpp) { CookedPostProcessor.new(reply) }
+
+      it "adds a post image if there's one in the post" do
+        FastImage.stubs(:size)
+        expect(reply.image_url).to eq(nil)
+        cpp.post_process_images
+        reply.reload
+        expect(reply.image_url).to be_present
+      end
     end
 
   end
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index 89d299dda4..2f6f539f35 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -139,6 +139,26 @@ describe Email::Sender do
       Then { expect(message.header['X-Discourse-Reply-Key']).not_to be_present }
     end
 
+    context "merges custom mandrill header" do
+      before do
+        ActionMailer::Base.smtp_settings[:address] = "smtp.mandrillapp.com"
+        message.header['X-MC-Metadata'] = { foo: "bar" }.to_json
+      end
+
+      When { email_sender.send }
+      Then { expect(message.header['X-MC-Metadata'].to_s).to match(message.message_id) }
+    end
+
+    context "merges custom sparkpost header" do
+      before do
+        ActionMailer::Base.smtp_settings[:address] = "smtp.sparkpostmail.com"
+        message.header['X-MSYS-API'] = { foo: "bar" }.to_json
+      end
+
+      When { email_sender.send }
+      Then { expect(message.header['X-MSYS-API'].to_s).to match(message.message_id) }
+    end
+
     context 'email logs' do
       let(:email_log) { EmailLog.last }
 
diff --git a/spec/components/email/styles_spec.rb b/spec/components/email/styles_spec.rb
index d9824f4cf7..97e09c726c 100644
--- a/spec/components/email/styles_spec.rb
+++ b/spec/components/email/styles_spec.rb
@@ -95,6 +95,12 @@ describe Email::Styles do
       expect(frag.at('iframe')).to be_blank
       expect(frag.at('a')).to be_blank
     end
+
+    it "won't allow empty iframe src, strips them with no link" do
+      frag = html_fragment("<iframe src=''></iframe>")
+      expect(frag.at('iframe')).to be_blank
+      expect(frag.at('a')).to be_blank
+    end
   end
 
   context "rewriting protocol relative URLs to the forum" do
diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
index 3646e97290..9cb7e84c0d 100644
--- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb
+++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
@@ -84,6 +84,7 @@ describe Onebox::Engine::DiscourseLocalOnebox do
 
     it "returns nil if file type is not audio or video" do
       url = "#{Discourse.base_url}/uploads/default/original/3X/5/c/24asdf42.pdf"
+      FakeWeb.register_uri(:get, url, body: "")
       expect(Onebox.preview(url).to_s).to eq("")
     end
 
diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb
index 7714d3f2c2..1df8b30027 100644
--- a/spec/components/oneboxer_spec.rb
+++ b/spec/components/oneboxer_spec.rb
@@ -2,9 +2,11 @@ require 'rails_helper'
 require_dependency 'oneboxer'
 
 describe Oneboxer do
+
   it "returns blank string for an invalid onebox" do
     expect(Oneboxer.preview("http://boom.com")).to eq("")
     expect(Oneboxer.onebox("http://boom.com")).to eq("")
   end
+
 end
 
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 119cfbcde9..2e99df132a 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -180,4 +180,15 @@ describe Plugin::Instance do
     end
   end
 
+  describe '.register_seedfu_fixtures' do
+    it "should add the new path to SeedFu's fixtures path" do
+      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
+      plugin.register_seedfu_fixtures(['some_path'])
+      plugin.register_seedfu_fixtures('some_path2')
+
+      expect(SeedFu.fixture_paths).to include('some_path')
+      expect(SeedFu.fixture_paths).to include('some_path2')
+    end
+  end
+
 end
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 6506377d49..6fe6552615 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -379,6 +379,26 @@ describe TopicQuery do
         ).to eq([topic_in_cat2.id, topic_category.id, topic_in_cat1.id])
       end
     end
+
+    describe "category default sort order" do
+      it "can use category's default sort order" do
+        category.update_attributes!(sort_order: 'created', sort_ascending: true)
+        topic_ids = TopicQuery.new(user, category: category.id).list_latest.topics.map(&:id)
+        expect(topic_ids - [topic_category.id]).to eq([topic_in_cat1.id, topic_in_cat2.id])
+      end
+
+      it "ignores invalid order value" do
+        category.update_attributes!(sort_order: 'funny')
+        topic_ids = TopicQuery.new(user, category: category.id).list_latest.topics.map(&:id)
+        expect(topic_ids - [topic_category.id]).to eq([topic_in_cat2.id, topic_in_cat1.id])
+      end
+
+      it "can be overridden" do
+        category.update_attributes!(sort_order: 'created', sort_ascending: true)
+        topic_ids = TopicQuery.new(user, category: category.id, order: 'activity').list_latest.topics.map(&:id)
+        expect(topic_ids - [topic_category.id]).to eq([topic_in_cat2.id, topic_in_cat1.id])
+      end
+    end
   end
 
   context 'unread / read topics' do
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index 5baa846b1f..46f428400a 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -19,7 +19,9 @@ describe Admin::GroupsController do
 
       xhr :get, :index
       expect(response.status).to eq(200)
-      expect(::JSON.parse(response.body).keep_if {|r| r["id"] == group.id }).to eq([{
+      json = ::JSON.parse(response.body)
+      expect(json.select { |r| r["id"] == Group::AUTO_GROUPS[:everyone] }).to be_empty
+      expect(json.select { |r| r["id"] == group.id }).to eq([{
         "id"=>group.id,
         "name"=>group.name,
         "user_count"=>1,
@@ -135,6 +137,4 @@ describe Admin::GroupsController do
 
   end
 
-
-
 end
diff --git a/spec/controllers/finish_installation_controller_spec.rb b/spec/controllers/finish_installation_controller_spec.rb
index 2ada049fbf..2e519aedbd 100644
--- a/spec/controllers/finish_installation_controller_spec.rb
+++ b/spec/controllers/finish_installation_controller_spec.rb
@@ -82,4 +82,18 @@ describe FinishInstallationController do
       end
     end
   end
+
+  describe '.resend_email' do
+    before do
+      SiteSetting.has_login_hint = true
+      GlobalSetting.stubs(:developer_emails).returns("robin@example.com")
+      post :register, email: 'robin@example.com', username: 'eviltrout', password: 'disismypasswordokay'
+    end
+
+    it "resends the email" do
+      Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
+      get :resend_email
+      expect(response).to be_success
+    end
+  end
 end
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index fded427a08..b926e4d6c6 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -200,19 +200,22 @@ describe GroupsController do
       end
 
       it "removes by id" do
-        xhr :delete, :remove_member, id: group.id, user_id: user.id
+        expect do
+          xhr :delete, :remove_member, id: group.id, user_id: user.id
 
-        expect(response).to be_success
-        group.reload
-        expect(group.users.count).to eq(0)
+          expect(response).to be_success
+          group.reload
+        end.to change{group.users.count}.from(1).to(0)
       end
 
       it "removes by username" do
-        xhr :delete, :remove_member, id: group.id, username: user.username
+        expect do
+          xhr :delete, :remove_member, id: group.id, username: user.username
 
-        expect(response).to be_success
-        group.reload
-        expect(group.users.count).to eq(0)
+          expect(response).to be_success
+          group.reload
+
+        end.to change{group.users.count}.from(1).to(0)
       end
 
       it "removes user.primary_group_id when user is removed from group" do
@@ -224,6 +227,14 @@ describe GroupsController do
         user.reload
         expect(user.primary_group_id).to eq(nil)
       end
+
+      it "removes by user_email" do
+        expect do
+          xhr :delete, :remove_member, id: group.id, user_email: user.email
+          expect(response).to be_success
+          group.reload
+        end.to change{group.users.count}.from(1).to(0)
+      end
     end
 
   end
diff --git a/spec/controllers/webhooks_controller_spec.rb b/spec/controllers/webhooks_controller_spec.rb
index b77e363d83..6bf6404f31 100644
--- a/spec/controllers/webhooks_controller_spec.rb
+++ b/spec/controllers/webhooks_controller_spec.rb
@@ -109,7 +109,9 @@ describe WebhooksController do
         "msys" => {
           "message_event" => {
             "bounce_class" => 10,
-            "message_id" => message_id
+            "rcpt_meta" => {
+              "message_id" => message_id
+            }
           }
         }
       }]
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index 4341ec728e..6e7c77cfc3 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -103,6 +103,16 @@ describe Jobs::CleanUpUploads do
     expect(Upload.find_by(id: upload.id)).to eq(upload)
   end
 
+  it "does not delete user custom upload" do
+    upload = fabricate_upload
+    Fabricate(:user, user_avatar: Fabricate(:user_avatar, custom_upload: upload))
+
+    Jobs::CleanUpUploads.new.execute(nil)
+
+    expect(Upload.find_by(id: @upload.id)).to eq(nil)
+    expect(Upload.find_by(id: upload.id)).to eq(upload)
+  end
+
   it "does not delete uploads in a queued post" do
     upload = fabricate_upload
 
diff --git a/spec/jobs/enqueue_mailing_list_emails_spec.rb b/spec/jobs/enqueue_mailing_list_emails_spec.rb
index 820ed1e812..3ee9ebe941 100644
--- a/spec/jobs/enqueue_mailing_list_emails_spec.rb
+++ b/spec/jobs/enqueue_mailing_list_emails_spec.rb
@@ -82,6 +82,11 @@ describe Jobs::EnqueueMailingListEmails do
         expect(subject).to_not include user.id
       end
 
+      it "doesn't return users with mailing list mode set to 'individual_excluding_own'" do
+        user_option.update(mailing_list_mode_frequency: 2)
+        expect(subject).to_not include user.id
+      end
+
       it "doesn't return a user who has received the mailing list summary earlier" do
         user.update(first_seen_at: 5.hours.ago)
         expect(subject).to_not include user.id
diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb
index 899d4aedd9..92a97409b9 100644
--- a/spec/jobs/notify_mailing_list_subscribers_spec.rb
+++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb
@@ -47,9 +47,15 @@ describe Jobs::NotifyMailingListSubscribers do
       end
     end
 
-    context "with a valid post" do
+    context "with a valid post authored by same user" do
       let!(:post) { Fabricate(:post, user: user) }
 
+      it "doesn't send the email to the user if the frequency is set to 'always with no echo'" do
+        user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 2)
+        UserNotifications.expects(:mailing_list_notify).never
+        Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+      end
+
       it "sends the email to the user if the frequency is set to 'always'" do
         user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 1)
         UserNotifications.expects(:mailing_list_notify).with(user, post).once
@@ -63,6 +69,28 @@ describe Jobs::NotifyMailingListSubscribers do
       end
     end
 
+    context "with a valid post created by someone other than the user" do
+      let!(:post) { Fabricate(:post, user: user, user_id: 'different') }
+
+      it "sends the email to the user if the frequency is set to 'always with no echo'" do
+        user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 2)
+        UserNotifications.expects(:mailing_list_notify).once
+        Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+      end
+
+      it "sends the email to the user if the frequency is set to 'always'" do
+        user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 1)
+        UserNotifications.expects(:mailing_list_notify).once
+        Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+      end
+
+      it "does not send the email to the user if the frequency is set to 'daily'" do
+        user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 0)
+        UserNotifications.expects(:mailing_list_notify).never
+        Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+      end
+    end
+
     context "with a deleted post" do
       let!(:post) { Fabricate(:post, user: user, deleted_at: Time.now) }
 
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index f99a403b4e..a1af812c12 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -240,6 +240,21 @@ describe Jobs::UserEmail do
         Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted", post_id: post.id)
       end
 
+      it "doesn't send the mail if the user is using individual mailing list mode with no echo" do
+        Email::Sender.any_instance.expects(:send).never
+        user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 2)
+        # sometimes, we pass the notification_id
+        Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id, post_id: post.id)
+        # other times, we only pass the type of notification
+        Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted", post_id: post.id)
+        # When post is nil
+        Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted")
+        # When post does not have a topic
+        post = Fabricate(:post)
+        post.topic.destroy
+        Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted", post_id: post.id)
+      end
+
       it "doesn't send the email if the post has been user deleted" do
         Email::Sender.any_instance.expects(:send).never
         post.update_column(:user_deleted, true)
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index aa9f7080b3..6a0cd5a3ca 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -123,29 +123,6 @@ describe AdminDashboardData do
     end
   end
 
-  describe 'send_consumer_email_check' do
-    subject { described_class.new.send_consumer_email_check }
-
-    it 'returns nil if gmail.com is not in the smtp_settings address' do
-      ActionMailer::Base.stubs(:smtp_settings).returns({address: 'mandrillapp.com'})
-      expect(subject).to be_nil
-    end
-
-    context 'gmail.com is in the smtp_settings address' do
-      before { ActionMailer::Base.stubs(:smtp_settings).returns({address: 'smtp.gmail.com'}) }
-
-      it 'returns nil in development env' do
-        Rails.stubs(env: ActiveSupport::StringInquirer.new('development'))
-        expect(subject).to be_nil
-      end
-
-      it 'returns a string when in production env' do
-        Rails.stubs(env: ActiveSupport::StringInquirer.new('production'))
-        expect(subject).not_to be_nil
-      end
-    end
-  end
-
   describe 'auth_config_checks' do
 
     shared_examples 'problem detection for login providers' do
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index 6c01e380e3..10a49a09d9 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -1,4 +1,5 @@
 require "rails_helper"
+require 'sidekiq/testing'
 
 describe DiscourseSingleSignOn do
   before do
@@ -279,60 +280,67 @@ describe DiscourseSingleSignOn do
 
 
     it "correctly handles provided avatar_urls" do
+      Sidekiq::Testing.inline! do
+        sso = DiscourseSingleSignOn.new
+        sso.external_id = 666
+        sso.email = "sam@sam.com"
+        sso.name = "sam"
+        sso.username = "sam"
+        sso.avatar_url = "http://awesome.com/image.png"
 
-      sso = DiscourseSingleSignOn.new
-      sso.external_id = 666
-      sso.email = "sam@sam.com"
-      sso.name = "sam"
-      sso.username = "sam"
-      sso.avatar_url = "http://awesome.com/image.png"
+        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
 
-      FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
-      user = sso.lookup_or_create_user(ip_address)
-      avatar_id = user.uploaded_avatar_id
+        # initial creation ...
+        expect(avatar_id).to_not eq(nil)
 
-      # initial creation ...
-      expect(avatar_id).to_not eq(nil)
+        # junk avatar id should be updated
+        old_id = user.uploaded_avatar_id
+        Upload.destroy(old_id)
 
-      # junk avatar id should be updated
-      old_id = user.uploaded_avatar_id
-      Upload.destroy(old_id)
+        user = sso.lookup_or_create_user(ip_address)
+        user.reload
+        avatar_id = user.uploaded_avatar_id
 
-      user = sso.lookup_or_create_user(ip_address)
-      avatar_id = user.uploaded_avatar_id
+        expect(avatar_id).to_not eq(nil)
+        expect(old_id).to_not eq(avatar_id)
 
-      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
 
-      FileHelper.stubs(:download) { raise "should not be called" }
-      sso.avatar_url = "https://some.new/avatar.png"
-      user = sso.lookup_or_create_user(ip_address)
+        # avatar updated but no override specified ...
+        expect(user.uploaded_avatar_id).to eq(avatar_id)
 
-      # 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
 
-      sso.avatar_force_update = true
-      FileHelper.stubs(:download).returns(file_from_fixtures("logo-dev.png"))
-      user = sso.lookup_or_create_user(ip_address)
+        # 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)
 
-      # 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
 
-      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
 
-      sso.avatar_force_update = true
-      FileHelper.stubs(:download) { raise "not found" }
-      user = sso.lookup_or_create_user(ip_address)
-
-      # we better have the same avatar
-      expect(user.uploaded_avatar_id).to eq(avatar_id)
+        # we better have the same avatar
+        expect(user.uploaded_avatar_id).to eq(avatar_id)
+      end
     end
 
   end
 
   context 'when sso_overrides_avatar is enabled' do
     let!(:sso_record) { Fabricate(:single_sign_on_record, external_avatar_url: "http://example.com/an_image.png") }
+
     let!(:sso) {
       sso = DiscourseSingleSignOn.new
       sso.username = "test"
@@ -341,6 +349,7 @@ describe DiscourseSingleSignOn do
       sso.external_id = sso_record.external_id
       sso
     }
+
     let(:logo) { file_from_fixtures("logo.png") }
 
     before do
@@ -348,27 +357,32 @@ describe DiscourseSingleSignOn do
     end
 
     it "deal with no avatar url passed for an existing user with an avatar" do
-      # Deliberately not setting avatar_url so it should not update
+      Sidekiq::Testing.inline! do
+        # Deliberately not setting avatar_url so it should not update
+        sso_record.user.update_columns(uploaded_avatar_id: -1)
+        user = sso.lookup_or_create_user(ip_address)
+        user.reload
 
-      sso_record.user.update_columns(uploaded_avatar_id: -1)
-      user = sso.lookup_or_create_user(ip_address)
-
-      expect(user).to_not be_nil
-      expect(user.uploaded_avatar_id).to eq(-1)
+        expect(user).to_not be_nil
+        expect(user.uploaded_avatar_id).to eq(-1)
+      end
     end
 
     it "deal with no avatar_force_update passed as a boolean" do
-      FileHelper.stubs(:download).returns(logo)
+      Sidekiq::Testing.inline! do
+        FileHelper.stubs(:download).returns(logo)
 
-      sso_record.user.update_columns(uploaded_avatar_id: -1)
+        sso_record.user.update_columns(uploaded_avatar_id: -1)
 
-      sso.avatar_url = "http://example.com/a_different_image.png"
-      sso.avatar_force_update = false
+        sso.avatar_url = "http://example.com/a_different_image.png"
+        sso.avatar_force_update = false
 
-      user = sso.lookup_or_create_user(ip_address)
+        user = sso.lookup_or_create_user(ip_address)
+        user.reload
 
-      expect(user).to_not be_nil
-      expect(user.uploaded_avatar_id).to_not eq(-1)
+        expect(user).to_not be_nil
+        expect(user.uploaded_avatar_id).to_not eq(-1)
+      end
     end
   end
 end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index b651342ef1..dfc54ba1a8 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -154,6 +154,11 @@ describe Group do
 
   end
 
+  it "makes sure the everyone group is not visible" do
+    g = Group.refresh_automatic_group!(:everyone)
+    expect(g.visible).to eq(false)
+  end
+
   it "Correctly handles removal of primary group" do
     group = Fabricate(:group)
     user = Fabricate(:user)
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index a5ceb4a391..e70f176d4a 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -628,6 +628,21 @@ describe Post do
 
   end
 
+  describe 'before save' do
+    let(:cooked) { "<p><div class=\"lightbox-wrapper\"><a data-download-href=\"//localhost:3000/uploads/default/34784374092783e2fef84b8bc96d9b54c11ceea0\" href=\"//localhost:3000/uploads/default/original/1X/34784374092783e2fef84b8bc96d9b54c11ceea0.gif\" class=\"lightbox\" title=\"Sword reworks.gif\"><img src=\"//localhost:3000/uploads/default/optimized/1X/34784374092783e2fef84b8bc96d9b54c11ceea0_1_690x276.gif\" width=\"690\" height=\"276\"><div class=\"meta\">\n<span class=\"filename\">Sword reworks.gif</span><span class=\"informations\">1000x400 1000 KB</span><span class=\"expand\"></span>\n</div></a></div></p>" }
+
+    let(:post) do
+      Fabricate(:post,
+        raw: "<img src=\"/uploads/default/original/1X/34784374092783e2fef84b8bc96d9b54c11ceea0.gif\" width=\"690\" height=\"276\">",
+        cooked: cooked
+      )
+    end
+
+    it 'should not cook the post if raw has not been changed' do
+      post.save!
+      expect(post.cooked).to eq(cooked)
+    end
+  end
 
   describe 'after save' do
 
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index d09cd73244..808791d5af 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -17,7 +17,7 @@ describe Tag do
 
   describe '#tags_by_count_query' do
     it "returns empty hash if nothing is tagged" do
-      expect(described_class.tags_by_count_query.count).to eq({})
+      expect(described_class.tags_by_count_query.count(Tag::COUNT_ARG)).to eq({})
     end
 
     context "with some tagged topics" do
@@ -31,15 +31,21 @@ describe Tag do
       end
 
       it "returns tag names with topic counts in a hash" do
-        counts = described_class.tags_by_count_query.count
+        counts = described_class.tags_by_count_query.count(Tag::COUNT_ARG)
         expect(counts[@tags[0].name]).to eq(2)
         expect(counts[@tags[1].name]).to eq(1)
       end
 
       it "can be used to filter before doing the count" do
-        counts = described_class.tags_by_count_query.where("topics.id = ?", @topics[1].id).count
+        counts = described_class.tags_by_count_query.where("topics.id = ?", @topics[1].id).count(Tag::COUNT_ARG)
         expect(counts).to eq({@tags[0].name => 1})
       end
+
+      it "returns unused tags too" do
+        unused = Fabricate(:tag)
+        counts = described_class.tags_by_count_query.count(Tag::COUNT_ARG)
+        expect(counts[unused.name]).to eq(0)
+      end
     end
   end
 
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index 7b0c8dc9b7..12243b05c3 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -16,4 +16,11 @@ test("search", (assert) => {
   andThen(() => {
     assert.ok(exists('.search-menu .results ul li'), 'it shows results');
   });
+
+  click('.show-help');
+
+  andThen(() => {
+    assert.equal(find('.full-page-search').val(), 'dev', 'it shows the search term');
+    assert.ok(exists('.search-advanced-options'), 'advanced search is expanded');
+  });
 });
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
index 4a0a676651..3d46614fad 100644
--- a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
@@ -9,7 +9,7 @@ test("grantableBadges", function() {
   const badgeMiddle = Badge.create({id: 1, name: "My Badge", enabled: true});
   const badgeLast = Badge.create({id: 2, name: "Zoo Badge", enabled: true});
   const badgeDisabled = Badge.create({id: 4, name: "Disabled Badge", enabled: false});
-  const controller = this.subject({ badges: [badgeLast, badgeFirst, badgeMiddle, badgeDisabled] });
+  const controller = this.subject({ model: [], badges: [badgeLast, badgeFirst, badgeMiddle, badgeDisabled] });
   const sortedNames = [badgeFirst.name, badgeMiddle.name, badgeLast.name];
   const badgeNames = controller.get('grantableBadges').map(function(badge) {
     return badge.name;
diff --git a/test/javascripts/components/d-link-test.js.es6 b/test/javascripts/components/d-link-test.js.es6
deleted file mode 100644
index a025cc6d76..0000000000
--- a/test/javascripts/components/d-link-test.js.es6
+++ /dev/null
@@ -1,57 +0,0 @@
-import componentTest from 'helpers/component-test';
-
-moduleForComponent('d-link', {integration: true});
-
-componentTest('basic usage', {
-  template: '{{d-link path="/wat" title="user.preferences" icon="gear"}}',
-  test(assert) {
-    const $a = this.$('a');
-
-    assert.ok($a.length);
-    assert.equal($a.attr('href'), '/wat');
-    assert.equal($a.attr('title'), I18n.t('user.preferences'));
-    assert.equal($a.attr('aria-title'), I18n.t('user.preferences'));
-    assert.ok(this.$('i.fa-gear', $a).length, 'shows the icon');
-  }
-});
-
-componentTest('with a label', {
-  template: '{{d-link label="user.preferences"}}',
-  test(assert) {
-    const $a = this.$('a');
-    assert.equal($a.text(), I18n.t('user.preferences'));
-  }
-});
-
-componentTest('with a label and icon', {
-  template: '{{d-link label="user.preferences" icon="gear"}}',
-  test(assert) {
-    const $a = this.$('a');
-    assert.ok(this.$('i.fa-gear', $a).length, 'shows the icon');
-    assert.equal($a.text(), ` ${I18n.t('user.preferences')}`, "includes a space");
-  }
-});
-
-componentTest('block form', {
-  template: '{{#d-link path="/test"}}hello world{{/d-link}}',
-  test(assert) {
-    const $a = this.$('a');
-    assert.equal($a.attr('href'), '/test');
-    assert.equal($a.text(), 'hello world');
-  }
-});
-
-componentTest('with an action', {
-  template: '{{d-link action="doThing" title="user.preferences" icon="gear"}}',
-  test(assert) {
-    expect(2);
-
-    assert.ok(this.$('a[href]').length, 'href attribute is present to help with styling');
-
-    this.on('doThing', () => {
-      assert.ok(true, 'it fired the action');
-    });
-
-    click('a');
-  }
-});
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6
index 7e8fc08eeb..f671adb8e4 100644
--- a/test/javascripts/helpers/component-test.js.es6
+++ b/test/javascripts/helpers/component-test.js.es6
@@ -21,7 +21,7 @@ export default function(name, opts) {
 
     this.siteSettings = Discourse.SiteSettings;
 
-    autoLoadModules();
+    autoLoadModules(this.container, this.registry);
 
     const store = createStore();
     if (!opts.anonymous) {
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 8a37d2bf5e..7e815029b6 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -90,7 +90,6 @@ export default function() {
       return response({});
     });
 
-
     this.put('/users/eviltrout', () => response({ user: {} }));
 
     this.get("/t/280.json", () => response(fixturesByUrl['/t/280/1.json']));
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6
index af6486b33a..fb9c04f0ed 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -159,10 +159,19 @@ test("Links", function() {
          "<p><a href=\"http://discourse.org\">http://google.com ... wat</a></p>",
          "it supports links within links");
 
+  cooked("[http://google.com](http://discourse.org)",
+         "<p><a href=\"http://discourse.org\">http://google.com</a></p>",
+         "it supports markdown links where the name and link match");
+
+
   cooked("[Link](http://www.example.com) (with an outer \"description\")",
          "<p><a href=\"http://www.example.com\">Link</a> (with an outer \"description\")</p>",
          "it doesn't consume closing parens as part of the url");
 
+  cooked("A link inside parentheses (http://www.example.com)",
+         "<p>A link inside parentheses (<a href=\"http://www.example.com\">http://www.example.com</a>)</p>",
+         "it auto-links a url within parentheses");
+
   cooked("[ul][1]\n\n[1]: http://eviltrout.com",
          "<p><a href=\"http://eviltrout.com\">ul</a></p>",
          "it can use `ul` as a link name");
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6
new file mode 100644
index 0000000000..2b72910bff
--- /dev/null
+++ b/test/javascripts/lib/user-search-test.js.es6
@@ -0,0 +1,64 @@
+import userSearch from 'discourse/lib/user-search';
+
+module("lib:user-search", {
+  setup() {
+    const response = (object) => {
+      return [
+        200,
+        {"Content-Type": "application/json"},
+        object
+      ];
+    };
+
+    server.get('/users/search/users', () => { //eslint-disable-line
+      return response(
+        {
+          users: [
+            {
+              "username": "TeaMoe",
+              "name": "TeaMoe",
+              "avatar_template": "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png"
+            },
+            {
+              "username": "TeamOneJ",
+              "name": "J Cobb",
+              "avatar_template":
+              "https://avatars.discourse.org/v3/letter/t/3d9bf3/{size}.png"
+            },
+            {
+              "username": "kudos",
+              "name": "Team Blogeto.com",
+              "avatar_template": "/user_avatar/meta.discourse.org/kudos/{size}/62185_1.png"
+            },
+            {
+              "username": "RosieLinda",
+              "name": "Linda Teaman",
+              "avatar_template": "https://avatars.discourse.org/v3/letter/r/bc8723/{size}.png"
+            },
+            {
+              "username": "legalatom",
+              "name": "Team LegalAtom",
+              "avatar_template": "https://avatars.discourse.org/v3/letter/l/a9a28c/{size}.png"
+            },
+            {
+              "username": "dzsat_team",
+              "name": "Dz Sat Dz Sat",
+              "avatar_template": "https://avatars.discourse.org/v3/letter/d/eb9ed0/{size}.png"
+            }
+          ],
+          groups: [
+            {
+              "name": "team",
+              "usernames": []
+            }
+          ]
+        });
+    });
+  }
+});
+
+test("it places groups unconditionally for exact match", function() {
+  return userSearch({term: 'team'}).then((results)=>{
+     equal(results[results.length-1]["name"], "team");
+  });
+});
diff --git a/test/javascripts/mdtest/mdtest.js.es6.erb b/test/javascripts/mdtest/mdtest.js.es6.erb
index a17d564513..92047e7413 100644
--- a/test/javascripts/mdtest/mdtest.js.es6.erb
+++ b/test/javascripts/mdtest/mdtest.js.es6.erb
@@ -37,9 +37,9 @@ function sanitizer(result, whiteLister) {
   return result;
 }
 
-function md(input, expected, text) {
+function md(input, expected, text, settings) {
 
-  const opts = buildOptions({ siteSettings: {} });
+  const opts = buildOptions({ siteSettings: settings||{} });
   opts.traditionalMarkdownLinebreaks = true;
   opts.sanitizer = sanitizer;
 
@@ -77,3 +77,11 @@ test("first", function(){
 %>
 
 <%= mdtest_suite %>
+
+test("whitelisted url scheme", function() {
+  md("[Steam URL Scheme](steam://store/452530)", '<p><a href="steam://store/452530">Steam URL Scheme</a></p>', 'whitelists the steam url', {allowed_href_schemes: "macappstore|steam"});
+});
+
+test("forbidden url scheme", function() {
+  md("[Steam URL Scheme](steam://store/452530)", '<p><a>Steam URL Scheme</a></p>', 'removes the href', {allowed_href_schemes: "macappstore|itunes"});
+});
diff --git a/test/javascripts/views/container-view-test.js.es6 b/test/javascripts/views/container-view-test.js.es6
deleted file mode 100644
index 0ebd5808d3..0000000000
--- a/test/javascripts/views/container-view-test.js.es6
+++ /dev/null
@@ -1,83 +0,0 @@
-var SomeViewClass = Ember.View.extend();
-
-function containerHasOnlyOneChild(containerView, klass) {
-  equal(containerView.get('childViews').length, 1, "container has no other children than the one created by method");
-  ok(containerView.objectAt(0) instanceof klass, "container's child created by method is an instance of a correct class");
-}
-
-function containerHasTwoChildren(containerView, klass1, klass2) {
-  equal(containerView.get('childViews').length, 2, "container has both already existing and newly created children");
-  ok(containerView.objectAt(0) instanceof klass1, "already existing child's class is correct");
-  ok(containerView.objectAt(1) instanceof klass2, "newly created child's class is correct");
-}
-
-function childHasProperty(containerView, name) {
-  equal(containerView.objectAt(0).get(name), name, "method passes properties to the container's child it creates");
-}
-
-moduleFor("view:container");
-
-test("attachViewWithArgs: creates a view of a given class with given properties and appends it to the container", function() {
-  var containerView = this.subject();
-  containerView.attachViewWithArgs({foo: "foo"}, SomeViewClass);
-  containerHasOnlyOneChild(containerView, SomeViewClass);
-  childHasProperty(containerView, "foo");
-});
-
-test("attachViewWithArgs: creates a view of a given class without any properties and appends it to the container", function() {
-
-  var containerView = this.subject();
-  containerView.attachViewWithArgs(null, SomeViewClass);
-  containerHasOnlyOneChild(containerView, SomeViewClass);
-});
-
-test("attachViewWithArgs: creates a view without class specified (Ember.View is used by default) with given properties and appends it to the container", function() {
-  var containerView = this.subject();
-  containerView.attachViewWithArgs({foo: "foo"});
-
-  containerHasOnlyOneChild(containerView, Ember.View);
-  childHasProperty(containerView, "foo");
-});
-
-test("attachViewWithArgs: creates a view without class specified (Ember.View is used by default) without any properties and appends it to the container", function() {
-  var containerView = this.subject();
-  containerView.attachViewWithArgs();
-
-  containerHasOnlyOneChild(containerView, Ember.View);
-});
-
-test("attachViewWithArgs: appends a view to a container already containing other views", function() {
-  var AlreadyContainedViewClass = Ember.View.extend();
-  var alreadyContainedView = AlreadyContainedViewClass.create();
-  var containerView = this.subject();
-  containerView.pushObject(alreadyContainedView);
-
-  containerView.attachViewWithArgs(null, SomeViewClass);
-
-  containerHasTwoChildren(containerView, AlreadyContainedViewClass, SomeViewClass);
-});
-
-test("attachViewClass: creates a view of a given class without any properties and appends it to the container", function() {
-  var containerView = this.subject();
-  containerView.attachViewClass(SomeViewClass);
-
-  containerHasOnlyOneChild(containerView, SomeViewClass);
-});
-
-test("attachViewClass: creates a view without class specified (Ember.View is used by default) without any properties and appends it to the container", function() {
-  var containerView = this.subject();
-  containerView.attachViewClass();
-
-  containerHasOnlyOneChild(containerView, Ember.View);
-});
-
-test("attachViewClass: appends a view to a container already containing other views", function() {
-  var AlreadyContainedViewClass = Ember.View.extend();
-  var alreadyContainedView = AlreadyContainedViewClass.create();
-  var containerView = this.subject();
-  containerView.pushObject(alreadyContainedView);
-
-  containerView.attachViewClass(SomeViewClass);
-
-  containerHasTwoChildren(containerView, AlreadyContainedViewClass, SomeViewClass);
-});